jenkins-bot has submitted this change and it was merged.
Change subject: Add some Jenkins tests
......................................................................
Add some Jenkins tests
Add support for composer phplint and npm jshint, jsonlint
and banana-checker.
Change-Id: If509fdb96f35cdd252b6c53ece8a568b4a614926
---
M .gitignore
A .jshintignore
A Gruntfile.js
M ReCaptchaNoCaptcha/i18n/qqq.json
A composer.json
M i18n/gu.json
A package.json
7 files changed, 69 insertions(+), 13 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 96c5da6..3463cca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
-.svn
*~
*.kate-swp
.*.swp
.idea
-.DS_Store
\ No newline at end of file
+.DS_Store
+node_modules/
+vendor/
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
new file mode 100644
index 0000000..f1f30d4
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,30 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-contrib-jshint' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ jshint: {
+ all: [
+ '*.js'
+ ]
+ },
+ banana: {
+ all: [
+ 'i18n/',
+ '**/i18n/'
+ ]
+ },
+ jsonlint: {
+ all: [
+ '*.json',
+ '**/*.json',
+ '!node_modules/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jshint', 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/ReCaptchaNoCaptcha/i18n/qqq.json b/ReCaptchaNoCaptcha/i18n/qqq.json
index 9481d3c..c778953 100644
--- a/ReCaptchaNoCaptcha/i18n/qqq.json
+++ b/ReCaptchaNoCaptcha/i18n/qqq.json
@@ -1,11 +1,12 @@
{
- "@metadata": {
- "authors": []
- },
- "renoCAPTCHA-edit": "Message above the CAPTCHA for edit action.",
- "renoCAPTCHA-addurl": "Message above the CAPTCHA for addurl (user added
new external links to the page) action.",
- "renoCAPTCHA-badlogin": "Message above the CAPTCHA for badlogin action.",
- "renoCAPTCHA-createaccount": "Message above the CAPTCHA for createaccount
(user creates a new account) action.",
- "renoCAPTCHA-createaccount-fail": "Error message, when the CAPTCHA isn't
solved correctly.",
- "renoCAPTCHA-create": "Message above the CAPTCHA for create (user creates
a new page) action."
-}
\ No newline at end of file
+ "@metadata": {
+ "authors": []
+ },
+ "renocaptcha-edit": "Message above the CAPTCHA for edit action.",
+ "renocaptcha-addurl": "Message above the CAPTCHA for addurl (user added
new external links to the page) action.",
+ "renocaptcha-badlogin": "Message above the CAPTCHA for badlogin
action.",
+ "renocaptcha-createaccount": "Message above the CAPTCHA for
createaccount (user creates a new account) action.",
+ "renocaptcha-createaccount-fail": "Error message, when the CAPTCHA
isn't solved correctly.",
+ "renocaptcha-create": "Message above the CAPTCHA for create (user
creates a new page) action.",
+ "renocaptcha-noscript": "This messages is warning you have javascript
disabled so you have to manualy input the text into the textbox."
+}
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..f2883f7
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,10 @@
+{
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9"
+ },
+ "scripts": {
+ "test": [
+ "parallel-lint . --exclude vendor"
+ ]
+ }
+}
diff --git a/i18n/gu.json b/i18n/gu.json
index 0d19876..c375af4 100644
--- a/i18n/gu.json
+++ b/i18n/gu.json
@@ -9,7 +9,6 @@
]
},
"captcha-edit": "આ લેખમાં ફેરફાર કરવા માટે નીચે આપેલા સરળ દાખલાનો જવાબ
તેની બાજુના ખાનામાં લખો ([[Special:Captcha/help|more info]]):",
- "captcha-desc": "",
"captcha-label": "કેપ્ચા",
"captcha-addurl": "તમે કરેલા ફેરફારોમાં નવી બાહ્ય કડીઓ સામેલ છે.
સ્વચાલિત સ્પેમ/સ્પામ(spam) થી વિકિના બચાવ માટે, કૃપયા નીચે આપેલા સરળ દાખલાનો
જવાબ તેની બાજુના ખાનામાં લખો અને આપનું સંપાદન સાચવો
([[Special:Captcha/help|more info]]):",
"captcha-badlogin": "આપોઆપ થતી ગુપ્તસંજ્ઞાની ચોરી (password cracking)થી
વિકિના બચાવ માટે, કૃપયા નીચે આપેલા સરળ દાખલાનો જવાબ તેની બાજુના ખાનામાં લખો
([[Special:Captcha/help|more info]]):",
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..c3d4d83
--- /dev/null
+++ b/package.json
@@ -0,0 +1,13 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "0.4.5",
+ "grunt-cli": "0.1.13",
+ "grunt-contrib-jshint": "0.11.3",
+ "grunt-banana-checker": "0.4.0",
+ "grunt-jsonlint": "1.0.5"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/246097
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If509fdb96f35cdd252b6c53ece8a568b4a614926
Gerrit-PatchSet: 16
Gerrit-Project: mediawiki/extensions/ConfirmEdit
Gerrit-Branch: master
Gerrit-Owner: Paladox <[email protected]>
Gerrit-Reviewer: Florianschmidtwelzow <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
