@natlibfi/fixugen-http-server 1.1.6 → 1.1.7-alpha.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/.github/dependabot.yml +9 -4
- package/.github/workflows/melinda-node-tests.yml +5 -5
- package/dist/index.js +2 -2
- package/dist/index.js.map +1 -1
- package/package.json +12 -13
package/.github/dependabot.yml
CHANGED
|
@@ -10,7 +10,7 @@ updates:
|
|
|
10
10
|
interval: "daily"
|
|
11
11
|
time: "06:30"
|
|
12
12
|
timezone: "Europe/Helsinki"
|
|
13
|
-
target-branch: "
|
|
13
|
+
target-branch: "next"
|
|
14
14
|
|
|
15
15
|
# Minor updates to npm production dependencies daily
|
|
16
16
|
- package-ecosystem: "npm"
|
|
@@ -20,9 +20,14 @@ updates:
|
|
|
20
20
|
time: "06:45"
|
|
21
21
|
timezone: "Europe/Helsinki"
|
|
22
22
|
versioning-strategy: lockfile-only
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
23
|
+
target-branch: "next"
|
|
24
|
+
pull-request-branch-name:
|
|
25
|
+
separator: "-"
|
|
26
|
+
groups:
|
|
27
|
+
production-dependencies:
|
|
28
|
+
dependency-type: "production"
|
|
29
|
+
development-dependencies:
|
|
30
|
+
dependency-type: "development"
|
|
26
31
|
|
|
27
32
|
# Major updates to npm dependencies weekly @tuesday
|
|
28
33
|
# Not possible yet https://github.com/dependabot/dependabot-core/issues/1778
|
|
@@ -11,12 +11,12 @@ jobs:
|
|
|
11
11
|
|
|
12
12
|
strategy:
|
|
13
13
|
matrix:
|
|
14
|
-
node-version: [16.x, 18.x,
|
|
14
|
+
node-version: [16.x, 18.x, 20.x]
|
|
15
15
|
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
|
|
16
16
|
|
|
17
17
|
steps:
|
|
18
18
|
- name: Checkout the code
|
|
19
|
-
uses: actions/checkout@
|
|
19
|
+
uses: actions/checkout@v4
|
|
20
20
|
- name: Use Node.js ${{ matrix.node-version }}
|
|
21
21
|
uses: actions/setup-node@v3
|
|
22
22
|
with:
|
|
@@ -34,7 +34,7 @@ jobs:
|
|
|
34
34
|
runs-on: ubuntu-latest
|
|
35
35
|
|
|
36
36
|
steps:
|
|
37
|
-
- uses: actions/checkout@
|
|
37
|
+
- uses: actions/checkout@v4
|
|
38
38
|
- uses: mikaelvesavuori/license-compliance-action@v1.0.2
|
|
39
39
|
with:
|
|
40
40
|
exclude_pattern: /^@natlibfi/
|
|
@@ -45,7 +45,7 @@ jobs:
|
|
|
45
45
|
|
|
46
46
|
steps:
|
|
47
47
|
- name: Checkout the code
|
|
48
|
-
uses: actions/checkout@
|
|
48
|
+
uses: actions/checkout@v4
|
|
49
49
|
- name: nodejsscan scan
|
|
50
50
|
id: njsscan
|
|
51
51
|
uses: ajinabraham/njsscan-action@master
|
|
@@ -58,7 +58,7 @@ jobs:
|
|
|
58
58
|
if: contains(github.ref, 'refs/tags/')
|
|
59
59
|
|
|
60
60
|
steps:
|
|
61
|
-
- uses: actions/checkout@
|
|
61
|
+
- uses: actions/checkout@v4
|
|
62
62
|
# Setup .npmrc file to publish to npm
|
|
63
63
|
- uses: actions/setup-node@v3
|
|
64
64
|
with:
|
package/dist/index.js
CHANGED
|
@@ -8,8 +8,8 @@ var _fixura = require("@natlibfi/fixura");
|
|
|
8
8
|
var _fixugen = _interopRequireDefault(require("@natlibfi/fixugen"));
|
|
9
9
|
var _chai = _interopRequireWildcard(require("chai"));
|
|
10
10
|
var _chaiHttp = _interopRequireDefault(require("chai-http"));
|
|
11
|
-
function _getRequireWildcardCache(
|
|
12
|
-
function _interopRequireWildcard(
|
|
11
|
+
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
12
|
+
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
13
13
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
|
|
14
14
|
/**
|
|
15
15
|
*
|
package/dist/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","names":["_fixura","require","_fixugen","_interopRequireDefault","_chai","_interopRequireWildcard","_chaiHttp","_getRequireWildcardCache","
|
|
1
|
+
{"version":3,"file":"index.js","names":["_fixura","require","_fixugen","_interopRequireDefault","_chai","_interopRequireWildcard","_chaiHttp","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","obj","_default","path","recurse","formatResponse","formatResponseDefault","callback","createApp","mocha","requester","chai","use","chaiHttp","generateTests","httpCallback","useMetadataFile","fixura","failWhenNotFound","afterEach","mochaAfterEach","closeRequester","close","getFixtures","requests","options","requestFixtures","components","reader","READERS","TEXT","responseFixtures","app","request","keepOpen","iterate","testRequests","index","testRequest","slice","method","status","requestParams","requestHeaders","responseHeaders","requestPayload","requestPath","requestMethod","toLowerCase","buffer","query","entries","forEach","k","v","response","send","handleResponse","headers","payload","text","expectedResponsePayload","expect","to","have","key","value","header","equal","exports"],"sources":["../src/index.js"],"sourcesContent":["/**\n*\n* @licstart The following is the entire license notice for the JavaScript code in this file.\n*\n* Generate unit tests for HTTP servers with fixugen\n*\n* Copyright (C) 2020 University Of Helsinki (The National Library Of Finland)\n*\n* This file is part of fixugen-http-server-js\n*\n* fixugen-http-server-js program is free software: you can redistribute it and/or modify\n* it under the terms of the GNU Affero General Public License as\n* published by the Free Software Foundation, either version 3 of the\n* License, or (at your option) any later version.\n*\n* fixugen-http-server-js is distributed in the hope that it will be useful,\n* but WITHOUT ANY WARRANTY; without even the implied warranty of\n* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the\n* GNU Affero General Public License for more details.\n*\n* You should have received a copy of the GNU Affero General Public License\n* along with this program. If not, see <http://www.gnu.org/licenses/>.\n*\n* @licend The above is the entire license notice\n* for the JavaScript code in this file.\n*\n*/\n\nimport {READERS} from '@natlibfi/fixura';\nimport generateTests from '@natlibfi/fixugen';\nimport chai, {expect} from 'chai';\nimport chaiHttp from 'chai-http';\n\nexport default ({path, recurse, formatResponse = formatResponseDefault, callback: createApp, mocha = {}}) => {\n let requester; // eslint-disable-line functional/no-let\n\n chai.use(chaiHttp);\n\n generateTests({\n path, recurse,\n callback: httpCallback,\n useMetadataFile: true,\n fixura: {\n failWhenNotFound: false\n },\n mocha: {\n ...mocha,\n afterEach: mochaAfterEach\n }\n });\n\n async function mochaAfterEach() {\n if (mocha.afterEach) {\n await mocha.afterEach();\n return closeRequester();\n }\n\n closeRequester();\n\n function closeRequester() {\n /* istanbul ignore else: Not easily tested */\n if (requester) {\n return requester.close();\n }\n }\n }\n\n async function httpCallback({getFixtures, requests, ...options}) {\n const requestFixtures = getFixtures({\n components: [/^request[0-9]+\\..*$/u],\n reader: READERS.TEXT\n });\n\n const responseFixtures = getFixtures({\n components: [/^response[0-9]+\\..*$/u],\n reader: READERS.TEXT\n });\n\n const app = await createApp({...options, requests});\n\n requester = chai.request(app).keepOpen();\n\n return iterate(requests);\n\n async function iterate(testRequests, index = 0) {\n const [testRequest] = testRequests.slice(0, 1);\n\n if (testRequest) {\n const {\n method, path, status,\n requestParams = {}, requestHeaders = {}, responseHeaders = {}\n } = testRequest;\n\n const requestPayload = requestFixtures[index];\n const requestPath = path || '/';\n const requestMethod = method.toLowerCase();\n const request = requester[requestMethod](requestPath).buffer(true);\n\n request.query(requestParams);\n\n Object.entries(requestHeaders).forEach(([k, v]) => request.set(k, v));\n\n const response = await request.send(requestPayload);\n await handleResponse(response, status, responseHeaders);\n return iterate(requests.slice(1), index + 1);\n\n }\n\n async function handleResponse(response, status, responseHeaders) {\n const {headers, payload} = await formatResponse(responseHeaders, response.text);\n const expectedResponsePayload = responseFixtures[index];\n\n expect(response).to.have.status(status);\n\n Object.entries(headers).forEach(([key, value]) => expect(response).to.have.header(key, value));\n\n if (expectedResponsePayload) {\n return expect(payload).to.equal(expectedResponsePayload);\n }\n }\n }\n }\n};\n\nfunction formatResponseDefault(headers, payload) {\n return {headers, payload};\n}\n"],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"url": "git@github.com:natlibfi/fixugen-http-server-js.git"
|
|
15
15
|
},
|
|
16
16
|
"license": "LGPL-3.0+",
|
|
17
|
-
"version": "1.1.
|
|
17
|
+
"version": "1.1.7-alpha.1",
|
|
18
18
|
"main": "dist/index.js",
|
|
19
19
|
"engines": {
|
|
20
20
|
"node": ">=18"
|
|
@@ -34,25 +34,24 @@
|
|
|
34
34
|
"watch:test": "cross-env DEBUG=1 NODE_ENV=test nodemon -w src -w test-fixtures --exec 'npm run test:dev'"
|
|
35
35
|
},
|
|
36
36
|
"dependencies": {
|
|
37
|
-
"@natlibfi/fixugen": "^2.0.
|
|
38
|
-
"@natlibfi/fixura": "^3.0.
|
|
37
|
+
"@natlibfi/fixugen": "^2.0.2",
|
|
38
|
+
"@natlibfi/fixura": "^3.0.2",
|
|
39
39
|
"chai-http": "^4.4.0"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
|
-
"@babel/cli": "^7.
|
|
43
|
-
"@babel/core": "^7.
|
|
44
|
-
"@babel/
|
|
45
|
-
"@babel/
|
|
46
|
-
"@babel/
|
|
47
|
-
"@
|
|
48
|
-
"@natlibfi/eslint-config-melinda-backend": "^3.0.0",
|
|
42
|
+
"@babel/cli": "^7.23.0",
|
|
43
|
+
"@babel/core": "^7.23.2",
|
|
44
|
+
"@babel/node": "^7.22.19",
|
|
45
|
+
"@babel/preset-env": "^7.23.2",
|
|
46
|
+
"@babel/register": "^7.22.15",
|
|
47
|
+
"@natlibfi/eslint-config-melinda-backend": "^3.0.2",
|
|
49
48
|
"babel-plugin-istanbul": "^6.1.1",
|
|
50
|
-
"chai": "^4.3.
|
|
49
|
+
"chai": "^4.3.10",
|
|
51
50
|
"cross-env": "^7.0.3",
|
|
52
|
-
"eslint": "^8.
|
|
51
|
+
"eslint": "^8.51.0",
|
|
53
52
|
"express": "^4.18.2",
|
|
54
53
|
"mocha": "^10.2.0",
|
|
55
|
-
"node-fetch": "^2.
|
|
54
|
+
"node-fetch": "^2.7.0",
|
|
56
55
|
"nodemon": "^3.0.1",
|
|
57
56
|
"nyc": "^15.1.0"
|
|
58
57
|
},
|