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
resources: Strip '$' and 'mw' from file closures
[lhc/web/wiklou.git]
/
tests
/
qunit
/
suites
/
resources
/
mediawiki.api
/
mediawiki.api.test.js
diff --git
a/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
b/tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
index
7431b29
..
1387be2
100644
(file)
--- a/
tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
+++ b/
tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js
@@
-1,4
+1,4
@@
-( function (
mw, $
) {
+( function () {
QUnit.module( 'mediawiki.api', QUnit.newMwEnvironment( {
setup: function () {
this.server = this.sandbox.useFakeServer();
QUnit.module( 'mediawiki.api', QUnit.newMwEnvironment( {
setup: function () {
this.server = this.sandbox.useFakeServer();
@@
-59,7
+59,7
@@
api.get( { action: 'doesntexist' } )
.fail( function ( errorCode ) {
api.get( { action: 'doesntexist' } )
.fail( function ( errorCode ) {
- assert.
e
qual( errorCode, 'unknown_action', 'API error should reject the deferred' );
+ assert.
strictE
qual( errorCode, 'unknown_action', 'API error should reject the deferred' );
} )
.always( assert.async() );
} );
} )
.always( assert.async() );
} );
@@
-73,7
+73,7
@@
api.get( { action: 'doesntexist' } )
.fail( function ( errorCode ) {
api.get( { action: 'doesntexist' } )
.fail( function ( errorCode ) {
- assert.
e
qual( errorCode, 'unknown_action', 'API error should reject the deferred' );
+ assert.
strictE
qual( errorCode, 'unknown_action', 'API error should reject the deferred' );
} )
.always( assert.async() );
} );
} )
.always( assert.async() );
} );
@@
-83,11
+83,11
@@
this.server.respond( function ( request ) {
if ( window.FormData ) {
this.server.respond( function ( request ) {
if ( window.FormData ) {
- assert.
ok( !
request.url.match( /action=/ ), 'Request has no query string' );
+ assert.
notOk(
request.url.match( /action=/ ), 'Request has no query string' );
assert.ok( request.requestBody instanceof FormData, 'Request uses FormData body' );
} else {
assert.ok( request.requestBody instanceof FormData, 'Request uses FormData body' );
} else {
- assert.
ok( !
request.url.match( /action=test/ ), 'Request has no query string' );
- assert.
e
qual( request.requestBody, 'action=test&format=json', 'Request uses query string body' );
+ assert.
notOk(
request.url.match( /action=test/ ), 'Request has no query string' );
+ assert.
strictE
qual( request.requestBody, 'action=test&format=json', 'Request uses query string body' );
}
request.respond( 200, { 'Content-Type': 'application/json' }, '[]' );
} );
}
request.respond( 200, { 'Content-Type': 'application/json' }, '[]' );
} );
@@
-99,7
+99,7
@@
var api = new mw.Api();
this.server.respond( function ( request ) {
var api = new mw.Api();
this.server.respond( function ( request ) {
- assert.
e
qual( match( request.url, /test=([^&]+)/ ), 'foo%7Cbar%7Cbaz', 'Pipe-separated value was submitted' );
+ assert.
strictE
qual( match( request.url, /test=([^&]+)/ ), 'foo%7Cbar%7Cbaz', 'Pipe-separated value was submitted' );
request.respond( 200, { 'Content-Type': 'application/json' }, '[]' );
} );
request.respond( 200, { 'Content-Type': 'application/json' }, '[]' );
} );
@@
-110,7
+110,7
@@
var api = new mw.Api();
this.server.respond( function ( request ) {
var api = new mw.Api();
this.server.respond( function ( request ) {
- assert.
e
qual( match( request.url, /test=([^&]+)/ ), 'Foo%7CBar', 'Pipe-separated value was submitted' );
+ assert.
strictE
qual( match( request.url, /test=([^&]+)/ ), 'Foo%7CBar', 'Pipe-separated value was submitted' );
request.respond( 200, { 'Content-Type': 'application/json' }, '[]' );
} );
request.respond( 200, { 'Content-Type': 'application/json' }, '[]' );
} );
@@
-121,7
+121,7
@@
var api = new mw.Api();
this.server.respond( function ( request ) {
var api = new mw.Api();
this.server.respond( function ( request ) {
- assert.
e
qual( match( request.url, /test=([^&]+)/ ), 'true%7Cfalse%7C%7C%7C0%7C1%2E2', 'Pipe-separated value was submitted' );
+ assert.
strictE
qual( match( request.url, /test=([^&]+)/ ), 'true%7Cfalse%7C%7C%7C0%7C1%2E2', 'Pipe-separated value was submitted' );
request.respond( 200, { 'Content-Type': 'application/json' }, '[]' );
} );
request.respond( 200, { 'Content-Type': 'application/json' }, '[]' );
} );
@@
-133,7
+133,7
@@
var api = new mw.Api();
this.server.respond( function ( request ) {
var api = new mw.Api();
this.server.respond( function ( request ) {
- assert.
ok( !
request.url.match( /foo/ ), 'foo query parameter is not present' );
+ assert.
notOk(
request.url.match( /foo/ ), 'foo query parameter is not present' );
assert.ok( request.url.match( /bar=true/ ), 'bar query parameter is present with value true' );
request.respond( 200, { 'Content-Type': 'application/json' }, '[]' );
} );
assert.ok( request.url.match( /bar=true/ ), 'bar query parameter is present with value true' );
request.respond( 200, { 'Content-Type': 'application/json' }, '[]' );
} );
@@
-151,10
+151,10
@@
.then( function ( token ) {
assert.ok( token.length, 'Got a token' );
}, function ( err ) {
.then( function ( token ) {
assert.ok( token.length, 'Got a token' );
}, function ( err ) {
- assert.
equal( '', err
, 'API error' );
+ assert.
strictEqual( err, ''
, 'API error' );
} )
.then( function () {
} )
.then( function () {
- assert.
e
qual( test.server.requests.length, 0, 'Requests made' );
+ assert.
strictE
qual( test.server.requests.length, 0, 'Requests made' );
} );
} );
} );
} );
@@
-172,23
+172,23
@@
// be added to user.tokens, use a fake one instead.
api.getToken( 'testuncached' )
.done( function ( token ) {
// be added to user.tokens, use a fake one instead.
api.getToken( 'testuncached' )
.done( function ( token ) {
- assert.
e
qual( token, 'good', 'The token' );
+ assert.
strictE
qual( token, 'good', 'The token' );
} )
.fail( function ( err ) {
} )
.fail( function ( err ) {
- assert.
e
qual( err, '', 'API error' );
+ assert.
strictE
qual( err, '', 'API error' );
} )
.always( firstDone );
api.getToken( 'testuncached' )
.done( function ( token ) {
} )
.always( firstDone );
api.getToken( 'testuncached' )
.done( function ( token ) {
- assert.
e
qual( token, 'good', 'The cached token' );
+ assert.
strictE
qual( token, 'good', 'The cached token' );
} )
.fail( function ( err ) {
} )
.fail( function ( err ) {
- assert.
e
qual( err, '', 'API error' );
+ assert.
strictE
qual( err, '', 'API error' );
} )
.always( secondDone );
} )
.always( secondDone );
- assert.
e
qual( this.server.requests.length, 1, 'Requests made' );
+ assert.
strictE
qual( this.server.requests.length, 1, 'Requests made' );
} );
QUnit.test( 'getToken() - error', function ( assert ) {
} );
QUnit.test( 'getToken() - error', function ( assert ) {
@@
-204,12
+204,12
@@
// Don't cache error (T67268)
return api.getToken( 'testerror' )
.catch( function ( err ) {
// Don't cache error (T67268)
return api.getToken( 'testerror' )
.catch( function ( err ) {
- assert.
e
qual( err, 'bite-me', 'Expected error' );
+ assert.
strictE
qual( err, 'bite-me', 'Expected error' );
return api.getToken( 'testerror' );
} )
.then( function ( token ) {
return api.getToken( 'testerror' );
} )
.then( function ( token ) {
- assert.
e
qual( token, 'good', 'The token' );
+ assert.
strictE
qual( token, 'good', 'The token' );
} );
} );
} );
} );
@@
-231,7
+231,7
@@
return api.getToken( 'testnoquery' )
.then( function () { assert.fail( 'Expected response missing a query to be rejected' ); } )
.catch( function ( err, rsp ) {
return api.getToken( 'testnoquery' )
.then( function () { assert.fail( 'Expected response missing a query to be rejected' ); } )
.catch( function ( err, rsp ) {
- assert.
e
qual( err, 'query-missing', 'Expected no query error code' );
+ assert.
strictE
qual( err, 'query-missing', 'Expected no query error code' );
assert.deepEqual( rsp, serverRsp );
} );
} );
assert.deepEqual( rsp, serverRsp );
} );
} );
@@
-248,13
+248,13
@@
// Get a token of a type that is in the legacy map.
return api.getToken( 'email' )
.done( function ( token ) {
// Get a token of a type that is in the legacy map.
return api.getToken( 'email' )
.done( function ( token ) {
- assert.
e
qual( token, 'csrfgood', 'Token' );
+ assert.
strictE
qual( token, 'csrfgood', 'Token' );
} )
.fail( function ( err ) {
} )
.fail( function ( err ) {
- assert.
e
qual( err, '', 'API error' );
+ assert.
strictE
qual( err, '', 'API error' );
} )
.always( function () {
} )
.always( function () {
- assert.
e
qual( test.server.requests.length, 1, 'Requests made' );
+ assert.
strictE
qual( test.server.requests.length, 1, 'Requests made' );
} );
} );
} );
} );
@@
-275,8
+275,8
@@
return api.getToken( 'testbad' );
} )
.then( function ( token ) {
return api.getToken( 'testbad' );
} )
.then( function ( token ) {
- assert.
e
qual( token, 'good', 'The token' );
- assert.
e
qual( test.server.requests.length, 2, 'Requests made' );
+ assert.
strictE
qual( token, 'good', 'The token' );
+ assert.
strictE
qual( test.server.requests.length, 2, 'Requests made' );
} );
} );
} );
} );
@@
-298,8
+298,8
@@
return api.getToken( 'options' );
} )
.then( function ( token ) {
return api.getToken( 'options' );
} )
.then( function ( token ) {
- assert.
e
qual( token, 'goodlegacy', 'The token' );
- assert.
e
qual( test.server.requests.length, 2, 'Request made' );
+ assert.
strictE
qual( token, 'goodlegacy', 'The token' );
+ assert.
strictE
qual( test.server.requests.length, 2, 'Request made' );
} );
} );
} );
} );
@@
-337,11
+337,11
@@
.then( function () {
return $.Deferred().reject( 'Unexpected success' );
}, function ( errorCode ) {
.then( function () {
return $.Deferred().reject( 'Unexpected success' );
}, function ( errorCode ) {
- assert.
e
qual( errorCode, 'assertuserfailed', 'getToken fails assert' );
+ assert.
strictE
qual( errorCode, 'assertuserfailed', 'getToken fails assert' );
return $.Deferred().resolve();
} )
.then( function () {
return $.Deferred().resolve();
} )
.then( function () {
- assert.
e
qual( test.server.requests.length, 1, 'Requests made' );
+ assert.
strictE
qual( test.server.requests.length, 1, 'Requests made' );
} );
} );
} );
} );
@@
-359,7
+359,7
@@
}
}
).then( function () {
}
}
).then( function () {
- assert.
e
qual( test.server.requests[ 0 ].requestHeaders[ 'X-Foo' ], 'Bar', 'Header sent' );
+ assert.
strictE
qual( test.server.requests[ 0 ].requestHeaders[ 'X-Foo' ], 'Bar', 'Header sent' );
return api.postWithToken( 'csrf',
{ action: 'example' },
return api.postWithToken( 'csrf',
{ action: 'example' },
@@
-368,9
+368,9
@@
}
);
} ).then( function ( data ) {
}
);
} ).then( function ( data ) {
- assert.
e
qual( data.example, 'quux' );
+ assert.
strictE
qual( data.example, 'quux' );
- assert.
e
qual( test.server.requests.length, 2, 'Request made' );
+ assert.
strictE
qual( test.server.requests.length, 2, 'Request made' );
} );
} );
} );
} );
@@
-449,11
+449,11
@@
} );
QUnit.module( 'mediawiki.api (2)', {
} );
QUnit.module( 'mediawiki.api (2)', {
-
setup
: function () {
+
beforeEach
: function () {
var self = this,
requests = this.requests = [];
this.api = new mw.Api();
var self = this,
requests = this.requests = [];
this.api = new mw.Api();
- this.sandbox.stub(
jQuery
, 'ajax', function () {
+ this.sandbox.stub(
$
, 'ajax', function () {
var request = $.extend( {
abort: self.sandbox.spy()
}, $.Deferred() );
var request = $.extend( {
abort: self.sandbox.spy()
}, $.Deferred() );
@@
-471,9
+471,9
@@
b: 2
} );
this.api.abort();
b: 2
} );
this.api.abort();
- assert.
ok( this.requests.length ===
2, 'Check both requests triggered' );
+ assert.
strictEqual( this.requests.length,
2, 'Check both requests triggered' );
this.requests.forEach( function ( request, i ) {
assert.ok( request.abort.calledOnce, 'abort request number ' + i );
} );
} );
this.requests.forEach( function ( request, i ) {
assert.ok( request.abort.calledOnce, 'abort request number ' + i );
} );
} );
-}(
mediaWiki, jQuery
) );
+}() );