Skip to content

Commit 395c4d3

Browse files
committed
Tests: Shift lib/common to use no globals
1 parent 4207999 commit 395c4d3

File tree

1 file changed

+28
-27
lines changed

1 file changed

+28
-27
lines changed

tests/lib/common.js

Lines changed: 28 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,79 +1,80 @@
1-
define([
1+
define( [
2+
"qunit",
23
"jquery"
3-
], function( $ ) {
4+
], function( QUnit, $ ) {
45

56
var exports = {};
67

78
function testWidgetDefaults( widget, defaults ) {
89
var pluginDefaults = $.ui[ widget ].prototype.options;
910

1011
// Ensure that all defaults have the correct value
11-
test( "defined defaults", function() {
12+
QUnit.test( "defined defaults", function( assert ) {
1213
var count = 0;
1314
$.each( defaults, function( key, val ) {
14-
expect( ++count );
15+
assert.expect( ++count );
1516
if ( $.isFunction( val ) ) {
16-
ok( $.isFunction( pluginDefaults[ key ] ), key );
17+
assert.ok( $.isFunction( pluginDefaults[ key ] ), key );
1718
return;
1819
}
19-
deepEqual( pluginDefaults[ key ], val, key );
20+
assert.deepEqual( pluginDefaults[ key ], val, key );
2021
});
2122
});
2223

2324
// Ensure that all defaults were tested
24-
test( "tested defaults", function() {
25+
QUnit.test( "tested defaults", function( assert ) {
2526
var count = 0;
2627
$.each( pluginDefaults, function( key ) {
27-
expect( ++count );
28-
ok( key in defaults, key );
28+
assert.expect( ++count );
29+
assert.ok( key in defaults, key );
2930
});
3031
});
3132
}
3233

3334
function testWidgetOverrides( widget ) {
3435
if ( $.uiBackCompat === false ) {
35-
test( "$.widget overrides", function() {
36-
expect( 4 );
36+
QUnit.test( "$.widget overrides", function( assert ) {
37+
assert.expect( 4 );
3738
$.each([
3839
"_createWidget",
3940
"destroy",
4041
"option",
4142
"_trigger"
4243
], function( i, method ) {
43-
strictEqual( $.ui[ widget ].prototype[ method ],
44+
assert.strictEqual( $.ui[ widget ].prototype[ method ],
4445
$.Widget.prototype[ method ], "should not override " + method );
4546
});
4647
});
4748
}
4849
}
4950

5051
function testBasicUsage( widget ) {
51-
test( "basic usage", function() {
52-
expect( 3 );
52+
QUnit.test( "basic usage", function( assert ) {
53+
assert.expect( 3 );
5354

5455
var defaultElement = $.ui[ widget ].prototype.defaultElement;
5556
$( defaultElement ).appendTo( "body" )[ widget ]().remove();
56-
ok( true, "initialized on element" );
57+
assert.ok( true, "initialized on element" );
5758

5859
$( defaultElement )[ widget ]().remove();
59-
ok( true, "initialized on disconnected DOMElement - never connected" );
60+
assert.ok( true, "initialized on disconnected DOMElement - never connected" );
6061

6162
// Ensure manipulating removed elements works (#3664)
6263
$( defaultElement ).appendTo( "body" ).remove()[ widget ]().remove();
63-
ok( true, "initialized on disconnected DOMElement - removed" );
64+
assert.ok( true, "initialized on disconnected DOMElement - removed" );
6465
});
6566
}
6667

6768
exports.testWidget = function( widget, settings ) {
68-
module( widget + ": common widget" );
69+
QUnit.module( widget + ": common widget" );
6970

7071
exports.testJshint( widget );
7172
testWidgetDefaults( widget, settings.defaults );
7273
testWidgetOverrides( widget );
7374
testBasicUsage( widget );
74-
test( "version", function() {
75-
expect( 1 );
76-
ok( "version" in $.ui[ widget ].prototype, "version property exists" );
75+
QUnit.test( "version", function( assert ) {
76+
assert.expect( 1 );
77+
assert.ok( "version" in $.ui[ widget ].prototype, "version property exists" );
7778
});
7879
};
7980

@@ -85,9 +86,9 @@ exports.testJshint = function( module ) {
8586
return;
8687
}
8788

88-
asyncTest( "JSHint", function() {
89+
QUnit.asyncTest( "JSHint", function( assert ) {
8990
require( [ "jshint" ], function() {
90-
expect( 1 );
91+
assert.expect( 1 );
9192

9293
$.when(
9394
$.ajax( {
@@ -117,12 +118,12 @@ exports.testJshint = function( module ) {
117118
return "[L" + error.line + ":C" + error.character + "] " +
118119
error.reason + "\n" + error.evidence + "\n";
119120
} ).join( "\n" );
120-
ok( passed, errors );
121-
start();
121+
assert.ok( passed, errors );
122+
QUnit.start();
122123
} )
123124
.fail(function( hintError, srcError ) {
124-
ok( false, "error loading source: " + ( hintError || srcError ).statusText );
125-
start();
125+
assert.ok( false, "error loading source: " + ( hintError || srcError ).statusText );
126+
QUnit.start();
126127
} );
127128
});
128129
});

0 commit comments

Comments
 (0)