jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/348255 )
Change subject: tests: Don't assume synchronous jQuery.Deferred ...................................................................... tests: Don't assume synchronous jQuery.Deferred Bug: T124742 Change-Id: I8289d88fa61447ba31e7b767727775ead411987e --- M tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js 1 file changed, 10 insertions(+), 10 deletions(-) Approvals: jenkins-bot: Verified Jforrester: Looks good to me, approved diff --git a/tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js b/tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js index c2b2f32..f4219ee 100644 --- a/tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js +++ b/tests/qunit/ext.relatedArticles.readMore.gateway/test_RelatedPagesGateway.js @@ -26,48 +26,48 @@ } } ); - QUnit.test( 'Returns an array with the results when api responds', 2, function ( assert ) { + QUnit.test( 'Returns an array with the results when api responds', function ( assert ) { var gateway = new RelatedPagesGateway( this.api, 'Foo', null, true ); this.sandbox.stub( this.api, 'get' ).returns( $.Deferred().resolve( relatedPages ) ); - gateway.getForCurrentPage( 1 ).then( function ( results ) { + return gateway.getForCurrentPage( 1 ).then( function ( results ) { assert.ok( $.isArray( results ), 'Results must be an array' ); assert.strictEqual( results[ 0 ].title, 'Oh noes' ); } ); } ); - QUnit.test( 'Empty related pages is handled fine.', 2, function ( assert ) { + QUnit.test( 'Empty related pages is handled fine.', function ( assert ) { var gateway = new RelatedPagesGateway( this.api, 'Foo', null, true ); this.sandbox.stub( this.api, 'get' ).returns( $.Deferred().resolve( emptyRelatedPages ) ); - gateway.getForCurrentPage( 1 ).then( function ( results ) { + return gateway.getForCurrentPage( 1 ).then( function ( results ) { assert.ok( $.isArray( results ), 'Results must be an array' ); assert.strictEqual( results.length, 0 ); } ); } ); - QUnit.test( 'Empty related pages with no cirrus search is handled fine. No API request.', 3, function ( assert ) { + QUnit.test( 'Empty related pages with no cirrus search is handled fine. No API request.', function ( assert ) { var gateway = new RelatedPagesGateway( this.api, 'Foo', [], false ), spy = this.sandbox.stub( this.api, 'get' ).returns( $.Deferred().resolve( relatedPages ) ); - gateway.getForCurrentPage( 1 ).then( function ( results ) { + return gateway.getForCurrentPage( 1 ).then( function ( results ) { assert.ok( $.isArray( results ), 'Results must be an array' ); assert.ok( !spy.called, 'API is not invoked' ); assert.strictEqual( results.length, 0 ); } ); } ); - QUnit.test( 'Related pages from editor curated content', 1, function ( assert ) { + QUnit.test( 'Related pages from editor curated content', function ( assert ) { var gateway = new RelatedPagesGateway( this.api, 'Foo', [ { title: 1 } ], false ); this.sandbox.stub( this.api, 'get' ).returns( $.Deferred().resolve( relatedPages ) ); - gateway.getForCurrentPage( 1 ).then( function ( results ) { + return gateway.getForCurrentPage( 1 ).then( function ( results ) { assert.strictEqual( results.length, 1, 'API still hit despite cirrus being disabled.' ); } ); } ); - QUnit.test( 'Ignore related pages from editor curated content', 1, function ( assert ) { + QUnit.test( 'Ignore related pages from editor curated content', function ( assert ) { var wgRelatedArticles = [ 'Bar', 'Baz', @@ -79,7 +79,7 @@ spy = this.sandbox.stub( this.api, 'get' ) .returns( $.Deferred().resolve( relatedPages ) ); - gateway.getForCurrentPage( 1 ).then( function () { + return gateway.getForCurrentPage( 1 ).then( function () { var parameters = spy.lastCall.args[ 0 ]; assert.strictEqual( -- To view, visit https://gerrit.wikimedia.org/r/348255 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8289d88fa61447ba31e7b767727775ead411987e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/RelatedArticles Gerrit-Branch: master Gerrit-Owner: Krinkle <krinklem...@gmail.com> Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org> Gerrit-Reviewer: Jforrester <jforres...@wikimedia.org> Gerrit-Reviewer: Phuedx <samsm...@wikimedia.org> Gerrit-Reviewer: VolkerE <volke...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits