Build: Refactor Node smoke tests

Utilize the assert module, avoid inline JSHint comments.

diff --git a/build/tasks/node_smoke_tests.js b/build/tasks/node_smoke_tests.js
index 077745b83f61d217508ffdcc7b348d17304cf7fd..5c23dae2ba97a7e9ecb134e0927668279fdba7da 100644 (file)
--- a/build/tasks/node_smoke_tests.js
+++ b/build/tasks/node_smoke_tests.js
@@ -15,7 +15,8 @@ module.exports = function( grunt ) {
 
        fs.readdirSync( testsDir )
                .filter( function( testFilePath ) {
-                       return fs.statSync( testsDir + testFilePath ).isFile();
+                       return fs.statSync( testsDir + testFilePath ).isFile() &&
+                               /\.js$/.test( testFilePath );
                } )
                .forEach( function( testFilePath ) {
                        var taskName = "node_" + testFilePath.replace( /\.js$/, "" );

diff --git a/test/node_smoke_tests/.jshintrc b/test/node_smoke_tests/.jshintrc
new file mode 100644 (file)
index 0000000..1445c7b
--- /dev/null
+++ b/test/node_smoke_tests/.jshintrc
@@ -0,0 +1,14 @@
+{
+       "boss": true,
+       "curly": true,
+       "eqeqeq": true,
+       "eqnull": true,
+       "expr": true,
+       "immed": true,
+       "noarg": true,
+       "quotmark": "double",
+       "undef": true,
+       "unused": true,
+
+       "node": true
+}

diff --git a/test/node_smoke_tests/document_missing.js b/test/node_smoke_tests/document_missing.js
index 0a0bda3503c9a1143df7bc6a28a01a6b187634c0..4a0ad2e2bd94f12c95136411633c750002109b78 100644 (file)
--- a/test/node_smoke_tests/document_missing.js
+++ b/test/node_smoke_tests/document_missing.js
@@ -1,19 +1,11 @@
-/* jshint node: true */
-
 "use strict";
 
-var ensureGlobalNotCreated = require( "./lib/ensure_global_not_created" ),
+var assert = require( "assert" ),
+       ensureGlobalNotCreated = require( "./lib/ensure_global_not_created" ),
        jQueryFactory = require( "../../dist/jquery.js" );
 
-try {
+assert.throws( function () {
        jQueryFactory( {} );
-       console.error( "The jQuery factory should reject window without a document" );
-       process.exit( 1 );
-} catch ( e ) {
-       if ( e.message ===  "jQuery requires a window with a document" ) {
-               ensureGlobalNotCreated( module.exports );
-               process.exit( 0 );
-       }
-       console.error( "An unexpected error thrown; message: ", e.message );
-       process.exit( 1 );
-}
+}, /jQuery requires a window with a document/ );
+
+ensureGlobalNotCreated( module.exports );

diff --git a/test/node_smoke_tests/document_passed.js b/test/node_smoke_tests/document_passed.js
index 5bbddb7185d3358103171d4c607756b8e525edf6..5999cc74410f015ca72441f60a20105f104b3107 100644 (file)
--- a/test/node_smoke_tests/document_passed.js
+++ b/test/node_smoke_tests/document_passed.js
@@ -1,12 +1,9 @@
-/* jshint node: true */
-
 "use strict";
 
+var assert = require( "assert" );
+
 require( "jsdom" ).env( "", function( errors, window ) {
-       if ( errors ) {
-               console.error( errors );
-               process.exit( 1 );
-       }
+       assert.ifError( errors );
 
        var ensureJQuery = require( "./lib/ensure_jquery" ),
                ensureGlobalNotCreated = require( "./lib/ensure_global_not_created" ),

diff --git a/test/node_smoke_tests/document_present_originally.js b/test/node_smoke_tests/document_present_originally.js
index 76fa88e86152d6b2fd678743989071eca8d05b8f..f75148708073ab32ff772c1db0048c87f7516f8f 100644 (file)
--- a/test/node_smoke_tests/document_present_originally.js
+++ b/test/node_smoke_tests/document_present_originally.js
@@ -1,12 +1,9 @@
-/* jshint node: true */
-
 "use strict";
 
+var assert = require( "assert" );
+
 require( "jsdom" ).env( "", function( errors, window ) {
-       if ( errors ) {
-               console.error( errors );
-               process.exit( 1 );
-       }
+       assert.ifError( errors );
 
        // Pretend the window is a global.
        global.window = window;

diff --git a/test/node_smoke_tests/lib/ensure_global_not_created.js b/test/node_smoke_tests/lib/ensure_global_not_created.js
index e2ce98309c0040eceb7f35b646ca7eaa776543d7..7cc83b54110e9fcb62bdd586fbbf0994324b170a 100644 (file)
--- a/test/node_smoke_tests/lib/ensure_global_not_created.js
+++ b/test/node_smoke_tests/lib/ensure_global_not_created.js
@@ -1,7 +1,7 @@
-/* jshint node: true */
-
 "use strict";
 
+var assert = require( "assert" );
+
 // Ensure the jQuery property on global/window/module.exports/etc. was not
 // created in a CommonJS environment.
 // `global` is always checked in addition to passed parameters.
@@ -9,9 +9,7 @@ module.exports = function ensureGlobalNotCreated() {
        var args = [].slice.call( arguments ).concat( global );
 
        args.forEach( function( object ) {
-               if ( object.jQuery ) {
-                       console.error( "A jQuery global was created in a CommonJS environment." );
-                       process.exit( 1 );
-               }
+               assert.strictEqual( object.jQuery, undefined,
+                       "A jQuery global was created in a CommonJS environment." );
        } );
 };

diff --git a/test/node_smoke_tests/lib/ensure_jquery.js b/test/node_smoke_tests/lib/ensure_jquery.js
index f121f6652ff383ae842c0c3146527b296a2cf964..0933a1d3387f72c2254becc054d6a6da25cab4af 100644 (file)
--- a/test/node_smoke_tests/lib/ensure_jquery.js
+++ b/test/node_smoke_tests/lib/ensure_jquery.js
@@ -1,11 +1,9 @@
-/* jshint node: true */
-
 "use strict";
 
+var assert = require( "assert" );
+
 // Check if the object we got is the jQuery object by invoking a basic API.
 module.exports = function ensureJQuery( jQuery ) {
-       if ( !/^jQuery/.test( jQuery.expando ) ) {
-               console.error( "jQuery.expando was not detected, the jQuery bootstrap process has failed" );
-               process.exit( 1 );
-       }
+       assert( /^jQuery/.test( jQuery.expando ),
+               "jQuery.expando was not detected, the jQuery bootstrap process has failed" );
 };