diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/unit/ajax.js | 2 | ||||
| -rw-r--r-- | test/unit/basic.js | 6 | ||||
| -rw-r--r-- | test/unit/core.js | 54 | ||||
| -rw-r--r-- | test/unit/deferred.js | 2 | ||||
| -rw-r--r-- | test/unit/deprecated.js | 46 |
5 files changed, 46 insertions, 64 deletions
diff --git a/test/unit/ajax.js b/test/unit/ajax.js index ab5ce24a8..e1ecd2036 100644 --- a/test/unit/ajax.js +++ b/test/unit/ajax.js @@ -937,7 +937,7 @@ QUnit.module( "ajax", { dataType: "jsonp", crossDomain: crossDomain, success: function( data ) { - assert.strictEqual( jQuery.type( data ), "array", "JSON results returned (GET, REST-like with param)" ); + assert.ok( Array.isArray( data ), "JSON results returned (GET, REST-like with param)" ); } } ]; diff --git a/test/unit/basic.js b/test/unit/basic.js index 028492c2c..d01ee5346 100644 --- a/test/unit/basic.js +++ b/test/unit/basic.js @@ -76,17 +76,13 @@ QUnit.test( "show/hide", function( assert ) { } QUnit.test( "core", function( assert ) { - assert.expect( 21 ); + assert.expect( 17 ); var elem = jQuery( "<div></div><span></span>" ); assert.strictEqual( elem.length, 2, "Correct number of elements" ); assert.strictEqual( jQuery.trim( " hello " ), "hello", "jQuery.trim" ); - assert.strictEqual( jQuery.type( null ), "null", "jQuery.type(null)" ); - assert.strictEqual( jQuery.type( undefined ), "undefined", "jQuery.type(undefined)" ); - assert.strictEqual( jQuery.type( "a" ), "string", "jQuery.type(String)" ); - assert.ok( jQuery.isPlainObject( { "a": 2 } ), "jQuery.isPlainObject(object)" ); assert.ok( !jQuery.isPlainObject( "foo" ), "jQuery.isPlainObject(String)" ); diff --git a/test/unit/core.js b/test/unit/core.js index 85439d643..fba05b0ec 100644 --- a/test/unit/core.js +++ b/test/unit/core.js @@ -238,58 +238,6 @@ QUnit.test( "trim", function( assert ) { assert.equal( jQuery.trim( "\uFEFF \xA0! | \uFEFF" ), "! |", "leading/trailing should be trimmed" ); } ); -QUnit.test( "type", function( assert ) { - assert.expect( 28 ); - - assert.equal( jQuery.type( null ), "null", "null" ); - assert.equal( jQuery.type( undefined ), "undefined", "undefined" ); - assert.equal( jQuery.type( true ), "boolean", "Boolean" ); - assert.equal( jQuery.type( false ), "boolean", "Boolean" ); - assert.equal( jQuery.type( Boolean( true ) ), "boolean", "Boolean" ); - assert.equal( jQuery.type( 0 ), "number", "Number" ); - assert.equal( jQuery.type( 1 ), "number", "Number" ); - assert.equal( jQuery.type( Number( 1 ) ), "number", "Number" ); - assert.equal( jQuery.type( "" ), "string", "String" ); - assert.equal( jQuery.type( "a" ), "string", "String" ); - assert.equal( jQuery.type( String( "a" ) ), "string", "String" ); - assert.equal( jQuery.type( {} ), "object", "Object" ); - assert.equal( jQuery.type( /foo/ ), "regexp", "RegExp" ); - assert.equal( jQuery.type( new RegExp( "asdf" ) ), "regexp", "RegExp" ); - assert.equal( jQuery.type( [ 1 ] ), "array", "Array" ); - assert.equal( jQuery.type( new Date() ), "date", "Date" ); - assert.equal( jQuery.type( new Function( "return;" ) ), "function", "Function" ); - assert.equal( jQuery.type( function() {} ), "function", "Function" ); - assert.equal( jQuery.type( new Error() ), "error", "Error" ); - assert.equal( jQuery.type( window ), "object", "Window" ); - assert.equal( jQuery.type( document ), "object", "Document" ); - assert.equal( jQuery.type( document.body ), "object", "Element" ); - assert.equal( jQuery.type( document.createTextNode( "foo" ) ), "object", "TextNode" ); - assert.equal( jQuery.type( document.getElementsByTagName( "*" ) ), "object", "NodeList" ); - - // Avoid Lint complaints - var MyString = String, - MyNumber = Number, - MyBoolean = Boolean, - MyObject = Object; - assert.equal( jQuery.type( new MyBoolean( true ) ), "boolean", "Boolean" ); - assert.equal( jQuery.type( new MyNumber( 1 ) ), "number", "Number" ); - assert.equal( jQuery.type( new MyString( "a" ) ), "string", "String" ); - assert.equal( jQuery.type( new MyObject() ), "object", "Object" ); -} ); - -QUnit.test( "type for `Symbol`", function( assert ) { - // Prevent reference errors - if ( typeof Symbol !== "function" ) { - assert.expect( 0 ); - return; - } - - assert.expect( 2 ); - - assert.equal( jQuery.type( Symbol() ), "symbol", "Symbol" ); - assert.equal( jQuery.type( Object( Symbol() ) ), "symbol", "Symbol" ); -} ); - QUnit.asyncTest( "isPlainObject", function( assert ) { assert.expect( 23 ); @@ -1328,7 +1276,7 @@ QUnit.test( "jQuery.parseHTML", function( assert ) { nodes = jQuery.parseHTML( jQuery( "body" )[ 0 ].innerHTML ); assert.ok( nodes.length > 4, "Parse a large html string" ); - assert.equal( jQuery.type( nodes ), "array", "parseHTML returns an array rather than a nodelist" ); + assert.ok( Array.isArray( nodes ), "parseHTML returns an array rather than a nodelist" ); html = "<script>undefined()</script>"; assert.equal( jQuery.parseHTML( html ).length, 0, "Ignore scripts by default" ); diff --git a/test/unit/deferred.js b/test/unit/deferred.js index 9ba97181d..2e414e642 100644 --- a/test/unit/deferred.js +++ b/test/unit/deferred.js @@ -50,7 +50,7 @@ jQuery.each( [ "", " - new operator" ], function( _, withNew ) { assert.strictEqual( funcPromise, func, "non objects get extended" ); jQuery.each( promise, function( key ) { if ( typeof promise[ key ] !== "function" ) { - assert.ok( false, key + " is a function (" + jQuery.type( promise[ key ] ) + ")" ); + assert.ok( false, key + " is a function (" + typeof( promise[ key ] ) + ")" ); } if ( promise[ key ] !== func[ key ] ) { assert.strictEqual( func[ key ], promise[ key ], key + " is the same" ); diff --git a/test/unit/deprecated.js b/test/unit/deprecated.js index 007b3f13f..aaab68beb 100644 --- a/test/unit/deprecated.js +++ b/test/unit/deprecated.js @@ -242,14 +242,52 @@ QUnit.test( "jQuery.nodeName", function( assert ) { } ); -QUnit.test( "core", function( assert ) { +QUnit.test( "type", function( assert ) { + assert.expect( 28 ); + + assert.equal( jQuery.type( null ), "null", "null" ); + assert.equal( jQuery.type( undefined ), "undefined", "undefined" ); + assert.equal( jQuery.type( true ), "boolean", "Boolean" ); + assert.equal( jQuery.type( false ), "boolean", "Boolean" ); + assert.equal( jQuery.type( Boolean( true ) ), "boolean", "Boolean" ); + assert.equal( jQuery.type( 0 ), "number", "Number" ); + assert.equal( jQuery.type( 1 ), "number", "Number" ); + assert.equal( jQuery.type( Number( 1 ) ), "number", "Number" ); + assert.equal( jQuery.type( "" ), "string", "String" ); + assert.equal( jQuery.type( "a" ), "string", "String" ); + assert.equal( jQuery.type( String( "a" ) ), "string", "String" ); + assert.equal( jQuery.type( {} ), "object", "Object" ); + assert.equal( jQuery.type( /foo/ ), "regexp", "RegExp" ); + assert.equal( jQuery.type( new RegExp( "asdf" ) ), "regexp", "RegExp" ); + assert.equal( jQuery.type( [ 1 ] ), "array", "Array" ); + assert.equal( jQuery.type( new Date() ), "date", "Date" ); + assert.equal( jQuery.type( new Function( "return;" ) ), "function", "Function" ); + assert.equal( jQuery.type( function() {} ), "function", "Function" ); + assert.equal( jQuery.type( new Error() ), "error", "Error" ); + assert.equal( jQuery.type( window ), "object", "Window" ); + assert.equal( jQuery.type( document ), "object", "Document" ); + assert.equal( jQuery.type( document.body ), "object", "Element" ); + assert.equal( jQuery.type( document.createTextNode( "foo" ) ), "object", "TextNode" ); + assert.equal( jQuery.type( document.getElementsByTagName( "*" ) ), "object", "NodeList" ); + + // Avoid Lint complaints + var MyString = String, + MyNumber = Number, + MyBoolean = Boolean, + MyObject = Object; + assert.equal( jQuery.type( new MyBoolean( true ) ), "boolean", "Boolean" ); + assert.equal( jQuery.type( new MyNumber( 1 ) ), "number", "Number" ); + assert.equal( jQuery.type( new MyString( "a" ) ), "string", "String" ); + assert.equal( jQuery.type( new MyObject() ), "object", "Object" ); +} ); + +QUnit[ typeof Symbol === "function" ? "test" : "skip" ]( "type for `Symbol`", function( assert ) { assert.expect( 2 ); - assert.ok( jQuery.isFunction( jQuery.noop ), "jQuery.isFunction(jQuery.noop)" ); - assert.ok( !jQuery.isFunction( 2 ), "jQuery.isFunction(Number)" ); + assert.equal( jQuery.type( Symbol() ), "symbol", "Symbol" ); + assert.equal( jQuery.type( Object( Symbol() ) ), "symbol", "Symbol" ); } ); - QUnit.test( "isFunction", function( assert ) { assert.expect( 20 ); |