Skip to content

Commit 99a207a

Browse files
committed
generating junit reports in /test/reports
- karma client unit tests (only local, not in saucelabs multi-browser tests) - frisby server unit tests - protractor e2e tests
1 parent 336b909 commit 99a207a

File tree

6 files changed

+17
-34
lines changed

6 files changed

+17
-34
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
*.log
22
coverage/
3+
reports/
34
juiceshop.sqlite
45

56
# Intellij

karma.conf.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@ module.exports = function (config) {
2929
plugins: [
3030
'karma-phantomjs-launcher',
3131
'karma-jasmine',
32-
'karma-coverage'
32+
'karma-coverage',
33+
'karma-junit-reporter'
3334
],
3435

35-
reporters: ['progress', 'coverage'],
36+
reporters: ['progress', 'coverage', 'junit'],
3637

3738
coverageReporter: {
3839
type: 'lcov',
@@ -41,6 +42,10 @@ module.exports = function (config) {
4142

4243
preprocessors: {
4344
'app/js/**/*.js': 'coverage'
45+
},
46+
47+
junitReporter: {
48+
outputFile: 'test/reports/client_results.xml'
4449
}
4550
});
4651
};

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,13 +60,13 @@
6060
"karma-phantomjs-launcher": "~0.1",
6161
"karma-jasmine": "~0.1",
6262
"protractor": "~1.3",
63+
"jasmine-reporters": "~1.0",
6364
"http-server": "~0.7",
6465
"shelljs": "~0.3",
6566
"win-spawn": "~2.0",
6667
"codeclimate-test-reporter": "~0.0",
6768
"istanbul": "~0.3",
68-
"lcov-result-merger": "~1.0",
69-
"saucelabs": "~0.1"
69+
"lcov-result-merger": "~1.0"
7070
},
7171
"repository": {
7272
"type": "git",

protractor.conf.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@ exports.config = {
2121
defaultTimeoutInterval: 60000
2222
},
2323

24+
onPrepare: function() {
25+
require('jasmine-reporters');
26+
jasmine.getEnv().addReporter(
27+
new jasmine.JUnitXmlReporter('test/reports/e2e_results', true, true));
28+
},
29+
2430
sauceUser: process.env.SAUCE_USERNAME,
2531
sauceKey: process.env.SAUCE_ACCESS_KEY
2632

test/serverTests.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var spawn = require('win-spawn'),
55
server = require('./../server.js');
66

77
server.start({ port: 3000 }, function () {
8-
var jasmineNode = spawn('jasmine-node', [ 'test/server' ]);
8+
var jasmineNode = spawn('jasmine-node', [ 'test/server', '--junitreport', '--output', 'test/reports/server_results' ]);
99

1010
function logToConsole(data) {
1111
console.log(String(data));

test/setSaucelabsJobResult.js

Lines changed: 0 additions & 29 deletions
This file was deleted.

0 commit comments

Comments
 (0)