jenkins-bot has submitted this change and it was merged.
Change subject: [AJAXPoll] Update jenkins tests
......................................................................
[AJAXPoll] Update jenkins tests
Add gruntfile.js.
Add composer.json
Change-Id: Ib47d5cf832c92326a2eb2acb4ad6bcd8615243e5
---
M .gitignore
A .jshintignore
M Gruntfile.js
A composer.json
M package.json
5 files changed, 27 insertions(+), 6 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 4bf4869..f9037de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-.svn
+/composer.lock
+/node_modules/
+/vendor/
*~
*.kate-swp
.*.swp
-node_modules/
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 0000000..82eaa05
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1,2 @@
+node_modules/**
+vendor/**
diff --git a/Gruntfile.js b/Gruntfile.js
index 9c56558..a2e3bad 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -1,20 +1,27 @@
/*jshint node:true */
module.exports = function ( grunt ) {
- grunt.loadNpmTasks( 'grunt-banana-checker' );
+ grunt.loadNpmTasks( 'grunt-contrib-jshint' );
grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
grunt.initConfig( {
+ jshint: {
+ all: [
+ '**/*.js'
+ ]
+ },
banana: {
all: 'i18n/'
},
jsonlint: {
all: [
'**/*.json',
- '!node_modules/**'
+ '!node_modules/**',
+ '!vendor/**'
]
}
} );
- grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
grunt.registerTask( 'default', 'test' );
};
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..fbffbaf
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,10 @@
+{
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9"
+ },
+ "scripts": {
+ "test": [
+ "parallel-lint . --exclude node_modules --exclude
vendor"
+ ]
+ }
+}
diff --git a/package.json b/package.json
index 3489c4b..d89d53b 100644
--- a/package.json
+++ b/package.json
@@ -7,6 +7,7 @@
"grunt": "0.4.5",
"grunt-cli": "0.1.13",
"grunt-banana-checker": "0.4.0",
- "grunt-jsonlint": "1.0.4"
+ "grunt-contrib-jshint": "0.11.3",
+ "grunt-jsonlint": "1.0.5"
}
}
--
To view, visit https://gerrit.wikimedia.org/r/245185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib47d5cf832c92326a2eb2acb4ad6bcd8615243e5
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/AJAXPoll
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Jack Phoenix <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
