jenkins-bot has submitted this change and it was merged.
Change subject: Recurse sub folders and test all files in jshint and jscs
......................................................................
Recurse sub folders and test all files in jshint and jscs
This allows us to test all the js files not just the files in resource folder.
Change-Id: I8dc52d2af01b53ee07e62809f29b33231f101bf4
---
M Gruntfile.js
1 file changed, 14 insertions(+), 12 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
index 0ad9261..664ce7d 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -20,10 +20,6 @@
QUNIT_DEBUG: ( process.env.QUNIT_DEBUG && '&debug=true' || '' ),
QUNIT_FILTER: ( process.env.QUNIT_FILTER && '&filter=' +
process.env.QUNIT_FILTER ) || '',
QUNIT_MODULE: ( process.env.QUNIT_MODULE && '&module=' +
process.env.QUNIT_MODULE ) || '',
- files: {
- js: 'resources/**/*.js',
- jsTests: 'tests/qunit/**/*.js'
- },
mkdir: {
docs: {
options: {
@@ -36,20 +32,26 @@
jshintrc: true
},
all: [
- '<%= files.js %>',
- '<%= files.jsTests %>'
- ]
+ '.'
+ ],
+ test: {
+ files: {
+ src: 'tests/qunit/**/*.js'
+ }
+ }
},
jscs: {
main: [
- '<%= files.js %>'
+ '**/*.js',
+ '!Gruntfile.js',
+ '!tests/qunit/**'
],
test: {
options: {
config: 'tests/.jscsrc.js'
},
files: {
- src: '<%= files.jsTests %>'
+ src: 'tests/qunit/**/*.js'
}
}
},
@@ -78,7 +80,7 @@
prefixUrl: 'w/', // Prefix url
on the server
baseUrl: '../../', // Path to
assets from the server (extensions/Mobile...)
src: [
- '<%= files.js %>'
+ 'resources/**/*.js'
],
instrumentedFiles:
'tests/report/tmp',
htmlReport: 'tests/report'
@@ -88,11 +90,11 @@
},
watch: {
lint: {
- files: [ '<%= files.js %>', '<%= files.jsTests
%>' ],
+ files: [ 'resources/**/*.js',
'tests/qunit/**/*.js' ],
tasks: [ 'lint' ]
},
scripts: {
- files: [ '<%= files.js %>', '<%= files.jsTests
%>' ],
+ files: [ 'resources/**/*.js',
'tests/qunit/**/*.js' ],
tasks: [ 'test' ]
},
configFiles: {
--
To view, visit https://gerrit.wikimedia.org/r/249495
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8dc52d2af01b53ee07e62809f29b33231f101bf4
Gerrit-PatchSet: 25
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Jdlrobson <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
