jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/355204 )
Change subject: Make jenkins pass on master
......................................................................
Make jenkins pass on master
- Add package.json
- Add Gruntfile.js
- Add test parts to composer.json
- Fix eslint errors
Bug: T104309
Change-Id: Ia0e491b5e39f1a6831eb233f4a742d1540b90913
---
A .eslintignore
A .eslintrc.json
M .gitignore
D .jscsrc
A Gruntfile.js
M composer.json
M modules/ext.PropertySuggester.EntitySelector.js
A package.json
8 files changed, 96 insertions(+), 31 deletions(-)
Approvals:
WMDE-leszek: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000..48b4341
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,3 @@
+node_modules/**
+vendor/**
+extensions/**
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..10c901a
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,15 @@
+{
+ "extends": "wikimedia",
+ "env": {
+ "jquery": true
+ },
+ "globals": {
+ "mediaWiki": false,
+ "OO": false
+ },
+ "rules": {
+ "no-underscore-dangle": "off",
+ "no-unused-vars": "off",
+ "operator-linebreak": "off"
+ }
+}
diff --git a/.gitignore b/.gitignore
index 48b8bf9..98e28b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,5 @@
+composer.phar
+composer.lock
+
vendor/
+node_modules/
diff --git a/.jscsrc b/.jscsrc
deleted file mode 100644
index ce98fc5..0000000
--- a/.jscsrc
+++ /dev/null
@@ -1,19 +0,0 @@
-{
- //
https://github.com/wikimedia/jscs-preset-wikimedia/blob/master/presets/wikimedia.json
- "preset": "wikimedia",
-
- // Rules from wikimedia preset we don't yet? follow
- "disallowDanglingUnderscores": null,
- "jsDoc": {
- "checkAnnotations": {
- "preset": "jsduck5",
- "extra": {
- "see": "some"
- }
- }
- },
-
- // Own rules
- "disallowOperatorBeforeLineBreak": true,
- "maximumLineLength": 100
-}
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 0000000..1d561f5
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,30 @@
+/* eslint-env node, es6 */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-eslint' );
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ eslint: {
+ all: '.'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '.stylelintrc',
+ '!node_modules/**'
+ ]
+ },
+ banana: {
+ options: {
+ disallowDuplicateTranslations: false,
+ disallowUnusedTranslations: false
+ },
+ all: [
+ 'i18n/'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'eslint', 'jsonlint', 'banana' ] );
+};
diff --git a/composer.json b/composer.json
index 75bc63c..48f75c5 100644
--- a/composer.json
+++ b/composer.json
@@ -14,6 +14,8 @@
"wikibase/data-model-services": "~1.1|~2.0|~3.0"
},
"require-dev": {
+ "jakub-onderka/php-console-highlighter": "0.3.2",
+ "jakub-onderka/php-parallel-lint": ">=0.3 <0.10",
"phpunit/phpunit": "~4.8",
"satooshi/php-coveralls": "dev-master",
"wikibase/wikibase-codesniffer": "^0.1.0",
@@ -29,5 +31,15 @@
"PropertySuggesterHooks.php",
"maintenance/UpdateTable.php"
]
+ },
+ "scripts": {
+ "test": [
+ "parallel-lint . --exclude vendor",
+ "@cs"
+ ],
+ "cs": [
+ "@phpcs"
+ ],
+ "phpcs": "vendor/bin/phpcs -sp --standard=phpcs.xml
--extensions=php --ignore=extensions/ValueView,vendor,.git ."
}
}
diff --git a/modules/ext.PropertySuggester.EntitySelector.js
b/modules/ext.PropertySuggester.EntitySelector.js
index 7b85cd6..c2c5c8c 100644
--- a/modules/ext.PropertySuggester.EntitySelector.js
+++ b/modules/ext.PropertySuggester.EntitySelector.js
@@ -35,9 +35,9 @@
// We only need to do this once, afterwards the old
suggestions
// will re-appear on focus anyway.
this.element.one( 'focus', function ( event ) {
- if ( self._useSuggester()
- && self.element.val() === ''
- && !self.options.menu.element.is(
':visible' )
+ if ( self._useSuggester() &&
+ self.element.val() === '' &&
+ !self.options.menu.element.is(
':visible' )
) {
self.options.minTermLength = 0;
self._cache = {}; // is done in the
entityselector on eachchange too
@@ -71,9 +71,9 @@
context: this._getPropertyContext(),
format: 'json',
language: this.options.language,
- 'continue': this._cache.term === term &&
this._cache.nextSuggestionOffset
- ? this._cache.nextSuggestionOffset
- : 0
+ 'continue': this._cache.term === term &&
+ this._cache.nextSuggestionOffset ?
+ this._cache.nextSuggestionOffset : 0
};
if ( data.context === 'item' ) {
@@ -110,8 +110,8 @@
return null;
}
- return $entityView.length > 0
- ? $entityView.data( 'entityview' ).option(
'value' )
+ return $entityView.length > 0 ?
+ $entityView.data( 'entityview' ).option(
'value' )
: null;
},
@@ -132,8 +132,8 @@
return null;
}
- statement = $statementview.length > 0
- ? $statementview.data( 'statementview'
).option( 'value' )
+ statement = $statementview.length > 0 ?
+ $statementview.data( 'statementview' ).option(
'value' )
: null;
return statement ?
statement.getClaim().getMainSnak().getPropertyId() : null;
@@ -192,8 +192,8 @@
*/
_isInNewStatementView: function () {
var $statementview = this.element.closest(
':wikibase-statementview' ),
- value = $statementview.length > 0
- ? $statementview.data( 'statementview'
).option( 'value' )
+ value = $statementview.length > 0 ?
+ $statementview.data( 'statementview'
).option( 'value' )
: null;
return !value;
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..5510265
--- /dev/null
+++ b/package.json
@@ -0,0 +1,20 @@
+{
+ "name": "PropertySuggester",
+ "version": "0.0.0",
+ "scripts": {
+ "test": "grunt test"
+ },
+ "repository": {
+ "type": "git",
+ "url":
"https://gerrit.wikimedia.org/r/mediawiki/extensions/PropertySuggester";
+ },
+ "author": "The Wikidata team",
+ "license": "GPL-2.0+",
+ "devDependencies": {
+ "eslint-config-wikimedia": "0.4.0",
+ "grunt": "^1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-eslint": "19.0.0",
+ "grunt-jsonlint": "1.0.7"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/355204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia0e491b5e39f1a6831eb233f4a742d1540b90913
Gerrit-PatchSet: 10
Gerrit-Project: mediawiki/extensions/PropertySuggester
Gerrit-Branch: master
Gerrit-Owner: Ladsgroup <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Ladsgroup <[email protected]>
Gerrit-Reviewer: WMDE-leszek <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
