-
Notifications
You must be signed in to change notification settings - Fork 760
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #792 from lamweili/refactor/test
test: 100% coverage
- Loading branch information
Showing
5 changed files
with
110 additions
and
22 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node | ||
# For more information see: https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions | ||
|
||
name: Node.js CI | ||
|
||
on: [push, pull_request] | ||
|
||
jobs: | ||
build: | ||
|
||
runs-on: ubuntu-latest | ||
|
||
strategy: | ||
matrix: | ||
include: | ||
- node-version: 10.x | ||
test-on-old-node: 1 | ||
- node-version: 12.x | ||
test-on-old-node: 1 | ||
- node-version: 14.x | ||
- node-version: 16.x | ||
- node-version: 18.x | ||
|
||
steps: | ||
- uses: actions/checkout@v3 | ||
- name: Use Node.js ${{ matrix.node-version }} | ||
uses: actions/setup-node@v3 | ||
with: | ||
node-version: ${{ matrix.node-version }} | ||
cache: 'npm' | ||
- name: Install Dependencies On Old Node ${{ matrix.node-version }} | ||
if: ${{ matrix.test-on-old-node == '1' }} | ||
run: node ci/remove-deps-4-old-node.js && yarn install --ignore-scripts | ||
- name: Install Dependencies On Node ${{ matrix.node-version }} | ||
if: ${{ matrix.test-on-old-node != '1' }} | ||
run: yarn install | ||
- run: npm test | ||
- name: Coverage On Node ${{ matrix.node-version }} | ||
run: | ||
npm run coverage |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
const fs = require('fs'); | ||
const path = require('path'); | ||
const package = require('../package.json'); | ||
|
||
const UNSUPPORT_DEPS_4_OLD = { | ||
'eslint': undefined, | ||
'mocha': '6.x' | ||
}; | ||
|
||
const deps = Object.keys(UNSUPPORT_DEPS_4_OLD); | ||
for (const item in package.devDependencies) { | ||
if (deps.includes(item)) { | ||
package.devDependencies[item] = UNSUPPORT_DEPS_4_OLD[item]; | ||
} | ||
} | ||
|
||
delete package.scripts.lint; | ||
|
||
fs.writeFileSync( | ||
path.join(__dirname, '../package.json'), | ||
JSON.stringify(package, null, 2) | ||
); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -20,12 +20,7 @@ const Test = require('./test.js'); | |
function TestAgent(app, options) { | ||
if (!(this instanceof TestAgent)) return new TestAgent(app, options); | ||
if (typeof app === 'function') app = http.createServer(app); // eslint-disable-line no-param-reassign | ||
if (options) { | ||
this._ca = options.ca; | ||
this._key = options.key; | ||
this._cert = options.cert; | ||
} | ||
Agent.call(this); | ||
Agent.call(this, options); | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
lamweili
Contributor
|
||
this.app = app; | ||
} | ||
|
||
|
@@ -44,19 +39,17 @@ TestAgent.prototype.host = function(host) { | |
// override HTTP verb methods | ||
methods.forEach(function(method) { | ||
TestAgent.prototype[method] = function(url, fn) { // eslint-disable-line no-unused-vars | ||
const req = new Test(this.app, method.toUpperCase(), url, this._host); | ||
req.ca(this._ca); | ||
req.cert(this._cert); | ||
req.key(this._key); | ||
const req = new Test(this.app, method.toUpperCase(), url); | ||
|
||
if (this._host) { | ||
req.set('host', this._host); | ||
} | ||
|
||
req.on('response', this._saveCookies.bind(this)); | ||
req.on('redirect', this._saveCookies.bind(this)); | ||
req.on('redirect', this._attachCookies.bind(this, req)); | ||
this._attachCookies(req); | ||
this._setDefaults(req); | ||
this._attachCookies(req); | ||
|
||
return req; | ||
}; | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Are you sure
_ca
_key
and_cert
will still function as normal? This is breaking? @lamweili