github/jquery
1
1
Fork 0
mirror of https://github.com/jquery/jquery.git synced 2026-02-01 16:24:57 -05:00
Code Issues Packages Projects Releases Wiki Activity

Build: fix tests in AMD mode

Browse Source
This commit is contained in:
Timmy Willison
2014-12-09 15:39:24 -05:00
parent 828a718aa0
commit 57652eecd9
7 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/data/testinit.js
View File

@@ -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 ) {

29
test/unit/core.js
View File

@@ -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);