Skip to content

Commit

Permalink
Fix up expected URIs in nock tests
Browse files Browse the repository at this point in the history
  • Loading branch information
Pchelolo committed May 23, 2017
1 parent 9be11cb commit 0994123
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion test/features/feed.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ function assertStorageRequest(requests, method, bucket, expected) {
}

function assertMCSRequest(requests, content, date, expected) {
let serviceURI = `http://appservice.wmflabs.org/en.wikipedia.org/v1/${content}`;
let serviceURI = `https://appservice.wmflabs.org/en.wikipedia.org/v1/${content}`;
if (date) {
serviceURI += `/${date}`;
}
Expand Down
2 changes: 1 addition & 1 deletion test/features/security/security.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ describe('router - security', function() {

it('should forward cookies on request to parsoid', function() {
nock.enableNetConnect();
var parsoidURI = 'http://parsoid-beta.wmflabs.org';
var parsoidURI = 'https://parsoid-beta.wmflabs.org';
var title = 'Test';
var revision = 117795883;
var api = nock(parsoidURI, {
Expand Down
6 changes: 3 additions & 3 deletions test/utils/assert.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function remoteRequests(slice, expected) {
return false;
}
hasRec = true;
return entry.req && /^http/.test(entry.req.uri);
return entry.req && /^https?/.test(entry.req.uri);
});
if (!hasRec) {
// there were no records in the slice, so
Expand All @@ -75,8 +75,8 @@ function remoteRequests(slice, expected) {
*/
function findParsoidRequest(slice) {
var logEntry = slice.get().find(function(line) {
var entry = JSON.parse(line);
return entry.req && /^http:\/\/parsoid/.test(entry.req.uri);
var entry = JSON.parse(line);
return entry.req && /^https?:\/\/parsoid/.test(entry.req.uri);
});
return JSON.parse(logEntry).req;
}
Expand Down

0 comments on commit 0994123

Please sign in to comment.