Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
wheresrhys committed Aug 5, 2018
1 parent 786b180 commit 93905ad
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 34 deletions.
2 changes: 1 addition & 1 deletion src/lib/compile-route.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const glob = require('glob-to-regexp');
const URL = require('whatwg-url');
const express = require('path-to-regexp');
const querystring = require('querystring');
const {headers: headerUtils} = require('./request-utils');
const { headers: headerUtils } = require('./request-utils');

const stringMatchers = {
begin: targetString => {
Expand Down
3 changes: 1 addition & 2 deletions src/lib/fetch-handler.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const ResponseBuilder = require('./response-builder');
const URL = require('whatwg-url');
const requestUtils = require('./request-utils');
const FetchMock = {};

Expand All @@ -25,7 +24,7 @@ const normalizeRequest = (url, options, Request) => {
opts: options
};
}
}
};

FetchMock.fetchHandler = function(url, opts, request) {
({ url, opts, request } = normalizeRequest(url, opts, this.config.Request));
Expand Down
4 changes: 1 addition & 3 deletions src/lib/inspecting.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,7 @@ FetchMock.callsFilteredByName = function(name) {

const normalizedName = normalizeURL(name);

return this._allCalls.filter(
([url]) => normalizeURL(url) === normalizedName
);
return this._allCalls.filter(([url]) => normalizeURL(url) === normalizedName);
};

FetchMock.calls = function(name, options = {}) {
Expand Down
58 changes: 30 additions & 28 deletions src/lib/request-utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,35 +17,37 @@ const zip = entries =>
entries.reduce((obj, [key, val]) => Object.assign(obj, { [key]: val }), {});

module.exports = {

normalizeURL: (url) => {
if (absoluteUrlRX.test(url)) {
const u = new URL.URL(url);
return u.href;
} else {
const u = new URL.URL(url, 'http://dummy');
return u.pathname;
}
},
normalizeURL: url => {
if (absoluteUrlRX.test(url)) {
const u = new URL.URL(url);
return u.href;
} else {
const u = new URL.URL(url, 'http://dummy');
return u.pathname;
}
},
headers: {
normalize: headers => zip(toArray(headers)),
toArray,
zip,
toLowerCase: headers =>
Object.keys(headers).reduce((obj, k) => {
obj[k.toLowerCase()] = headers[k];
return obj;
}, {}),
equal: (actualHeader, expectedHeader) => {
actualHeader = Array.isArray(actualHeader) ? actualHeader : [actualHeader];
expectedHeader = Array.isArray(expectedHeader)
? expectedHeader
: [expectedHeader];
normalize: headers => zip(toArray(headers)),
toArray,
zip,
toLowerCase: headers =>
Object.keys(headers).reduce((obj, k) => {
obj[k.toLowerCase()] = headers[k];
return obj;
}, {}),
equal: (actualHeader, expectedHeader) => {
actualHeader = Array.isArray(actualHeader)
? actualHeader
: [actualHeader];
expectedHeader = Array.isArray(expectedHeader)
? expectedHeader
: [expectedHeader];

if (actualHeader.length !== expectedHeader.length) {
return false;
}
if (actualHeader.length !== expectedHeader.length) {
return false;
}

return actualHeader.every((val, i) => val === expectedHeader[i]);
return actualHeader.every((val, i) => val === expectedHeader[i]);
}
}
}}
};

0 comments on commit 93905ad

Please sign in to comment.