Skip to content

Commit 5281199

Browse files
committed
lint fixes, fixing responder.unit.js test bug
1 parent d8555a4 commit 5281199

File tree

3 files changed

+12
-10
lines changed

3 files changed

+12
-10
lines changed

test/server/responder.functional.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ describe("functional - server/responder.js", function () {
144144

145145
context("when full path passed in without leading slash", function () {
146146
it("returns Internal error", function (done) {
147-
http_client.get('/test/redirects/full_path_without_leading_slash', function (err, result, raw_res) {
147+
http_client.get('/test/redirects/full_path_without_leading_slash', function (err) {
148148
assert.equal(err.body.code, 'InternalError');
149149
assert.ok(err.message.match(/leading slash/));
150150
done();

test/server/responder.unit.js

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -109,18 +109,20 @@ describe("responder.js", function () {
109109
});
110110
});
111111

112-
context("when request's protocol is https", function() {
113-
sinon.stub(fake_res, 'header');
112+
context("when request's protocol is https", function () {
113+
it("redirects with https protocol", function () {
114+
sinon.stub(fake_res, 'header');
114115

115-
var https_req = support.shallow_clone(fake_req);
116-
https_req.headers['x-forwarded-proto'] = 'https';
117-
var args = {url: '/foo/bar'};
116+
var https_req = support.shallow_clone(fake_req);
117+
https_req.headers['x-forwarded-proto'] = 'https';
118+
var args = {url: '/foo/bar'};
118119

119-
responder.redirect(https_req, fake_res, args, fake_next);
120+
responder.redirect(https_req, fake_res, args, fake_next);
120121

121-
assert.ok(fake_res.header.calledWith('Location', "https://local.foo.com/foo/bar"));
122+
assert.ok(fake_res.header.calledWith('Location', "https://local.foo.com/foo/bar"));
122123

123-
fake_res.header.restore();
124+
fake_res.header.restore();
125+
});
124126
});
125127
});
126128
});

test/server/router.unit.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1+
/*jshint unused:false*/
12
var assert = require('assert');
23
var restify = require('restify');
3-
var sinon = require('sinon');
44
var support = require('../support');
55
var router = main.server.router;
66
var TEST_HOST = support.http.host;

0 commit comments

Comments
 (0)