Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update assert-plus to version 1 (and make tests pass on node v7.6) #63

Closed
wants to merge 2 commits into from
Closed

Update assert-plus to version 1 (and make tests pass on node v7.6) #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1dbe526
Update examples test to pass on node v7.6
jharris4 Mar 1, 2017
5ae0b23
update assert-plus to v1
jharris4 Mar 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@
"test": "tap test/*.js"
},
"dependencies": {
"assert-plus": "^0.2.0",
"assert-plus": "^1.0.0",
"jsprim": "^1.2.2",
"sshpk": "^1.7.0"
},
Expand Down
45 changes: 32 additions & 13 deletions test/examples.test.js
View file
Open in desktop
Expand Up @@ -126,14 +126,18 @@ test('find keys and examples', function (t) {
* interface has been pretty stable in practice, with minimal change from
* 0.8 through to 4.2.
*/
var binding, HTTPParser, kOnHeadersComplete;
var binding, HTTPParser, kOnHeadersComplete, methods;

if (process.binding)
binding = process.binding('http_parser');
if (binding)
HTTPParser = binding.HTTPParser;
if (HTTPParser)
kOnHeadersComplete = HTTPParser.kOnHeadersComplete;
if (HTTPParser && HTTPParser.methods)
methods = HTTPParser.methods;
else
methods = ['DELETE', 'GET', 'HEAD', 'POST', 'PUT'];

function DummyRequest() {
}
Expand All @@ -148,22 +152,37 @@ function parseHttpRequest(data, cb) {
var obj = new DummyRequest();
p[kOnHeadersComplete] = onHeadersComplete;
function onHeadersComplete(opts) {
obj.httpVersionMajor = opts.versionMajor;
obj.httpVersionMinor = opts.versionMinor;
obj.httpVersion = opts.versionMajor + '.' + opts.versionMinor;

obj.rawHeaders = opts.headers;
var versionMajorKey = 'versionMajor';
var versionMinorKey = 'versionMinor';
var headersKey = 'headers';
var urlKey = 'url';
var methodKey = 'method';
var upgradeKey = 'upgrade';
if (!(typeof opts === 'object')) {
opts = [].slice.call(arguments);
versionMajorKey = 0;
versionMinorKey = "1";
headersKey = "2";
urlKey = "4";
methodKey = "3";
upgradeKey = "7";
}
obj.httpVersionMajor = opts[versionMajorKey];
obj.httpVersionMinor = opts[versionMinorKey];
obj.httpVersion = obj.httpVersionMajor + '.' + obj.httpVersionMinor;

obj.rawHeaders = opts[headersKey];
obj.headers = {};
for (var i = 0; i < opts.headers.length; i += 2) {
var k = opts.headers[i].toLowerCase();
var v = opts.headers[i+1];
for (var i = 0; i < obj.rawHeaders.length; i += 2) {
var k = obj.rawHeaders[i].toLowerCase();
var v = obj.rawHeaders[i+1];
obj.headers[k] = v;
}

obj.url = opts.url;
obj.path = opts.url;
obj.method = HTTPParser.methods[opts.method];
obj.upgrade = opts.upgrade;
obj.url = opts[urlKey];
obj.path = opts[urlKey];
obj.method = methods[opts[methodKey]];
obj.upgrade = opts[upgradeKey];

assert.ok(obj.httpVersion);
cb(obj);
Expand Down