Skip to content

Commit 0e8d9dd

Browse files
committed
Tests: Lint.
1 parent 266cc84 commit 0e8d9dd

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

grunt.js

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -271,9 +271,8 @@ grunt.initConfig({
271271
// TODO remove items from this list once rewritten
272272
return !( /(effects.core|mouse|datepicker|draggable|droppable|resizable|selectable|sortable)\.js$/ ).test( file );
273273
}),
274-
grunt: "grunt.js"
275-
// TODO enabled once fixed up
276-
// tests: "tests/unit/**/*.js"
274+
grunt: "grunt.js",
275+
tests: "tests/unit/**/*.js"
277276
},
278277
csslint: {
279278
// nothing: []
@@ -343,7 +342,9 @@ grunt.initConfig({
343342
tests: {
344343
options: extend({
345344
browser: true,
346-
jquery: true
345+
jquery: true,
346+
// TODO: this is only for document.write()
347+
evil: true
347348
}, defaults ),
348349
// TODO: don't create so many globals in tests
349350
globals: {

tests/unit/widget/widget_extend.js

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,14 @@ test( "$.widget.extend()", function() {
1212
deep2copy = { foo: { baz: true }, foo2: document },
1313
deepmerged = { foo: { bar: true, baz: true }, foo2: document },
1414
arr = [1, 2, 3],
15-
nestedarray = { arr: arr };
15+
nestedarray = { arr: arr },
16+
defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
17+
defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
18+
options1 = { xnumber2: 1, xstring2: "x" },
19+
options1Copy = { xnumber2: 1, xstring2: "x" },
20+
options2 = { xstring2: "xx", xxx: "newstringx" },
21+
options2Copy = { xstring2: "xx", xxx: "newstringx" },
22+
merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
1623

1724
$.widget.extend( settings, options );
1825
deepEqual( settings, merged, "Check if extended: settings must be extended" );
@@ -79,14 +86,6 @@ test( "$.widget.extend()", function() {
7986
$.widget.extend( obj, { foo:"notnull" } );
8087
equal( obj.foo, "notnull", "Make sure a null value can be overwritten" );
8188

82-
var defaults = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
83-
defaultsCopy = { xnumber1: 5, xnumber2: 7, xstring1: "peter", xstring2: "pan" },
84-
options1 = { xnumber2: 1, xstring2: "x" },
85-
options1Copy = { xnumber2: 1, xstring2: "x" },
86-
options2 = { xstring2: "xx", xxx: "newstringx" },
87-
options2Copy = { xstring2: "xx", xxx: "newstringx" },
88-
merged2 = { xnumber1: 5, xnumber2: 1, xstring1: "peter", xstring2: "xx", xxx: "newstringx" };
89-
9089
settings = $.widget.extend( {}, defaults, options1, options2 );
9190
deepEqual( settings, merged2, "Check if extended: settings must be extended" );
9291
deepEqual( defaults, defaultsCopy, "Check if not modified: options1 must not be modified" );

0 commit comments

Comments
 (0)