Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
pvdlg committed Jan 9, 2020
2 parents 98bbcce + 2d0ad27 commit 4c6cd03
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 5 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@
"dir-glob": "^3.0.0",
"fs-extra": "^8.0.0",
"globby": "^10.0.0",
"http-proxy-agent": "^2.1.0",
"https-proxy-agent": "^3.0.0",
"http-proxy-agent": "^3.0.0",
"https-proxy-agent": "^4.0.0",
"issue-parser": "^5.0.0",
"lodash": "^4.17.4",
"mime": "^2.4.3",
Expand All @@ -38,12 +38,12 @@
"clear-module": "^4.0.0",
"codecov": "^3.5.0",
"nock": "^11.1.0",
"nyc": "^14.1.1",
"nyc": "^15.0.0",
"proxy": "^1.0.0",
"proxyquire": "^2.0.0",
"semantic-release": "^16.0.0-beta",
"server-destroy": "^1.0.1",
"sinon": "^7.1.1",
"sinon": "^8.0.0",
"tempy": "^0.3.0",
"xo": "^0.25.2"
},
Expand Down
4 changes: 3 additions & 1 deletion test/get-client.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import rateLimit from './helpers/rate-limit';

const getClient = proxyquire('../lib/get-client', {'./definitions/rate-limit': rateLimit});

process.env.NODE_TLS_REJECT_UNAUTHORIZED = 0;

test.serial('Use a http proxy', async t => {
const server = http.createServer();
await promisify(server.listen).bind(server)();
Expand Down Expand Up @@ -73,7 +75,7 @@ test.serial('Use a https proxy', async t => {
githubToken: 'github_token',
githubUrl: `https://localhost:${serverPort}`,
githubApiPathPrefix: '',
proxy: {host: 'localhost', port: proxyPort, rejectUnauthorized: false, headers: {foo: 'bar'}},
proxy: {host: 'localhost', port: proxyPort, headers: {foo: 'bar'}},
});

await github.repos.get({repo: 'repo', owner: 'owner'});
Expand Down

0 comments on commit 4c6cd03

Please sign in to comment.