Permalink
Browse files

Build: fix tests in AMD mode

  • Loading branch information...
timmywil committed Dec 9, 2014
1 parent 828a718 commit 57652eecd96e47f39725671ffce45bfa01493380
Showing with 31 additions and 34 deletions.
  1. +5 −8 build/tasks/build.js
  2. +3 −2 src/.jshintrc
  3. +1 −7 src/exports/global.js
  4. +2 −3 src/jquery.js
  5. +1 −0 src/outro.js
  6. +3 −1 test/data/testinit.js
  7. +16 −13 test/unit/core.js
View
@@ -26,7 +26,7 @@ module.exports = function( grunt ) {
skipSemiColonInsertion: true,
wrap: {
startFile: "src/intro.js",
endFile: "src/outro.js"
endFile: [ "src/exports/global.js", "src/outro.js" ]
},
paths: {
sizzle: "../external/sizzle/dist/sizzle"
@@ -61,13 +61,10 @@ module.exports = function( grunt ) {
} else {
// Ignore jQuery's exports (the only necessary one)
if ( name !== "jquery" ) {
contents = contents
.replace( /\s*return\s+[^\}]+(\}\);[^\w\}]*)$/, "$1" )
// Multiple exports
.replace( /\s*exports\.\w+\s*=\s*\w+;/g, "" );
}
contents = contents
.replace( /\s*return\s+[^\}]+(\}\);[^\w\}]*)$/, "$1" )
// Multiple exports
.replace( /\s*exports\.\w+\s*=\s*\w+;/g, "" );
// Remove define wrappers, closure ends, and empty declarations
contents = contents
View
@@ -21,7 +21,8 @@
"globals": {
"jQuery": true,
"define": true,
"module": true
"define": false,
"module": false,
"noGlobal": true
}
}
View
@@ -1,7 +1,3 @@
define([
"../core"
], function( jQuery ) {
var
// Map over jQuery in case of overwrite
_jQuery = window.jQuery,
@@ -24,8 +20,6 @@ jQuery.noConflict = function( deep ) {
// Expose jQuery and $ identifiers, even in
// AMD (#7102#comment:10, https://github.com/jquery/jquery/pull/557)
// and CommonJS for browser emulators (#13566)
if ( typeof noGlobal === "undefined" ) {
if ( !noGlobal ) {
window.jQuery = window.$ = jQuery;
}
});
View
@@ -29,10 +29,9 @@ define([
"./offset",
"./dimensions",
"./deprecated",
"./exports/amd",
"./exports/global"
"./exports/amd"
], function( jQuery ) {
return jQuery;
return (window.jQuery = window.$ = jQuery);
});
View
@@ -1 +1,2 @@
return jQuery;
}));
View
@@ -304,7 +304,9 @@ this.loadTests = function() {
/**
* Run in noConflict mode
*/
jQuery.noConflict();
if ( jQuery.noConflict ) {
jQuery.noConflict();
}
// Load the TestSwarm listener if swarmURL is in the address.
if ( loadSwarm ) {
View
@@ -226,24 +226,27 @@ test( "globalEval execution after script injection (#7862)", 1, function() {
ok( window.strictEvalTest - now < 500, "Code executed synchronously" );
});
test("noConflict", function() {
expect(7);
// This is not run in AMD mode
if ( jQuery.noConflict ) {
test("noConflict", function() {
expect(7);
var $$ = jQuery;
var $$ = jQuery;
strictEqual( jQuery, jQuery.noConflict(), "noConflict returned the jQuery object" );
strictEqual( window["jQuery"], $$, "Make sure jQuery wasn't touched." );
strictEqual( window["$"], original$, "Make sure $ was reverted." );
strictEqual( jQuery, jQuery.noConflict(), "noConflict returned the jQuery object" );
strictEqual( window["jQuery"], $$, "Make sure jQuery wasn't touched." );
strictEqual( window["$"], original$, "Make sure $ was reverted." );
jQuery = $ = $$;
jQuery = $ = $$;
strictEqual( jQuery.noConflict(true), $$, "noConflict returned the jQuery object" );
strictEqual( window["jQuery"], originaljQuery, "Make sure jQuery was reverted." );
strictEqual( window["$"], original$, "Make sure $ was reverted." );
ok( $$().pushStack([]), "Make sure that jQuery still works." );
strictEqual( jQuery.noConflict(true), $$, "noConflict returned the jQuery object" );
strictEqual( window["jQuery"], originaljQuery, "Make sure jQuery was reverted." );
strictEqual( window["$"], original$, "Make sure $ was reverted." );
ok( $$().pushStack([]), "Make sure that jQuery still works." );
window["jQuery"] = jQuery = $$;
});
window["jQuery"] = jQuery = $$;
});
}
test("trim", function() {
expect(13);

0 comments on commit 57652ee

Please sign in to comment.