From a07c4676df94fcba78b83d9e9b694abed2575e08 Mon Sep 17 00:00:00 2001 From: Krinkle Date: Tue, 24 May 2011 00:21:42 +0000 Subject: [PATCH] Rewriting mw.loader test suite. The previous one didn't work properly in IE6-IE8. --- tests/qunit/sample/awesome.js | 5 ++++- .../qunit/suites/resources/mediawiki/mediawiki.js | 14 ++++++++------ 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/tests/qunit/sample/awesome.js b/tests/qunit/sample/awesome.js index 61fbbc7227..3adc270677 100644 --- a/tests/qunit/sample/awesome.js +++ b/tests/qunit/sample/awesome.js @@ -1 +1,4 @@ -window.awesome = true; +window.mw.loader.testCallback = function(){ + start(); + deepEqual( true, true, 'Implementing a module, is the callback timed properly ?'); +}; diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.js b/tests/qunit/suites/resources/mediawiki/mediawiki.js index 24c6c92488..e3fc18acd0 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.js @@ -90,20 +90,22 @@ test( 'mw.loader', function(){ "Extracting path from local URL (file://) with fragment" ); + // Asynchronous ahead stop(); - var tests_path = rePath.exec( location.href ); // Extract path + // Extract path + var tests_path = rePath.exec( location.href ); + mw.loader.implement( 'is.awesome', [tests_path + 'sample/awesome.js'], {}, {} ); + mw.loader.using( 'is.awesome', function(){ - start(); - deepEqual( window.awesome, true, 'Implementing a module, is the callback timed properly ?'); - // Clean up - delete window.awesome; + // awesome.js declares this function + mw.loader.testCallback(); }, function(){ start(); - deepEqual( 'mw.loader.using error callback fired', true, 'Implementing a module, is the callback timed properly ?'); + deepEqual( true, false, 'Implementing a module, error callback fired!'); }); }); -- 2.20.1