library-mirrors/jquery
1
0
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2024-11-23 02:54:22 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Build: Update jsdom; migrate a test with Symbol polyfill to an iframe test

Browse Source 
So far, we've been testing that jQuery element iteration works with polyfilled
Symbol & transpiled for-of via a Node test with jsdom with the Symbol global
removed. Unfortunately, jsdom now requires Symbol to be present for its internal
functionality so such a test is no longer possible. Instead, it's been migrated
to an iframe test with transpiled JavaScript.

This PR also enables us to use ECMAScript 2017 or newer in Node.js code.

Closes gh-4305
This commit is contained in:
Michał Gołębiowski-Owczarek 2019-03-04 18:30:51 +01:00 committed by GitHub
parent c10945d0e1
commit 9cb124ed00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 162 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.eslintignore
View File

@ -11,4 +11,4 @@ test/data/readywaitasset.js
test/data/readywaitloader.js test/data/readywaitloader.js
test/data/support/csp.js test/data/support/csp.js
test/data/support/getComputedSupport.js test/data/support/getComputedSupport.js
test/node_smoke_tests/lib/ensure_iterability.js test/data/core/jquery-iterability-transpiled.js

3
.eslintrc-node.json
View File

@ -4,10 +4,11 @@
"extends": "jquery", "extends": "jquery",
"parserOptions": { "parserOptions": {
"ecmaVersion": 5 "ecmaVersion": 2017
}, },
"env": { "env": {
"es6": true,
"node": true "node": true
} }
} }

2
.gitignore vendored
View File

@ -18,4 +18,4 @@ npm-debug.log*
/node_modules /node_modules
/test/node_smoke_tests/lib/ensure_iterability.js /test/data/core/jquery-iterability-transpiled.js

4
Gruntfile.js
View File

@ -42,8 +42,8 @@ module.exports = function( grunt ) {
}, },
nodeSmokeTests: { nodeSmokeTests: {
files: { files: {
"test/node_smoke_tests/lib/ensure_iterability.js": "test/data/core/jquery-iterability-transpiled.js":
"test/node_smoke_tests/lib/ensure_iterability_es6.js" "test/data/core/jquery-iterability-transpiled-es6.js"
} }
} }
}, },

24
build/tasks/node_smoke_tests.js
View File

