jenkins-bot has submitted this change and it was merged.
Change subject: Ensure that tests for errors enforce an error response
......................................................................
Ensure that tests for errors enforce an error response
Prior to Iac1d48ffaf381947f8a662585a3cdba9a70b3fa8, there were tests
that should have been failing but passed because they were receiving
a 200 response and the tests did not contain a check to ensure that
the response was in fact an error. This adds such checks.
Change-Id: Ib776e5593cd6aa6fd108a672cc81bf06317940e6
Depends-On: Iac1d48ffaf381947f8a662585a3cdba9a70b3fa8
---
M test/features/definition/definition.js
M test/features/featured-image/pagecontent.js
M test/features/featured/pagecontent.js
3 files changed, 11 insertions(+), 7 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git a/test/features/definition/definition.js
b/test/features/definition/definition.js
index 887f527..2f3aaa7 100644
--- a/test/features/definition/definition.js
+++ b/test/features/definition/definition.js
@@ -41,7 +41,7 @@
it('missing definitions', function() {
return preq.get({ uri: server.config.uri +
'en.wiktionary.org/v1/page/definition/Dssjbkrt' })
.then(function(res) {
- assert.status(res, 404);
+ throw new Error('Expected an error, but got status: ' +
res.status);
}, function(err) {
assert.status(err, 404);
});
@@ -50,7 +50,7 @@
it('non-term page', function() {
return preq.get({ uri: server.config.uri +
'en.wiktionary.org/v1/page/definition/Main_page' })
.then(function(res) {
- assert.status(res, 404);
+ throw new Error('Expected an error, but got status: ' +
res.status);
}, function(err) {
assert.status(err, 404);
});
@@ -59,7 +59,7 @@
it('unsupported language', function() {
return preq.get({ uri: server.config.uri +
'ru.wiktionary.org/v1/page/definition/Baba' })
.then(function(res) {
- assert.status(res, 501);
+ throw new Error('Expected an error, but got status: ' +
res.status);
}, function(err) {
assert.status(err, 501);
});
diff --git a/test/features/featured-image/pagecontent.js
b/test/features/featured-image/pagecontent.js
index 8ddc088..d0898d8 100644
--- a/test/features/featured-image/pagecontent.js
+++ b/test/features/featured-image/pagecontent.js
@@ -48,18 +48,18 @@
});
it('should return english description where unavailable in request
language', function() {
- return preq.get({ uri: server.config.uri +
'fr.wikipedia.org/v1/media/image/featured/2016/04/15' })
+ return preq.get({ uri: server.config.uri +
'fr.wikipedia.org/v1/media/image/featured/2016/04/15' })
.then(function(res) {
assert.ok(res.body.description.text.indexOf('Main altar') >=
0);
assert.equal(res.body.description.lang, 'en');
- });
+ });
});
it('should return no description when unavailable', function() {
- return preq.get({ uri: server.config.uri +
'en.wikipedia.org/v1/media/image/featured/2016/06/15' })
+ return preq.get({ uri: server.config.uri +
'en.wikipedia.org/v1/media/image/featured/2016/06/15' })
.then(function(res) {
assert.notProperty(res.body, 'description');
- });
+ });
});
it('featured image of an old date should return 404', function() {
diff --git a/test/features/featured/pagecontent.js
b/test/features/featured/pagecontent.js
index 1ff7a7b..8634766 100644
--- a/test/features/featured/pagecontent.js
+++ b/test/features/featured/pagecontent.js
@@ -43,6 +43,7 @@
it('incomplete date should return 404', function() {
return preq.get({ uri: server.config.uri +
'en.wikipedia.org/v1/page/featured/2016/04' })
.then(function(res) {
+ throw new Error('Expected an error, but got status: ' +
res.status);
}, function(err) {
assert.status(err, 404);
});
@@ -51,6 +52,7 @@
it('extra uri path parameter after date should return 404', function() {
return preq.get({ uri: server.config.uri +
'en.wikipedia.org/v1/page/featured/2016/04/15/11' })
.then(function(res) {
+ throw new Error('Expected an error, but got status: ' +
res.status);
}, function(err) {
assert.status(err, 404);
});
@@ -59,6 +61,7 @@
it('unsupported language', function() {
return preq.get({ uri: server.config.uri +
'fr.wikipedia.org/v1/page/featured/2016/04/15' })
.then(function(res) {
+ throw new Error('Expected an error, but got status: ' +
res.status);
}, function(err) {
assert.status(err, 501);
assert.equal(err.body.type, 'unsupported_language');
@@ -68,6 +71,7 @@
it('featured article of an old date should return 404', function() {
return preq.get({ uri: server.config.uri +
'en.wikipedia.org/v1/page/featured/1970/12/31' })
.then(function(res) {
+ throw new Error('Expected an error, but got status: ' +
res.status);
}, function(err) {
assert.status(err, 404);
assert.equal(err.body.type, 'not_found');
--
To view, visit https://gerrit.wikimedia.org/r/297332
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib776e5593cd6aa6fd108a672cc81bf06317940e6
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/services/mobileapps
Gerrit-Branch: master
Gerrit-Owner: Mholloway <[email protected]>
Gerrit-Reviewer: BearND <[email protected]>
Gerrit-Reviewer: Dbrant <[email protected]>
Gerrit-Reviewer: Fjalapeno <[email protected]>
Gerrit-Reviewer: GWicke <[email protected]>
Gerrit-Reviewer: Jhernandez <[email protected]>
Gerrit-Reviewer: Mholloway <[email protected]>
Gerrit-Reviewer: Mhurd <[email protected]>
Gerrit-Reviewer: Mobrovac <[email protected]>
Gerrit-Reviewer: Niedzielski <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
