Skip to content

Commit

Permalink
[Dev Deps] update tape, jscs, eslint, @ljharb/eslint-config
Browse files Browse the repository at this point in the history
  • Loading branch information
ljharb committed Aug 9, 2016
1 parent 888f153 commit 760d6be
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 30 deletions.
25 changes: 23 additions & 2 deletions .jscs.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@

"disallowSpacesInsideArrayBrackets": true,

"disallowQuotedKeysInObjects": "allButReserved",
"disallowQuotedKeysInObjects": { "allExcept": ["reserved"] },

"disallowSpaceAfterObjectKeys": true,

Expand Down Expand Up @@ -149,6 +149,27 @@

"requireObjectDestructuring": false,

"requireEarlyReturn": false
"requireEarlyReturn": false,

"requireCapitalizedConstructorsNew": {
"allExcept": ["Function", "String", "Object", "Symbol", "Number", "Date", "RegExp", "Error", "Boolean", "Array"]
},

"requireImportAlphabetized": false,

"requireSpaceBeforeObjectValues": true,
"requireSpaceBeforeDestructuredValues": true,

"disallowSpacesInsideTemplateStringPlaceholders": true,

"disallowArrayDestructuringReturn": false,

"requireNewlineBeforeSingleStatementsInIf": false,

"disallowUnusedVariables": true,

"requireSpacesInsideImportedObjectBraces": true,

"requireUseStrict": true
}

8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,11 @@
},
"dependencies": {},
"devDependencies": {
"tape": "^4.4.0",
"tape": "^4.6.0",
"covert": "^1.1.0",
"jscs": "^2.8.0",
"eslint": "^1.10.3",
"@ljharb/eslint-config": "^1.6.1"
"jscs": "^3.0.7",
"eslint": "^3.2.2",
"@ljharb/eslint-config": "^6.0.0"
},
"license": "MIT"
}
Expand Down
5 changes: 5 additions & 0 deletions test/.eslintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"rules": {
"max-lines": 0
}
}
32 changes: 8 additions & 24 deletions test/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ var obj = {
date: date,
constructor: 'fake',
isPrototypeOf: 'not a function',
foo: new Foo()
foo: new Foo()
};

var deep = {
Expand Down Expand Up @@ -470,11 +470,7 @@ test('deep clone', function (t) {
integer: 76,
arr: [1, 2, 3, 4],
date: new Date(81, 7, 26),
layer: {
deep: {
integer: 42
}
}
layer: { deep: { integer: 42 } }
};
var target = extend(true, ori, deep);

Expand Down Expand Up @@ -585,15 +581,9 @@ test('deep clone', function (t) {
});

test('deep clone; arrays are merged', function (t) {
var defaults = {
arr: [1, 2, 3]
};
var override = {
arr: ['x']
};
var expectedTarget = {
arr: ['x', 2, 3]
};
var defaults = { arr: [1, 2, 3] };
var override = { arr: ['x'] };
var expectedTarget = { arr: ['x', 2, 3] };

var target = extend(true, defaults, override);

Expand All @@ -602,21 +592,15 @@ test('deep clone; arrays are merged', function (t) {
});

test('deep clone === false; objects merged normally', function (t) {
var defaults = {
a: 1
};
var override = {
a: 2
};
var defaults = { a: 1 };
var override = { a: 2 };
var target = extend(false, defaults, override);
t.deepEqual(target, override, 'deep === false handled normally');
t.end();
});

test('pass in null; should create a valid object', function (t) {
var override = {
a: 1
};
var override = { a: 1 };
var target = extend(null, override);
t.deepEqual(target, override, 'null object handled normally');
t.end();
Expand Down

0 comments on commit 760d6be

Please sign in to comment.