Skip to content

Commit 3bb5822

Browse files
davidjgossdavidjgoss
committed
Merge main
2 parents bdaa641 + 7e51389 commit 3bb5822

24 files changed

+5061
-59
lines changed

‎.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text eol=lf

‎.github/workflows/release-npm.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
name: Release NPM
2+
3+
on:
4+
push:
5+
branches: [release/*]
6+
7+
jobs:
8+
publish-npm:
9+
name: Publish NPM module
10+
runs-on: ubuntu-latest
11+
environment: Release
12+
steps:
13+
- uses: actions/checkout@v4
14+
- uses: actions/setup-node@v4
15+
with:
16+
node-version: '22'
17+
cache: 'npm'
18+
cache-dependency-path: javascript/package-lock.json
19+
- run: npm install-test
20+
working-directory: javascript
21+
- uses: cucumber/[email protected]
22+
with:
23+
npm-token: ${{ secrets.NPM_TOKEN }}
24+
working-directory: javascript

‎.github/workflows/test-javascript.yml

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
name: test-javascript
2+
3+
on:
4+
push:
5+
branches:
6+
- main
7+
- renovate/**
8+
pull_request:
9+
branches:
10+
- main
11+
workflow_call:
12+
13+
jobs:
14+
test-javascript:
15+
runs-on: ${{ matrix.os }}
16+
strategy:
17+
fail-fast: false
18+
matrix:
19+
os:
20+
- ubuntu-latest
21+
node-version: ["18.x", "20.x", "22.x"]
22+
include:
23+
- os: windows-latest
24+
node-version: "22.x"
25+
- os: macos-latest
26+
node-version: "22.x"
27+
28+
steps:
29+
- uses: actions/checkout@v4
30+
31+
- name: with Node.js ${{ matrix.node-version }} on ${{ matrix.os }}
32+
uses: actions/setup-node@v4
33+
with:
34+
node-version: ${{ matrix.node-version }}
35+
cache: "npm"
36+
cache-dependency-path: javascript/package-lock.json
37+
38+
- run: npm install-ci-test
39+
working-directory: javascript

‎CHANGELOG.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,17 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

88
## [Unreleased]
9-
109
### Added
11-
- Update dependency io.cucumber:messages up to v26 ((#38)[https://github.com/cucumber/query/pull/38])
1210
- Add `timestamp` attribute ((#45)[https://github.com/cucumber/junit-xml-formatter/pull/45])
1311

12+
## [0.6.0] - 2024-11-15
13+
### Added
14+
- JavaScript implementation ([#42](https://github.com/cucumber/junit-xml-formatter/pull/42))
15+
- Update dependency io.cucumber:messages up to v26 ([#38](https://github.com/cucumber/junit-xml-formatter/pull/38))
16+
17+
### Fixed
18+
- Attempts that have been superseded by retries are now omitted from the report ([#42](https://github.com/cucumber/junit-xml-formatter/pull/42))
19+
1420
## [0.5.0] - 2024-06-22
1521
### Added
1622
- Include pickle name if parameterized [#34](https://github.com/cucumber/junit-xml-formatter/pull/34)
@@ -37,7 +43,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
3743
### Added
3844
- Java implementation ([#3](https://github.com/cucumber/junit-xml-formatter/pull/3) M.P. Korstanje)
3945

40-
[Unreleased]: https://github.com/cucumber/junit-xml-formatter/compare/v0.5.0...HEAD
46+
[Unreleased]: https://github.com/cucumber/junit-xml-formatter/compare/v0.6.0...HEAD
47+
[0.6.0]: https://github.com/cucumber/junit-xml-formatter/compare/v0.5.0...v0.6.0
4148
[0.5.0]: https://github.com/cucumber/junit-xml-formatter/compare/v0.4.0...v0.5.0
4249
[0.4.0]: https://github.com/cucumber/junit-xml-formatter/compare/v0.3.0...v0.4.0
4350
[0.3.0]: https://github.com/cucumber/junit-xml-formatter/compare/v0.2.1...v0.3.0

‎java/pom.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@
99
</parent>
1010

1111
<artifactId>junit-xml-formatter</artifactId>
12-
<version>0.5.1-SNAPSHOT</version>
12+
<version>0.6.1-SNAPSHOT</version>
1313
<packaging>jar</packaging>
1414
<name>JUnit XML Formatter</name>
1515
<description>Renders Cucumber Messages as JUnit XML</description>
1616
<url>https://github.com/cucumber/junit-xml-formatter</url>
1717

1818
<properties>
1919
<project.Automatic-Module-Name>io.cucumber.junitxmlformatter</project.Automatic-Module-Name>
20-
<project.build.outputTimestamp>1719064372</project.build.outputTimestamp>
20+
<project.build.outputTimestamp>1731653110</project.build.outputTimestamp>
2121
</properties>
2222

2323
<scm>
@@ -56,7 +56,7 @@
5656
<dependency>
5757
<groupId>io.cucumber</groupId>
5858
<artifactId>query</artifactId>
59-
<version>[12.2.0,13.0.0)</version>
59+
<version>[13.0.2,14.0.0)</version>
6060
</dependency>
6161

6262
<dependency>

‎java/src/main/java/io/cucumber/junitxmlformatter/XmlReportData.java

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,19 @@ int getTestCaseCount() {
6363
return query.findAllTestCaseStarted().size();
6464
}
6565

66-
String getPickleName(TestCaseStarted testCaseStarted) {
67-
Pickle pickle = query.findPickleBy(testCaseStarted)
66+
private Pickle getPickle(TestCaseStarted testCaseStarted) {
67+
return query.findPickleBy(testCaseStarted)
6868
.orElseThrow(() -> new IllegalStateException("No pickle for " + testCaseStarted.getId()));
69+
}
6970

70-
return query.findNameOf(pickle, namingStrategy);
71+
String getPickleName(TestCaseStarted testCaseStarted) {
72+
return query.findNameOf(getPickle(testCaseStarted), namingStrategy);
7173
}
7274

7375
String getFeatureName(TestCaseStarted testCaseStarted) {
7476
return query.findFeatureBy(testCaseStarted)
7577
.map(Feature::getName)
76-
.orElseThrow(() -> new IllegalStateException("No feature for " + testCaseStarted));
78+
.orElseGet(() -> this.getPickle(testCaseStarted).getUri());
7779
}
7880

7981
List<Entry<String, String>> getStepsAndResult(TestCaseStarted testCaseStarted) {
@@ -122,7 +124,7 @@ List<TestCaseStarted> getAllTestCaseStarted() {
122124
private static final TestStepResult SCENARIO_WITH_NO_STEPS = new TestStepResult(ZERO_DURATION, null, PASSED, null);
123125

124126
TestStepResult getTestCaseStatus(TestCaseStarted testCaseStarted) {
125-
return query.findMostSevereTestStepResulBy(testCaseStarted)
127+
return query.findMostSevereTestStepResultBy(testCaseStarted)
126128
.orElse(SCENARIO_WITH_NO_STEPS);
127129
}
128130

‎java/src/main/java/io/cucumber/junitxmlformatter/XmlReportWriter.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ private void writeSuiteAttributes(EscapingXmlStreamWriter writer) throws XMLStre
5656
Map<TestStepResultStatus, Long> counts = data.getTestCaseStatusCounts();
5757

5858
writer.writeAttribute("tests", String.valueOf(data.getTestCaseCount()));
59-
writer.writeAttribute("skipped", counts.getOrDefault(SKIPPED, 0L).toString());
59+
writer.writeAttribute("skipped", counts.get(SKIPPED).toString());
6060
writer.writeAttribute("failures", String.valueOf(countFailures(counts)));
6161
writer.writeAttribute("errors", "0");
6262

@@ -67,7 +67,7 @@ private void writeSuiteAttributes(EscapingXmlStreamWriter writer) throws XMLStre
6767
}
6868

6969
private static long countFailures(Map<TestStepResultStatus, Long> counts) {
70-
return createNotPassedNotSkippedSet().stream().mapToLong(s -> counts.getOrDefault(s, 0L)).sum();
70+
return createNotPassedNotSkippedSet().stream().mapToLong(counts::get).sum();
7171
}
7272

7373
private static EnumSet<TestStepResultStatus> createNotPassedNotSkippedSet() {

‎javascript/.eslintrc.json

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
{
2+
"env": {
3+
"browser": true,
4+
"node": true
5+
},
6+
"parser": "@typescript-eslint/parser",
7+
"parserOptions": {
8+
"project": "tsconfig.json",
9+
"sourceType": "module"
10+
},
11+
"plugins": [
12+
"import",
13+
"simple-import-sort",
14+
"n",
15+
"@typescript-eslint"
16+
],
17+
"extends": [
18+
"eslint:recommended",
19+
"plugin:import/typescript",
20+
"plugin:@typescript-eslint/eslint-recommended",
21+
"plugin:@typescript-eslint/recommended",
22+
"plugin:prettier/recommended"
23+
],
24+
"rules": {
25+
"import/no-cycle": "error",
26+
"n/no-extraneous-import": "error",
27+
"@typescript-eslint/ban-ts-ignore": "off",
28+
"@typescript-eslint/ban-ts-comment": "off",
29+
"@typescript-eslint/explicit-module-boundary-types": "off",
30+
"@typescript-eslint/explicit-function-return-type": "off",
31+
"@typescript-eslint/no-use-before-define": "off",
32+
"@typescript-eslint/interface-name-prefix": "off",
33+
"@typescript-eslint/member-delimiter-style": "off",
34+
"@typescript-eslint/no-explicit-any": "error",
35+
"@typescript-eslint/no-non-null-assertion": "error",
36+
"simple-import-sort/imports": "error",
37+
"simple-import-sort/exports": "error"
38+
}
39+
}

‎javascript/.gitignore

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
dist/
2+
.idea/
3+
.nyc_output/
4+
coverage/
5+
node_modules/
6+
yarn.lock
7+
*.log
8+
.deps
9+
.tested*
10+
.linted
11+
.built*
12+
.compared
13+
.codegen
14+
acceptance/
15+
storybook-static
16+
*-go
17+
*.iml
18+
.vscode-test
19+
20+
# stryker temp files
21+
.stryker-tmp
22+
reports

‎javascript/.mocharc.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"loader": "ts-node/esm",
3+
"extension": ["ts"],
4+
"recursive": true
5+
}

0 commit comments

Comments
 (0)