Skip to content

Commit

Permalink
Merge pull request #181 from Evilweed/fixbrowser
Browse files Browse the repository at this point in the history
total duration and fix browser version
  • Loading branch information
miller45 authored Sep 14, 2019
2 parents cd14069 + 3ae9bbf commit 68626b5
Show file tree
Hide file tree
Showing 5 changed files with 127 additions and 225 deletions.
4 changes: 2 additions & 2 deletions CHANGES.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Changelog
## Version 1.3.3
* Added: Options for showing total duration in report
* Upgraded: Using nyc instead of istanbul for test coverage
* Fixed: browser version was missing in report
* Added: Options for showing total duration in report
## Version 1.3.2
* Fixed: OS column in report is empty (with browsers other than chrome)
* Removed: Unused code for jasmine 1 (defaultMetadataBuilder)
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -392,13 +392,12 @@ add the following to columnSettings (values are in milliseconds scale):
baseDirectory: 'reports'
, clientDefaults:{
showTotalDurationIn: "header",
totalDurationFormat: "hms",
totalDurationFormat: "hms"
}
});
```
For all possible values for `showTotalDurationIn` and `totalDurationFormat` refer to the wiki entry [Options for showing total duration of e2e test](https://github.com/Evilweed/protractor-beautiful-reporter/wiki/Options-for-showing-total-duration-of-e2e-test)


### Load spec results via ajax
By default the raw data of all tests results from the e2e session are embedded in the main javascript file (array results in app.js).
If you add `useAjax:true` to `clientDefaults` the data is not embedded in the app.js but is loaded from the file `combined.json` which contains all the raw test results.
Expand Down
3 changes: 2 additions & 1 deletion app/reporter.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ function jasmine2MetaDataBuilder(spec, descriptions, results, capabilities) {
let isPassed = results.status === 'passed';
let isPending = ['pending', 'disabled', 'excluded'].includes(results.status);
let osInfo= capabilities.get("platform") || capabilities.get("platformName");
let version = capabilities.get("browserVersion") || capabilities.get("version");
let metaData = {
description: descriptions.join(' '),
passed: isPassed,
Expand All @@ -36,7 +37,7 @@ function jasmine2MetaDataBuilder(spec, descriptions, results, capabilities) {
instanceId: process.pid,
browser: {
name: capabilities.get('browserName'),
version: capabilities.get('version')
version: version
}
};

Expand Down
Loading

0 comments on commit 68626b5

Please sign in to comment.