jenkins-bot has submitted this change and it was merged.
Change subject: build: Use Chrome and Firefox for tests instead of PhantomJS
......................................................................
build: Use Chrome and Firefox for tests instead of PhantomJS
So long, and thanks for all the … Hello, Chromium!
Also remove obsolete karma:bg/runwatch hack.
Change-Id: If2da01a25b0336131dd72213afb55a2b921b0b42
---
M Gruntfile.js
M package.json
2 files changed, 6 insertions(+), 16 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index a6a5ff3..96dd47d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -20,7 +20,6 @@
grunt.loadNpmTasks( 'grunt-karma' );
grunt.loadNpmTasks( 'grunt-svg2png' );
grunt.loadTasks( 'build/tasks' );
- grunt.renameTask( 'watch', 'runwatch' );
var modules = grunt.file.readJSON( 'build/modules.json' ),
styleTargets = {
@@ -289,7 +288,7 @@
autoWatch: false
},
main: {
- browsers: [ 'PhantomJS' ],
+ browsers: [ 'Chrome' ],
preprocessors: {
'dist/*.js': [ 'coverage' ]
},
@@ -299,25 +298,20 @@
{ type: 'text-summary', dir:
'dist/coverage/' }
] }
},
- local: {
- browsers: [ 'PhantomJS', 'Chrome', 'Firefox' ]
- },
- bg: {
- singleRun: false,
- background: true,
- browsers: [ 'PhantomJS', 'Chrome', 'Firefox' ]
+ other: {
+ browsers: [ 'Firefox' ]
}
},
// Development
- runwatch: {
+ watch: {
files: [
'<%= jshint.dev %>',
'<%= csslint.all %>',
'{demos,src}/**/*.less',
'.{csslintrc,jscsrc,jshintignore,jshintrc}'
],
- tasks: [ '_test', 'karma:bg:run' ]
+ tasks: '_test'
}
} );
@@ -355,10 +349,7 @@
grunt.registerTask( 'git-build', [ 'pre-git-build', 'build' ] );
grunt.registerTask( 'lint', [ 'jshint', 'jscs', 'csslint', 'banana' ] );
- grunt.registerTask( '_test', [ 'pre-test', 'git-build', 'lint' ] );
- grunt.registerTask( 'test', [ '_test', 'karma:main' ] );
-
- grunt.registerTask( 'watch', [ 'karma:bg:start', 'runwatch' ] );
+ grunt.registerTask( 'test', [ 'pre-test', 'git-build', 'lint',
'karma:main', 'karma:other' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/package.json b/package.json
index 7dab781..9ab928a 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,6 @@
"karma-chrome-launcher": "0.1.5",
"karma-coverage": "0.2.6",
"karma-firefox-launcher": "0.1.3",
- "karma-phantomjs-launcher": "0.1.4",
"karma-qunit": "0.1.4",
"q": "1.0.1",
"qunitjs": "1.15.0"
--
To view, visit https://gerrit.wikimedia.org/r/165157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If2da01a25b0336131dd72213afb55a2b921b0b42
Gerrit-PatchSet: 8
Gerrit-Project: oojs/ui
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
