Jhernandez has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/373054 )
Change subject: Hygiene: Use promises A/A+ everywhere
......................................................................
Hygiene: Use promises A/A+ everywhere
Remove usages of deprecated methods like .done which make jquery
promises fall back to non-standard behavior
Additional changes:
* Rename var promise to a more descriptive name in tests
Bug: T173819
Change-Id: I7b041d0a7a8c42a8eac947295d265e898085c60a
---
M tests/node-qunit/gateway/mediawiki.test.js
M tests/node-qunit/gateway/rest.test.js
M tests/node-qunit/ui/renderer.test.js
M tests/node-qunit/wait.test.js
4 files changed, 15 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/54/373054/1
diff --git a/tests/node-qunit/gateway/mediawiki.test.js
b/tests/node-qunit/gateway/mediawiki.test.js
index a7d6197..f60cb13 100644
--- a/tests/node-qunit/gateway/mediawiki.test.js
+++ b/tests/node-qunit/gateway/mediawiki.test.js
@@ -176,7 +176,7 @@
},
gateway = createMediaWikiApiGateway( api, DEFAULT_CONSTANTS );
- return gateway.getPageSummary( 'Test Title' ).done( function ( result )
{
+ return gateway.getPageSummary( 'Test Title' ).then( function ( result )
{
assert.deepEqual( result, MEDIAWIKI_API_RESPONSE_PREVIEW_MODEL
);
} );
} );
@@ -213,7 +213,7 @@
},
gateway = createMediaWikiApiGateway( api, DEFAULT_CONSTANTS );
- return gateway.getPageSummary( 'Test Title' ).done( function ( result )
{
+ return gateway.getPageSummary( 'Test Title' ).then( function ( result )
{
assert.deepEqual( result, model );
} );
} );
diff --git a/tests/node-qunit/gateway/rest.test.js
b/tests/node-qunit/gateway/rest.test.js
index 53ad73f..b2b1de0 100644
--- a/tests/node-qunit/gateway/rest.test.js
+++ b/tests/node-qunit/gateway/rest.test.js
@@ -244,7 +244,7 @@
api = this.sandbox.stub().returns( deferred.reject( { status:
404 } ).promise() ),
gateway = createRESTBaseGateway( api, { THUMBNAIL_SIZE: 200 },
provideParsedExtract );
- return gateway.getPageSummary( 'Test Title' ).done( function () {
+ return gateway.getPageSummary( 'Test Title' ).then( function () {
assert.ok( true );
} );
} );
@@ -255,7 +255,7 @@
),
gateway = createRESTBaseGateway( api, DEFAULT_CONSTANTS,
provideParsedExtract );
- return gateway.getPageSummary( 'Test Title' ).done( function ( result )
{
+ return gateway.getPageSummary( 'Test Title' ).then( function ( result )
{
assert.deepEqual( result, RESTBASE_RESPONSE_PREVIEW_MODEL );
} );
} );
diff --git a/tests/node-qunit/ui/renderer.test.js
b/tests/node-qunit/ui/renderer.test.js
index 990cfb4..cb1df98 100644
--- a/tests/node-qunit/ui/renderer.test.js
+++ b/tests/node-qunit/ui/renderer.test.js
@@ -280,11 +280,11 @@
behavior = createBehavior( this.sandbox ),
token = 'some-token',
$container = $( '<div>' ),
- promise;
+ showPreview;
preview.el.show = this.sandbox.stub();
- promise = renderer.show(
+ showPreview = renderer.show(
preview, event, link, behavior, token, $container.get( 0 ) );
assert.notEqual(
@@ -297,7 +297,7 @@
'Preview has been shown.'
);
- return promise.done( function () {
+ return showPreview.then( function () {
assert.ok(
behavior.previewShow.calledWith( token ),
'previewShow has been called with the correct token.'
@@ -313,7 +313,7 @@
isTall: false
},
$container = $( '<div>' ).append( preview.el ),
- promise = renderer.hide( preview );
+ hidePreview = renderer.hide( preview );
assert.ok(
preview.el.hasClass( 'mwe-popups-fade-out-up' ),
@@ -328,7 +328,7 @@
'',
'Preview is still in the container.'
);
- return promise.done( function () {
+ return hidePreview.then( function () {
assert.equal(
$container.html(),
'',
@@ -345,7 +345,7 @@
isTall: false
},
$container = $( '<div>' ).append( preview.el ),
- promise = renderer.hide( preview );
+ hidePreview = renderer.hide( preview );
assert.ok(
preview.el.hasClass( 'mwe-popups-fade-out-down' ),
@@ -360,7 +360,7 @@
'',
'Preview is still in the container.'
);
- return promise.done( function () {
+ return hidePreview.then( function () {
assert.equal(
$container.html(),
'',
diff --git a/tests/node-qunit/wait.test.js b/tests/node-qunit/wait.test.js
index 318820b..6a5a874 100644
--- a/tests/node-qunit/wait.test.js
+++ b/tests/node-qunit/wait.test.js
@@ -11,13 +11,15 @@
callback();
} );
- return wait( 150 ).done( function () {
+ return wait( 150 ).then( function () {
assert.strictEqual(
timeout.getCall( 0 ).args[ 1 ],
150,
'It waits for the given duration'
);
- } ).always( function () {
timeout.restore();
+ } ).catch( function ( err ) {
+ timeout.restore();
+ throw err;
} );
} );
--
To view, visit https://gerrit.wikimedia.org/r/373054
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b041d0a7a8c42a8eac947295d265e898085c60a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Jhernandez <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
