Skip to content

Commit 48a6c13

Browse files
authored
Merge pull request #210 from palmerj3/v13.2.0
Bump to version 13.2.0 and fix windows build
2 parents 82047d1 + b4fe131 commit 48a6c13

File tree

6 files changed

+185
-382
lines changed

6 files changed

+185
-382
lines changed

.github/workflows/nodejs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
strategy:
1717
fail-fast: false
1818
matrix:
19-
node-version: [10.x, 12.x, 13.x, 14.x, 16.x]
19+
node-version: [12.x, 13.x, 14.x, 16.x]
2020
jest-version: [24, 25, 26, 27]
2121
exclude:
2222
# jest@27 doesn't support node@13
@@ -49,7 +49,7 @@ jobs:
4949
- uses: actions/checkout@v2
5050
- uses: actions/setup-node@v2
5151
with:
52-
node-version: 14.x
52+
node-version: lts/*
5353
cache: yarn
5454
- name: install
5555
run: yarn

__tests__/buildJsonResults.test.js

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -418,45 +418,4 @@ describe('buildJsonResults', () => {
418418

419419
expect(jsonResults.testsuites[1].testsuite[2]['system-out']).not.toBeDefined();
420420
});
421-
422-
it('should get custom testsuite properties from specified file path', () => {
423-
const noFailingTestsReport = require('../__mocks__/no-failing-tests.json');
424-
jest.mock(
425-
'/path/to/properties.js',
426-
() => {
427-
return jest.fn(() => {
428-
return { 'best-tester': 'Johan' };
429-
});
430-
},
431-
{ virtual: true },
432-
);
433-
434-
fs.existsSync.mockReturnValue(true);
435-
436-
const options = {
437-
...constants.DEFAULT_OPTIONS,
438-
testSuitePropertiesFile: 'properties.js',
439-
testSuitePropertiesDirectory: '<rootDir>',
440-
};
441-
442-
jsonResults = buildJsonResults(
443-
noFailingTestsReport,
444-
'/',
445-
options,
446-
'/path/to',
447-
);
448-
449-
expect(jsonResults.testsuites[1].testsuite[1].properties).toEqual(
450-
expect.arrayContaining([
451-
{
452-
property: expect.objectContaining({
453-
_attr: expect.objectContaining({
454-
name: 'best-tester',
455-
value: 'Johan',
456-
}),
457-
}),
458-
},
459-
]),
460-
);
461-
});
462421
});

__tests__/lib/setupTests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const xml = require('xml');
22
const path = require('path');
33
const fs = require('fs');
4-
const libxmljs = require('libxmljs');
4+
const libxmljs = require('libxmljs2');
55

66
const schemaPath = path.join(__dirname, 'junit.xsd');
77
const schemaStr = fs.readFileSync(schemaPath);

__tests__/testResultProcessor.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jest.mock('fs', () => {
2121
});
2222

2323
const fs = require('fs');
24-
const libxmljs = require('libxmljs');
24+
const libxmljs = require('libxmljs2');
2525
const path = require('path');
2626

2727
const testResultProcessor = require('../');

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "jest-junit",
3-
"version": "13.1.0",
3+
"version": "13.2.0",
44
"description": "A jest reporter that generates junit xml files",
55
"main": "index.js",
66
"repository": "https://github.com/jest-community/jest-junit",
@@ -25,7 +25,7 @@
2525
},
2626
"devDependencies": {
2727
"jest": "^27.2.3",
28-
"libxmljs": "^0.19.7",
28+
"libxmljs2": "^0.29.0",
2929
"slash": "^3.0.0"
3030
}
3131
}

0 commit comments

Comments
 (0)