openlp-core team mailing list archive
-
openlp-core team
-
Mailing list archive
-
Message #34533
[Merge] lp:~raoul-snyman/openlp/chromium-tests into lp:openlp
Raoul Snyman has proposed merging lp:~raoul-snyman/openlp/chromium-tests into lp:openlp.
Commit message:
Change the JS tests to use Chromium rather than Firefox
Requested reviews:
OpenLP Core (openlp-core)
For more details, see:
https://code.launchpad.net/~raoul-snyman/openlp/chromium-tests/+merge/371835
Change the JS tests to use Chromium rather than Firefox
--
Your team OpenLP Core is requested to review the proposed merge of lp:~raoul-snyman/openlp/chromium-tests into lp:openlp.
=== modified file 'MANIFEST.in'
--- MANIFEST.in 2019-08-22 17:11:54 +0000
+++ MANIFEST.in 2019-08-26 22:06:42 +0000
@@ -17,3 +17,4 @@
include README.txt
include openlp/.version
include package.json
+include karma.conf.js
=== modified file 'karma.conf.js'
--- karma.conf.js 2019-08-22 17:38:44 +0000
+++ karma.conf.js 2019-08-26 22:06:42 +0000
@@ -26,19 +26,22 @@
// source files, that you wanna generate coverage for
// do not include tests or libraries
// (these files will be instrumented by Istanbul)
- "display.js": ["coverage"]
+ // "display.js": ["coverage"]
},
// test results reporter to use
// possible values: "dots", "progress"
// available reporters: https://npmjs.org/browse/keyword/karma-reporter
- reporters: ["progress", "coverage"],
+ reporters: ["dots", "junit"],
// configure the coverateReporter
- coverageReporter: {
+ /* coverageReporter: {
type : "html",
dir : "htmlcov/"
- },
+ }, */
+ junitReporter: {
+ outputFile: "test-results.xml"
+ }
// web server port
port: 9876,
@@ -60,11 +63,11 @@
// start these browsers
// available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
- browsers: ["Firefox"],
+ browsers: ["Chromium"],
// Continuous Integration mode
// if true, Karma captures browsers, runs the tests and exits
- singleRun: false,
+ singleRun: true,
// Concurrency level
// how many browser should be started simultaneous
=== modified file 'package.json'
--- package.json 2019-08-22 17:38:44 +0000
+++ package.json 2019-08-26 22:06:42 +0000
@@ -9,9 +9,10 @@
"dependencies": {
"jasmine-core": "^2.6.4",
"karma": "^3.1.4",
+ "karma-chrome-launcher": "^3.1.0",
"karma-coverage": "^1.1.2",
+ "karma-firefox-launcher": "^1.2.0",
"karma-jasmine": "^1.1.0",
- "karma-firefox-launcher": "^1.2.0",
"karma-log-reporter": "0.0.4"
},
"scripts": {
Follow ups