dépôts
/
lhc
/
web
/
wiklou.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Merge last-seen stash data at more points in SpecialWatchlist"
[lhc/web/wiklou.git]
/
tests
/
qunit
/
suites
/
resources
/
mediawiki
/
mediawiki.loader.test.js
diff --git
a/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
b/tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
index
8b06bd6
..
ed1288b
100644
(file)
--- a/
tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
+++ b/
tests/qunit/suites/resources/mediawiki/mediawiki.loader.test.js
@@
-15,6
+15,7
@@
};
},
teardown: function () {
};
},
teardown: function () {
+ mw.loader.maxQueryLength = 2000;
// Teardown for StringSet shim test
if ( this.nativeSet ) {
window.Set = this.nativeSet;
// Teardown for StringSet shim test
if ( this.nativeSet ) {
window.Set = this.nativeSet;
@@
-254,7
+255,7
@@
assert.deepEqual(
[ {
topic: 'resourceloader.exception',
assert.deepEqual(
[ {
topic: 'resourceloader.exception',
- error: 'Unknown
dependency
: test.load.unreg',
+ error: 'Unknown
module
: test.load.unreg',
source: 'resolve'
} ],
capture
source: 'resolve'
} ],
capture
@@
-280,7
+281,7
@@
assert.deepEqual(
[ {
topic: 'resourceloader.exception',
assert.deepEqual(
[ {
topic: 'resourceloader.exception',
- error: 'Unknown
dependency
: test.load.missingdep2',
+ error: 'Unknown
module
: test.load.missingdep2',
source: 'resolve'
} ],
capture
source: 'resolve'
} ],
capture
@@
-561,7
+562,8
@@
QUnit.test( '.implement( package files )', function ( assert ) {
var done = assert.async(),
QUnit.test( '.implement( package files )', function ( assert ) {
var done = assert.async(),
- initJsRan = false;
+ initJsRan = false,
+ counter = 41;
mw.loader.implement(
'test.implement.packageFiles',
{
mw.loader.implement(
'test.implement.packageFiles',
{
@@
-569,9
+571,8
@@
files: {
'resources/src/foo/data/hello.json': { hello: 'world' },
'resources/src/foo/foo.js': function ( require, module ) {
files: {
'resources/src/foo/data/hello.json': { hello: 'world' },
'resources/src/foo/foo.js': function ( require, module ) {
- window.mwTestFooJsCounter = window.mwTestFooJsCounter || 41;
- window.mwTestFooJsCounter++;
- module.exports = { answer: window.mwTestFooJsCounter };
+ counter++;
+ module.exports = { answer: counter };
},
'resources/src/bar/bar.js': function ( require, module ) {
var core = require( './core.js' );
},
'resources/src/bar/bar.js': function ( require, module ) {
var core = require( './core.js' );
@@
-624,7
+625,7
@@
[ 'testUrlIncDump', 'dump', [], null, 'testloader' ]
] );
[ 'testUrlIncDump', 'dump', [], null, 'testloader' ]
] );
- mw.
config.set( 'wgResourceLoaderMaxQueryLength', 10 )
;
+ mw.
loader.maxQueryLength = 10
;
return mw.loader.using( [ 'testUrlIncDump', 'testUrlInc' ] ).then( function ( require ) {
assert.propEqual(
return mw.loader.using( [ 'testUrlIncDump', 'testUrlInc' ] ).then( function ( require ) {
assert.propEqual(