From 0a68b17400e6888592f6b1c839a593f218fcce44 Mon Sep 17 00:00:00 2001 From: Rafael Dohms Date: Fri, 18 Sep 2015 16:29:06 +0200 Subject: [PATCH 1/4] Added missing options from JunitReporter Added filePrefix and ConsolidateAll. --- lib/jasmine-node/index.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/jasmine-node/index.js b/lib/jasmine-node/index.js index 625e81c..800860e 100755 --- a/lib/jasmine-node/index.js +++ b/lib/jasmine-node/index.js @@ -120,7 +120,10 @@ jasmine.executeSpecsInFolder = function(options){ } jasmineEnv.addReporter(new jasmine.JUnitXmlReporter(junitreport.savePath, junitreport.consolidate, - junitreport.useDotNotation)); + junitreport.useDotNotation, + junitreport.filePrefix, + junit.consolidateAll + )); } if(teamcity){ From e9361964d0865bd22886b2bbc75762a6c726296a Mon Sep 17 00:00:00 2001 From: Rafael Dohms Date: Fri, 18 Sep 2015 16:31:07 +0200 Subject: [PATCH 2/4] Added missing options from JunitReporter Added properties to standard config object. --- lib/jasmine-node/cli.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/jasmine-node/cli.js b/lib/jasmine-node/cli.js index 4a1e525..9d545ec 100755 --- a/lib/jasmine-node/cli.js +++ b/lib/jasmine-node/cli.js @@ -44,7 +44,9 @@ var junitreport = { report: false, savePath : "./reports/", useDotNotation: true, - consolidate: true + consolidate: true, + filePrefix: null, + consolidateAll: false } var args = process.argv.slice(2); From 27261ad52a0720740d136bc4f5d4af51a60d3e9b Mon Sep 17 00:00:00 2001 From: Rafael Dohms Date: Fri, 18 Sep 2015 16:37:18 +0200 Subject: [PATCH 3/4] Added new arguments for consolidateAll Added option to flip consolidateAll on --- lib/jasmine-node/cli.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/lib/jasmine-node/cli.js b/lib/jasmine-node/cli.js index 9d545ec..a520eb3 100755 --- a/lib/jasmine-node/cli.js +++ b/lib/jasmine-node/cli.js @@ -87,6 +87,9 @@ while(args.length) { case '--junitreport': junitreport.report = true; break; + case '--junitreport-consolidate-all': + junitreport.consolidateAll = true; + break; case '--output': junitreport.savePath = args.shift(); break; @@ -264,6 +267,7 @@ function help(){ , ' --verbose - print extra information per each test run' , ' --coffee - load coffee-script which allows execution .coffee files' , ' --junitreport - export tests results as junitreport xml format' + , ' --junitreport-consolidate-all - consolidate all reports into a single file' , ' --output - defines the output folder for junitreport files' , ' --teamcity - converts all console output to teamcity custom test runner commands. (Normally auto detected.)' , ' --growl - display test run summary in a growl notification (in addition to other outputs)' From 7a230b619ceac00c663ffd5dc90498ace694037b Mon Sep 17 00:00:00 2001 From: Rafael Dohms Date: Fri, 18 Sep 2015 16:55:07 +0200 Subject: [PATCH 4/4] Fixing typo Fixed bad reference to junitreport variable. --- lib/jasmine-node/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/jasmine-node/index.js b/lib/jasmine-node/index.js index 800860e..4f85eb3 100755 --- a/lib/jasmine-node/index.js +++ b/lib/jasmine-node/index.js @@ -122,7 +122,7 @@ jasmine.executeSpecsInFolder = function(options){ junitreport.consolidate, junitreport.useDotNotation, junitreport.filePrefix, - junit.consolidateAll + junitreport.consolidateAll )); }