@ -1,11 +1,11 @@
module.exports = function( grunt ) { module.exports = ( grunt ) => {
"use strict"; "use strict";
var fs = require( "fs" ), const fs = require( "fs" );
spawnTest = require( "./lib/spawn_test.js" ), const spawnTest = require( "./lib/spawn_test.js" );
testsDir = "./test/node_smoke_tests/", const testsDir = "./test/node_smoke_tests/";
nodeSmokeTests = [ "babel:nodeSmokeTests" ]; const nodeSmokeTests = [ "babel:nodeSmokeTests" ];
// Fire up all tests defined in test/node_smoke_tests/*.js in spawned sub-processes. // Fire up all tests defined in test/node_smoke_tests/*.js in spawned sub-processes.
// All the files under test/node_smoke_tests/*.js are supposed to exit with 0 code // All the files under test/node_smoke_tests/*.js are supposed to exit with 0 code
@ -14,15 +14,15 @@ module.exports = function( grunt ) {
// each other, e.g. so that they don't share the require cache. // each other, e.g. so that they don't share the require cache.
fs.readdirSync( testsDir ) fs.readdirSync( testsDir )
.filter( function( testFilePath ) { .filter( ( testFilePath ) =>
return fs.statSync( testsDir + testFilePath ).isFile() && fs.statSync( testsDir + testFilePath ).isFile() &&
/\.js$/.test( testFilePath ); /\.js$/.test( testFilePath )
} ) )
.forEach( function( testFilePath ) { .forEach( ( testFilePath ) => {
var taskName = "node_" + testFilePath.replace( /\.js$/, "" ); const taskName = `node_${ testFilePath.replace( /\.js$/, "" ) }`;
grunt.registerTask( taskName, function() { grunt.registerTask( taskName, function() {
spawnTest( this.async(), "node \"test/node_smoke_tests/" + testFilePath + "\"" ); spawnTest( this.async(), `node "test/node_smoke_tests/${ testFilePath }"` );
} ); } );
nodeSmokeTests.push( taskName ); nodeSmokeTests.push( taskName );

2
package.json
View File

@ -45,7 +45,7 @@
"gzip-js": "0.3.2", "gzip-js": "0.3.2",
"husky": "1.3.1", "husky": "1.3.1",
"insight": "0.10.1", "insight": "0.10.1",
"jsdom": "5.6.1", "jsdom": "13.2.0",
"karma": "4.0.0", "karma": "4.0.0",
"karma-browserstack-launcher": "1.4.0", "karma-browserstack-launcher": "1.4.0",
"karma-chrome-launcher": "2.2.0", "karma-chrome-launcher": "2.2.0",

11
test/.eslintrc.json
View File

@ -51,5 +51,14 @@
// Not really too many - waiting for autofix features for these rules // Not really too many - waiting for autofix features for these rules
"lines-around-comment": "off", "lines-around-comment": "off",
"dot-notation": "off" "dot-notation": "off"
} },
"overrides": [
{
"files": ["data/core/jquery-iterability-transpiled-es6.js"],
"parserOptions": {
"ecmaVersion": 2015
}
}
]
} }

14
test/data/core/jquery-iterability-transpiled-es6.js vendored Normal file
View File

@ -0,0 +1,14 @@
/* global startIframeTest */
jQuery( function() {
"use strict";
var elem = jQuery( "<div></div><span></span><a></a>" );
var result = "";
var i;
for ( i of elem ) {
result += i.nodeName;
}
startIframeTest( result );
} );

14
test/data/core/jquery-iterability-transpiled.html Normal file
View File

@ -0,0 +1,14 @@
<!DOCTYPE html>
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>jQuery objects transpiled iterability test page</title>
<script src="../../../node_modules/core-js/client/core.min.js"></script>
<script src="../../jquery.js"></script>
<script src="../iframeTest.js"></script>
<script src="jquery-iterability-transpiled.js"></script>
</head>
<body>
<p>jQuery objects transpiled iterability test page</p>
</body>
</html>

8
test/node_smoke_tests/document_missing.js
View File

@ -1,10 +1,10 @@
"use strict"; "use strict";
var assert = require( "assert" ), const assert = require( "assert" );
ensureGlobalNotCreated = require( "./lib/ensure_global_not_created" ), const ensureGlobalNotCreated = require( "./lib/ensure_global_not_created" );
jQueryFactory = require( "../../dist/jquery.js" ); const jQueryFactory = require( "../../dist/jquery.js" );
assert.throws( function() { assert.throws( () => {
jQueryFactory( {} ); jQueryFactory( {} );
}, /jQuery requires a window with a document/ ); }, /jQuery requires a window with a document/ );

16
test/node_smoke_tests/document_passed.js
View File

@ -1,14 +1,12 @@
"use strict"; "use strict";
var assert = require( "assert" ); const { JSDOM } = require( "jsdom" );
require( "jsdom" ).env( "", function( errors, window ) { const { window } = new JSDOM( "" );
assert.ifError( errors );
var ensureJQuery = require( "./lib/ensure_jquery" ), const ensureJQuery = require( "./lib/ensure_jquery" );
ensureGlobalNotCreated = require( "./lib/ensure_global_not_created" ), const ensureGlobalNotCreated = require( "./lib/ensure_global_not_created" );
jQuery = require( "../../dist/jquery.js" )( window ); const jQuery = require( "../../dist/jquery.js" )( window );
ensureJQuery( jQuery ); ensureJQuery( jQuery );
ensureGlobalNotCreated( module.exports ); ensureGlobalNotCreated( module.exports );
} );

20
test/node_smoke_tests/document_present_originally.js
View File

@ -1,17 +1,15 @@
"use strict"; "use strict";
var assert = require( "assert" ); const { JSDOM } = require( "jsdom" );
require( "jsdom" ).env( "", function( errors, window ) { const { window } = new JSDOM( "" );
assert.ifError( errors );
// Pretend the window is a global. // Pretend the window is a global.
global.window = window; global.window = window;
var ensureJQuery = require( "./lib/ensure_jquery" ), const ensureJQuery = require( "./lib/ensure_jquery" );
ensureGlobalNotCreated = require( "./lib/ensure_global_not_created" ), const ensureGlobalNotCreated = require( "./lib/ensure_global_not_created" );
jQuery = require( "../../dist/jquery.js" ); const jQuery = require( "../../dist/jquery.js" );
ensureJQuery( jQuery ); ensureJQuery( jQuery );
ensureGlobalNotCreated( module.exports, window ); ensureGlobalNotCreated( module.exports, window );
} );

11
test/node_smoke_tests/iterable_with_symbol_polyfill.js
View File

@ -1,11 +0,0 @@
"use strict";
var assert = require( "assert" );
delete global.Symbol;
require( "core-js" );
assert.strictEqual( typeof Symbol, "function", "Expected Symbol to be a function" );
assert.notEqual( typeof Symbol.iterator, "symbol", "Expected Symbol.iterator to be polyfilled" );
require( "./lib/ensure_iterability" )();

10
test/node_smoke_tests/lib/ensure_global_not_created.js
View File

@ -1,15 +1,15 @@
"use strict"; "use strict";
var assert = require( "assert" ); const assert = require( "assert" );
// Ensure the jQuery property on global/window/module.exports/etc. was not // Ensure the jQuery property on global/window/module.exports/etc. was not
// created in a CommonJS environment. // created in a CommonJS environment.
// `global` is always checked in addition to passed parameters. // `global` is always checked in addition to passed parameters.
module.exports = function ensureGlobalNotCreated() { const ensureGlobalNotCreated = ( ...args ) => {
var args = [].slice.call( arguments ).concat( global ); [ ...args, global ].forEach( function( object ) {
args.forEach( function( object ) {
assert.strictEqual( object.jQuery, undefined, assert.strictEqual( object.jQuery, undefined,
"A jQuery global was created in a CommonJS environment." ); "A jQuery global was created in a CommonJS environment." );
} ); } );
}; };
module.exports = ensureGlobalNotCreated;

32
test/node_smoke_tests/lib/ensure_iterability_es6.js
View File

@ -1,23 +1,25 @@
"use strict"; "use strict";
var assert = require( "assert" ); const assert = require( "assert" );
module.exports = function ensureIterability() { const ensureIterability = () => {
require( "jsdom" ).env( "", function( errors, window ) { const { JSDOM } = require( "jsdom" );
assert.ifError( errors );
var i, const { window } = new JSDOM( "" );
ensureJQuery = require( "./ensure_jquery" ),
jQuery = require( "../../../dist/jquery.js" )( window ),
elem = jQuery( "<div></div><span></span><a></a>" ),
result = "";
ensureJQuery( jQuery ); let i;
const ensureJQuery = require( "./ensure_jquery" );
const jQuery = require( "../../../dist/jquery.js" )( window );
const elem = jQuery( "<div></div><span></span><a></a>" );
let result = "";
for ( i of elem ) { ensureJQuery( jQuery );
result += i.nodeName;
}
assert.strictEqual( result, "DIVSPANA", "for-of works on jQuery objects" ); for ( i of elem ) {
} ); result += i.nodeName;
}
assert.strictEqual( result, "DIVSPANA", "for-of works on jQuery objects" );
}; };
module.exports = ensureIterability;

6
test/node_smoke_tests/lib/ensure_jquery.js
View File

@ -1,9 +1,11 @@
"use strict"; "use strict";
var assert = require( "assert" ); const assert = require( "assert" );
// Check if the object we got is the jQuery object by invoking a basic API. // Check if the object we got is the jQuery object by invoking a basic API.
module.exports = function ensureJQuery( jQuery ) { const ensureJQuery = ( jQuery ) => {
assert( /^jQuery/.test( jQuery.expando ), assert( /^jQuery/.test( jQuery.expando ),
"jQuery.expando was not detected, the jQuery bootstrap process has failed" ); "jQuery.expando was not detected, the jQuery bootstrap process has failed" );
}; };
module.exports = ensureJQuery;

25
test/promises_aplus_adapters/deferred.js
View File

@ -1,20 +1,17 @@
"use strict"; "use strict";
require( "jsdom" ).env( "", function( errors, window ) { const { JSDOM } = require( "jsdom" );
if ( errors ) {
console.error( errors );
return;
}
var jQuery = require( "../../" )( window ); const { window } = new JSDOM( "" );
module.exports.deferred = function() { const jQuery = require( "../../" )( window );
var deferred = jQuery.Deferred();
return { module.exports.deferred = () => {
promise: deferred.promise(), const deferred = jQuery.Deferred();
resolve: deferred.resolve.bind( deferred ),
reject: deferred.reject.bind( deferred ) return {
}; promise: deferred.promise(),
resolve: deferred.resolve.bind( deferred ),
reject: deferred.reject.bind( deferred )
}; };
} ); };

78
test/promises_aplus_adapters/when.js
View File

@ -1,49 +1,45 @@
"use strict"; "use strict";
require( "jsdom" ).env( "", function( errors, window ) { const { JSDOM } = require( "jsdom" );
if ( errors ) {
console.error( errors );
return;
}
var jQuery = require( "../../" )( window ); const { window } = new JSDOM( "" );
module.exports.deferred = function() { const jQuery = require( "../../" )( window );
var adopted, promised,
obj = {
resolve: function() {
if ( !adopted ) {
adopted = jQuery.when.apply( jQuery, arguments );
if ( promised ) {
adopted.then( promised.resolve, promised.reject );
}
}
return adopted;
},
reject: function( value ) {
if ( !adopted ) {
adopted = jQuery.when( jQuery.Deferred().reject( value ) );
if ( promised ) {
adopted.then( promised.resolve, promised.reject );
}
}
return adopted;
},
// A manually-constructed thenable that works even if calls precede resolve/reject module.exports.deferred = () => {
promise: { let adopted, promised;
then: function() {
if ( !adopted ) { return {
if ( !promised ) { resolve: function() {
promised = jQuery.Deferred(); if ( !adopted ) {
} adopted = jQuery.when.apply( jQuery, arguments );
return promised.then.apply( promised, arguments ); if ( promised ) {
} adopted.then( promised.resolve, promised.reject );
return adopted.then.apply( adopted, arguments );
}
} }
}; }
return adopted;
},
reject: function( value ) {
if ( !adopted ) {
adopted = jQuery.when( jQuery.Deferred().reject( value ) );
if ( promised ) {
adopted.then( promised.resolve, promised.reject );
}
}
return adopted;
},
return obj; // A manually-constructed thenable that works even if calls precede resolve/reject
promise: {
then: function() {
if ( !adopted ) {
if ( !promised ) {
promised = jQuery.Deferred();
}
return promised.then.apply( promised, arguments );
}
return adopted.then.apply( adopted, arguments );
}
}
}; };
} ); };

11
test/unit/core.js
View File

@ -1425,6 +1425,17 @@ QUnit.test( "Iterability of jQuery objects (gh-1693)", function( assert ) {
} }
} ); } );
testIframe(
"Iterability of jQuery objects with Symbol polyfill (gh-1693)",
"core/jquery-iterability-transpiled.html",
function( assert, jQuery, window, document, testString ) {
assert.expect( 1 );
assert.strictEqual( testString, "DIVSPANA",
"for-of works on jQuery objects with Symbol polyfilled" );
}
);
QUnit[ jQuery.Deferred ? "test" : "skip" ]( "jQuery.readyException (original)", function( assert ) { QUnit[ jQuery.Deferred ? "test" : "skip" ]( "jQuery.readyException (original)", function( assert ) {
assert.expect( 1 ); assert.expect( 1 );