From 1a9c64bb0fc70e739aa9de3eeaa8ab5246f6ef80 Mon Sep 17 00:00:00 2001 From: Krinkle Date: Sun, 18 Sep 2011 04:50:47 +0000 Subject: [PATCH] Move the mediawiki.test.bug30825.js helper script out of the /suites/ directory into /data/ and rename to be more re-usable. (Follows-up r96680) --- tests/qunit/data/qunitOkCall.js | 2 ++ .../qunit/suites/resources/mediawiki/mediawiki.test.bug30825.js | 2 -- tests/qunit/suites/resources/mediawiki/mediawiki.test.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 tests/qunit/data/qunitOkCall.js delete mode 100644 tests/qunit/suites/resources/mediawiki/mediawiki.test.bug30825.js diff --git a/tests/qunit/data/qunitOkCall.js b/tests/qunit/data/qunitOkCall.js new file mode 100644 index 0000000000..2fb6e01de7 --- /dev/null +++ b/tests/qunit/data/qunitOkCall.js @@ -0,0 +1,2 @@ +start(); +ok( true, 'Successfully loaded!'); diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.bug30825.js b/tests/qunit/suites/resources/mediawiki/mediawiki.test.bug30825.js deleted file mode 100644 index bdf23344a7..0000000000 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.bug30825.js +++ /dev/null @@ -1,2 +0,0 @@ -start(); -ok( true, "Bug 30825 -- protocol-relative URL script load via mw.loader.load"); diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js index 588b3d356e..1c56d84a14 100644 --- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js +++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js @@ -178,7 +178,7 @@ test( 'mw.loader.bug30825', function() { // Confirm that mw.loader.load() works with protocol-relative URLs var loc = window.location, base = ('//' + loc.hostname + loc.pathname).replace(/\/[^\/]*$/, ''), - target = base + '/suites/resources/mediawiki/mediawiki.test.bug30825.js'; + target = base + '/data/qunitOkCall.js?' + (new Date()).getTime(); // Async! Include a timeout, as failure in this test leads to neither the // success nor failure callbacks getting called. -- 2.20.1