Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Development to v4.1.0 #33

Merged
merged 5 commits into from
Dec 30, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
---
name: Bug report
about: Create a report to help us improve
about: Create a report to help tap-junit improve

---

Expand All @@ -17,6 +17,12 @@ Steps to reproduce the behavior:
**Expected behavior**
A clear and concise description of what you expected to happen.

**Command Line Usage**
If you're able please specify the command line format you used for tap-junit for example:
```cli
tap-junit -o output -n dependencies.xml -i tests/j-tap.tap
```

**Screenshots**
If applicable, add screenshots to help explain your problem.

Expand Down
1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ You can checkout the changelog at: https://github.com/dhershman1/tap-junit/blob/

## Parameters

- `-c, --classname` - The name you want to apply to the `testsuite` element (if not set no name is given to the output testsuite)
- `-o, --output` - designate where you want the .xml results to output
- If you do not specify an output then results will be displayed within the terminal
- `-n, --name` - value provided will be the name of the `output.xml` file, otherwise defaults to `tap.xml`
Expand Down
1 change: 1 addition & 0 deletions bin/tap-junit
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
/* Modules */
const parsedArgs = require('minimist')(process.argv.slice(2), {
alias: {
c: 'classname',
o: 'output',
n: 'name',
s: 'suite',
Expand Down
15 changes: 15 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,20 @@
# Changelog

## v4.1.0

### New

- Added the `-c` argument which sets the `testsuite` (NOT `testsuites`) name
- This should fix [#32](https://github.com/dhershman1/tap-junit/issues/32) for the jenkins plugin it uses

### Improved

- Tweaked the github bug report template a little to ask for the CLI use of tap-junit

### Fixed

- Removed the old `xmlbuilder` dependency, woops

## v4.0.0

### BREAKING CHANGES
Expand Down
7 changes: 1 addition & 6 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tap-junit",
"version": "4.0.0",
"version": "4.1.0",
"description": "Silly small, silly easy junit output formatter for tap.",
"main": "src/index.js",
"bin": {
Expand All @@ -15,6 +15,7 @@
"test:nontape": "cross-env bin/tap-junit --output output/test --name nontape.xml < tests/non-tape.tap",
"test:nooutput": "tape tests/pass.js | cross-env bin/tap-junit",
"test:skip": "tape tests/skip.js | bin/tap-junit -o output/test -n skip",
"test:jtap": "bin/tap-junit -o output -n dependencies.xml -i tests/j-tap.tap -c jenkins-deps",
"tape": "tape tests/pass.js",
"tapx": "bin/tap-junit -i tests/tapX.tap -o output/test -n tapx",
"bat": "bin/tap-junit -i tests/bats-1.0.0.txt -o output/test -n bat -p",
Expand Down Expand Up @@ -47,7 +48,6 @@
"dependencies": {
"minimist": "1.2.5",
"tap-parser": "10.1.0",
"xmlbuilder": "15.1.0",
"xmlbuilder2": "2.4.0"
},
"devDependencies": {
Expand Down
3 changes: 2 additions & 1 deletion src/serialize.js
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,15 @@ function buildFailureParams (fail, comment) {
return failObj
}

module.exports = (testCases, output, comments, { name = 'Tap-Junit', pretty }) => {
module.exports = (testCases, output, comments, { name = 'Tap-Junit', pretty, classname = 'Tap-Junit-Suite' }) => {
const len = testCases.length
const xmlObj = {
testsuites: {
'@tests': output.count,
'@name': name,
'@failures': output.fail,
testsuite: {
'@name': classname,
'@tests': output.count,
'@skipped': output.skip,
'@failures': output.fail,
Expand Down
9 changes: 9 additions & 0 deletions tests/j-tap.tap
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
TAP version 13
# @scope/package
ok 1 - Package @scope/package is using registered runtime dependency @angular/core
ok 2 - Package @scope/package is using registered runtime dependency @angular/cdk
ok 3 - Package @scope/package is using registered runtime dependency rxjs
ok 4 - Package @scope/package's dependency @angular/cdk is used
ok 5 - Package @scope/package's dependency @angular/core is used
ok 6 - Package @scope/package's dependency rxjs is used
1..6