From 841c69ba2e25c34bb24f83994c9bb1593450d29b Mon Sep 17 00:00:00 2001 From: joakin Date: Tue, 25 Apr 2017 14:06:02 +0200 Subject: [PATCH] Tests: Remove grunt-contrib-qunit There are no browser qunit tests right now, and if they are added at some point they should use core's infrastructure to run the tests like in mobilefrontend for example. Bug: T160406 Change-Id: I4346a891bc1fdb9252ebef593312911031cf2287 --- Gruntfile.js | 26 +++----------------------- package.json | 1 - 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index d72501d52..ef00b2803 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -1,11 +1,9 @@ /* eslint-evn node */ module.exports = function ( grunt ) { - var conf = grunt.file.readJSON( 'extension.json' ), - QUNIT_URL_BASE = 'http://localhost:8080/wiki/Special:JavaScriptTest/qunit/plain'; + var conf = grunt.file.readJSON( 'extension.json' ); grunt.loadNpmTasks( 'grunt-banana-checker' ); - grunt.loadNpmTasks( 'grunt-contrib-qunit' ); grunt.loadNpmTasks( 'grunt-contrib-watch' ); grunt.loadNpmTasks( 'grunt-eslint' ); grunt.loadNpmTasks( 'grunt-jsonlint' ); @@ -39,19 +37,6 @@ module.exports = function ( grunt ) { '!node_modules/**' ] }, - qunit: { - all: { - options: { - timeout: 10000, // Using the filter query param takes longer - summaryOnly: true, - urls: [ - // Execute any QUnit test in those module whose names begin with - // "ext.popups". - QUNIT_URL_BASE + '?filter=ext.popups' - ] - } - } - }, stylelint: { options: { syntax: 'less' @@ -66,13 +51,9 @@ module.exports = function ( grunt ) { debounceDelay: 1000 }, lint: { - files: [ 'resources/ext.popups/**/*.less', 'resources/**/*.js', 'tests/qunit/**/*.js' ], + files: [ 'resources/ext.popups/**/*.less', 'resources/**/*.js' ], tasks: [ 'lint' ] }, - scripts: { - files: [ 'resources/**/*.js', 'tests/qunit/**/*.js' ], - tasks: [ 'test' ] - }, configFiles: { files: [ 'Gruntfile.js' ], options: { @@ -83,6 +64,5 @@ module.exports = function ( grunt ) { } ); grunt.registerTask( 'lint', [ 'eslint:all', 'stylelint', 'jsonlint', 'banana' ] ); - grunt.registerTask( 'test', [ 'qunit' ] ); - grunt.registerTask( 'default', [ 'lint', 'test' ] ); + grunt.registerTask( 'default', [ 'lint' ] ); }; diff --git a/package.json b/package.json index 8138b97d3..fd9f50075 100644 --- a/package.json +++ b/package.json @@ -14,7 +14,6 @@ "grunt": "1.0.1", "grunt-banana-checker": "0.5.0", "grunt-cli": "^1.2.0", - "grunt-contrib-qunit": "^1.2.0", "grunt-contrib-watch": "^1.0.0", "grunt-eslint": "19.0.0", "grunt-jsonlint": "1.1.0",