jenkins-bot has submitted this change and it was merged. Change subject: build: Remove obsolete karma:bg task ......................................................................
build: Remove obsolete karma:bg task Follows-up 829f4c3. Since we now run browsers in the 'karma:other' task already, we already spawn the browser for each run, so 'karma:bg' would only run them a second time for no reason. This hack is no longer needed. Change-Id: I4d10e8d46a2feb61df61282e04b42d51ee23cfb1 --- M Gruntfile.js 1 file changed, 5 insertions(+), 18 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/Gruntfile.js b/Gruntfile.js index a32ca1a..83a7485 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -3,8 +3,6 @@ * * ## Cross-browser unit testing * - * By default tests run in PhantomJS. To use your local Chrome and Firefox, run 'grunt test karma:local'. - * * To run tests in any other browser use: 'grunt watch' and then open http://localhost:9876/ in one * or more browsers. It automatically runs tests in all connected browsers on each grunt-watch event. * @@ -20,7 +18,6 @@ grunt.loadNpmTasks( 'grunt-contrib-watch' ); grunt.loadNpmTasks( 'grunt-jscs' ); grunt.loadNpmTasks( 'grunt-karma' ); - grunt.renameTask( 'watch', 'runwatch' ); var sauceBrowsers = require( './tests/saucelabs.browsers.js' ); @@ -120,8 +117,7 @@ { type: 'text-summary', dir: 'dist/coverage/' } ] } }, - // Primary run for the -jquery build. - jqmain: { + jquery: { browsers: [ 'PhantomJS' ], options: { files: [ @@ -132,22 +128,16 @@ ] } }, - // Other supported local browsers - local: { + other: { browsers: [ 'Chrome', 'Firefox' ] - }, - bg: { - browsers: [ 'Chrome', 'Firefox' ], - singleRun: false, - background: true } }, - runwatch: { + watch: { files: [ '.{jscsrc,jshintignore,jshintrc}', '<%= jshint.dev %>' ], - tasks: [ '_test', 'karma:bg:run' ] + tasks: '_test' } } ); @@ -166,14 +156,11 @@ } ); grunt.registerTask( 'build', [ 'clean', 'concat' ] ); - grunt.registerTask( '_test', [ 'git-build', 'build', 'jshint', 'jscs', 'karma:main', 'karma:jqmain' ] ); + grunt.registerTask( '_test', [ 'git-build', 'build', 'jshint', 'jscs', 'karma:main', 'karma:jquery', 'karma:other' ] ); grunt.registerTask( 'ci', [ '_test', 'karma:ci1', 'karma:ci2' ] ); - grunt.registerTask( 'watch', [ 'karma:bg:start', 'runwatch' ] ); if ( process.env.ZUUL_PIPELINE === 'gate-and-submit' ) { grunt.registerTask( 'test', 'ci' ); - } else if ( process.env.ZUUL_PIPELINE ) { - grunt.registerTask( 'test', [ '_test', 'karma:local' ] ); } else { grunt.registerTask( 'test', '_test' ); } -- To view, visit https://gerrit.wikimedia.org/r/165158 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4d10e8d46a2feb61df61282e04b42d51ee23cfb1 Gerrit-PatchSet: 3 Gerrit-Project: oojs/core Gerrit-Branch: master Gerrit-Owner: Krinkle <[email protected]> Gerrit-Reviewer: Jforrester <[email protected]> Gerrit-Reviewer: Krinkle <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
