Skip to content

Commit

Permalink
style(lint): fix updated xo rules
Browse files Browse the repository at this point in the history
  • Loading branch information
@JamieMason
JamieMason committed Aug 26, 2018
1 parent 7cc7ff1 commit 4f849e3
Show file tree
Hide file tree
Showing 7 changed files with 113 additions and 120 deletions.
2 changes: 1 addition & 1 deletion .babelrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"presets": [
["env", {
"targets": {
node: 4,
"node": 4,
"browsers": [
"android >= 4",
"chrome >= 40",
Expand Down
12 changes: 6 additions & 6 deletions dist/jasmine-matchers.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(require,module,exports){
(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({1:[function(require,module,exports){
(function (global){
// modules
var createRegister = require('./src/create-register');
Expand Down Expand Up @@ -827,11 +827,11 @@ module.exports = function (actual) {

function isMatch(pattern, actual) {
var patterns = {
'1999-12-31': /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/,
'1999-12-31T23:59': /^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2})$/,
'1999-12-31T23:59:59': /^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})$/,
'1999-12-31T23:59:59.000': /^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})\.([0-9]{3})$/,
'1999-12-31T23:59:59.000Z': /^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})\.([0-9]{3})Z$/
'1999-12-31': /^(\d{4})-(\d{2})-(\d{2})$/,
'1999-12-31T23:59': /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})$/,
'1999-12-31T23:59:59': /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})$/,
'1999-12-31T23:59:59.000': /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\.(\d{3})$/,
'1999-12-31T23:59:59.000Z': /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\.(\d{3})Z$/
};
return actual.search(patterns[pattern]) !== -1;
}
Expand Down
15 changes: 3 additions & 12 deletions gulpfile.js
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const exec = require('child_process').exec;
const {exec} = require('child_process');

const babelify = require('babelify');
const browserify = require('browserify');
Expand All @@ -19,9 +19,7 @@ gulp.task('browserify', () => {
toEs5('./test/index.js', 'jasmine-matchers.spec.js');
});

gulp.task('build', [
'browserify'
]);
gulp.task('build', ['browserify']);

gulp.task('test', done => {
exec('npm run test:local', (err, stdout, stderr) => {
Expand All @@ -32,12 +30,5 @@ gulp.task('test', done => {
});

gulp.task('watch', [], () => {
return gulp.watch([
'*.js',
'src/**/*.js',
'test/**/*.js'
], [
'build',
'test'
]);
return gulp.watch(['*.js', 'src/**/*.js', 'test/**/*.js'], ['build', 'test']);
});
6 changes: 4 additions & 2 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
"commitmsg": "validate-commit-msg",
"generate-readme": "node ./scripts/generate-readme.js",
"generate-snippets": "node scripts/generate-snippets.js",
"lint": "xo --fix",
"lint": "xo '**/*.js' --fix",
"pregenerate-snippets": "rm -rf ./scripts/es5-snippets && rm -rf ./scripts/es6-snippets && mkdir -p ./scripts/es5-snippets && mkdir -p ./scripts/es6-snippets",
"test": "npm run lint && npm run browserstack-android && npm run browserstack-ios && npm run browserstack-ie && npm run browserstack-safari && npm run browserstack-opera && npm run browserstack-firefox && npm run browserstack-chrome",
"test:jest": "jest",
Expand Down Expand Up @@ -132,7 +132,9 @@
"no-array-constructor": 0,
"no-new-object": 0,
"no-new-wrappers": 0,
"unicorn/filename-case": 0
"prefer-rest-params": 0,
"unicorn/filename-case": 0,
"unicorn/new-for-builtins": 0
},
"space": 2
}
Expand Down
4 changes: 2 additions & 2 deletions scripts/generate-snippets.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ const getAnySnippet = (template, method) =>
{functionStyle: es5FunctionStyle, outputDirectory: 'es5-snippets'},
{functionStyle: es6FunctionStyle, outputDirectory: 'es6-snippets'}
].forEach(snippetBundle => {
const functionStyle = snippetBundle.functionStyle;
const outputDirectory = snippetBundle.outputDirectory;
const {functionStyle} = snippetBundle;
const {outputDirectory} = snippetBundle;

api.filter(ownerIs('expect')).forEach(method => {
const location = getPath(`./${outputDirectory}/${method.name}.sublime-snippet`);
Expand Down
10 changes: 5 additions & 5 deletions src/toBeIso8601.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@ module.exports = actual =>

function isMatch(pattern, actual) {
const patterns = {
'1999-12-31': /^([0-9]{4})-([0-9]{2})-([0-9]{2})$/,
'1999-12-31T23:59': /^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2})$/,
'1999-12-31T23:59:59': /^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})$/,
'1999-12-31T23:59:59.000': /^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})\.([0-9]{3})$/,
'1999-12-31T23:59:59.000Z': /^([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})\.([0-9]{3})Z$/
'1999-12-31': /^(\d{4})-(\d{2})-(\d{2})$/,
'1999-12-31T23:59': /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2})$/,
'1999-12-31T23:59:59': /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})$/,
'1999-12-31T23:59:59.000': /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\.(\d{3})$/,
'1999-12-31T23:59:59.000Z': /^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2})\.(\d{3})Z$/
};
return actual.search(patterns[pattern]) !== -1;
}
184 changes: 92 additions & 92 deletions test/toHaveIso8601.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,98 +3,98 @@ const describeToHaveX = require('./lib/describeToHaveX');
describe('toHaveIso8601', () => {
describeToHaveX('toHaveIso8601', () => {
describe('when member is a Date String conforming to the ISO 8601 standard',
() => {
describe('when specified date is valid', () => {
it('should confirm', () => {
expect({
memberName: '2013-07-08T07:29:15.863Z'
}).toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T07:29:15.863'
}).toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T07:29:15'
}).toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T07:29'
}).toHaveIso8601('memberName');
expect({
memberName: '2013-07-08'
}).toHaveIso8601('memberName');
});
});
describe('when specified date is NOT valid', () => {
it('should deny', () => {
expect({
memberName: '2013-99-12T00:00:00.000Z'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-12-99T00:00:00.000Z'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-01-01T99:00:00.000Z'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-01-01T99:99:00.000Z'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-01-01T00:00:99.000Z'
}).not.toHaveIso8601('memberName');
});
});
});
() => {
describe('when specified date is valid', () => {
it('should confirm', () => {
expect({
memberName: '2013-07-08T07:29:15.863Z'
}).toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T07:29:15.863'
}).toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T07:29:15'
}).toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T07:29'
}).toHaveIso8601('memberName');
expect({
memberName: '2013-07-08'
}).toHaveIso8601('memberName');
});
});
describe('when specified date is NOT valid', () => {
it('should deny', () => {
expect({
memberName: '2013-99-12T00:00:00.000Z'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-12-99T00:00:00.000Z'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-01-01T99:00:00.000Z'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-01-01T99:99:00.000Z'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-01-01T00:00:99.000Z'
}).not.toHaveIso8601('memberName');
});
});
});
describe('when member is a String NOT conforming to the ISO 8601 standard',
() => {
it('should deny', () => {
expect({
memberName: '2013-07-08T07:29:15.'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T07:29:'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T07:2'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T07:'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T07'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07-0'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07-'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-0'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013'
}).not.toHaveIso8601('memberName');
expect({
memberName: '201'
}).not.toHaveIso8601('memberName');
expect({
memberName: '20'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2'
}).not.toHaveIso8601('memberName');
expect({
memberName: ''
}).not.toHaveIso8601('memberName');
});
});
() => {
it('should deny', () => {
expect({
memberName: '2013-07-08T07:29:15.'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T07:29:'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T07:2'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T07:'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T07'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07-08T'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07-0'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07-'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-07'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-0'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013-'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2013'
}).not.toHaveIso8601('memberName');
expect({
memberName: '201'
}).not.toHaveIso8601('memberName');
expect({
memberName: '20'
}).not.toHaveIso8601('memberName');
expect({
memberName: '2'
}).not.toHaveIso8601('memberName');
expect({
memberName: ''
}).not.toHaveIso8601('memberName');
});
});
});
});

0 comments on commit 4f849e3

Please sign in to comment.