jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348140 )
Change subject: build: Switch default form PhantomJS to Chrome
......................................................................
build: Switch default form PhantomJS to Chrome
Rename karma:local to karma:firefox. Also move coverage options
to default for karma:* so that developers can run
'grunt karma:firefox' instead of 'npm test' as a means of testing
in Firefox instead of Chrome, but still get coverage.
Change-Id: I9adf3c3e89ed9d42347bffa6e97aa03739acf3b9
---
M Gruntfile.js
M package.json
2 files changed, 8 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Jforrester: Looks good to me, approved
diff --git a/Gruntfile.js b/Gruntfile.js
index 80de880..9bade57 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -35,30 +35,29 @@
options: {
files: testFiles,
frameworks: [ 'qunit' ],
- reporters: [ 'dots' ],
+ reporters: [ 'dots', 'coverage' ],
singleRun: true,
- autoWatch: false
- },
- phantomjs: {
- browsers: [ 'PhantomJS' ],
+ autoWatch: false,
preprocessors: {
'src/*.js': [ 'coverage' ]
},
- reporters: [ 'dots', 'coverage' ],
coverageReporter: { reporters: [
{ type: 'text-summary' },
{ type: 'html', dir: 'coverage/' }
] }
},
- local: {
- browsers: [ 'Firefox', 'Chrome' ]
+ main: {
+ browsers: [ 'Chrome' ]
+ },
+ firefox: {
+ browsers: [ 'Firefox' ]
}
}
} );
grunt.registerTask( 'build', [ 'clean', 'concat' ] );
grunt.registerTask( 'lint', [ 'eslint' ] );
- grunt.registerTask( 'unit', [ 'karma:phantomjs' ] );
+ grunt.registerTask( 'unit', [ 'karma:main' ] );
grunt.registerTask( 'test', [ 'git-build', 'build', 'lint', 'unit' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index 958143c..1777041 100644
--- a/package.json
+++ b/package.json
@@ -28,9 +28,7 @@
"karma-chrome-launcher": "1.0.1",
"karma-coverage": "1.0.0",
"karma-firefox-launcher": "1.0.0",
- "karma-phantomjs-launcher": "1.0.1",
"karma-qunit": "1.1.0",
- "phantomjs-prebuilt": "2.1.7",
"qunitjs": "1.23.0"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/348140
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9adf3c3e89ed9d42347bffa6e97aa03739acf3b9
Gerrit-PatchSet: 2
Gerrit-Project: unicodejs
Gerrit-Branch: master
Gerrit-Owner: Krinkle <[email protected]>
Gerrit-Reviewer: Jforrester <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
