Use eslints tests instead of jshint

Author: Ladsgroup

.eslintignore

@@ -0,0 +1,5 @@
+lib/jquery/**
+lib/quinit/**
+lib/require/**
+node_modules/**
+vendor/**

.eslintrc.json

@@ -0,0 +1,32 @@
+{
+	"extends": "wikimedia",
+	"env": {
+		"browser": true,
+		"jquery": true
+	},
+	"globals": {
+		"dataValues": false,
+		"define": false,
+		"globeCoordinate": false,
+		"module": "false",
+		"QUnit": false,
+		"util": false,
+		"valueFormatters": false,
+		"valueParsers": false,
+		"wikibase": false
+	},
+	"rules": {
+		"computed-property-spacing": "off",
+		"indent": "off",
+		"keyword-spacing": "off",
+		"no-underscore-dangle": "off",
+		"no-unused-vars": "off",
+		"one-var": "off",
+		"operator-linebreak": "off",
+		"quote-props": "off",
+		"space-before-function-paren": "off",
+		"space-infix-ops": "off",
+		"valid-jsdoc": "off",
+		"vars-on-top": "off"
+	}
+}

.gitignore

@@ -6,6 +6,6 @@ composer.lock
 
 !.*
 .idea/
-
+node_modules/
 vendor/
-build/
+build/

.jshintignore

@@ -4,9 +4,12 @@ php:
 - 5.5
 
 env:
-- RUNJOB=jshint
+- RUNJOB=eslint
 - RUNJOB=qunit
 
+before_script:
+  - nvm install 4
+
 script: bash ./build/travis/script.sh
 
 notifications:

.jshintrc

@@ -2,9 +2,10 @@
 
 set -x
 
-if [[ $RUNJOB == jshint ]]; then
-	npm install jshint
-	jshint src/ lib/ tests/
+if [[ $RUNJOB == eslint ]]; then
+	npm install eslint
+        npm install --save eslint-config-wikimedia
+	./node_modules/.bin/eslint .
 	exit $?
 fi
 

.travis.yml

@@ -38,7 +38,7 @@ this.config = ( function() {
 			},
 			'qunit.parameterize': {
 				exports: 'QUnit.cases',
-				deps: ['qunit']
+				deps: [ 'qunit' ]
 			},
 
 			'util/util.inherit': {
@@ -50,17 +50,17 @@ this.config = ( function() {
 			},
 			'globeCoordinate/globeCoordinate.GlobeCoordinate': {
 				exports: 'globeCoordinate.GlobeCoordinate',
-				deps: ['globeCoordinate/globeCoordinate']
+				deps: [ 'globeCoordinate/globeCoordinate' ]
 			},
 			'globeCoordinate/globeCoordinate.Formatter': {
 				exports: 'globeCoordinate.Formatter',
-				deps: ['globeCoordinate/globeCoordinate']
+				deps: [ 'globeCoordinate/globeCoordinate' ]
 			},
 
 			'dataValues/dataValues': {
 				exports: 'dataValues'
 			},
-			'dataValues/DataValue': ['dataValues/dataValues', 'jquery', 'util/util.inherit'],
+			'dataValues/DataValue': [ 'dataValues/dataValues', 'jquery', 'util/util.inherit' ],
 
 			'values/BoolValue': [
 				'dataValues/dataValues', 'jquery', 'dataValues/DataValue', 'util/util.inherit'
@@ -109,7 +109,7 @@ this.config = ( function() {
 			},
 			'valueFormatters/ValueFormatterStore': {
 				exports: 'valueFormatters.ValueFormatterStore',
-				deps: ['valueFormatters/valueFormatters', 'jquery']
+				deps: [ 'valueFormatters/valueFormatters', 'jquery' ]
 			},
 
 			'formatters/NullFormatter': [
@@ -136,7 +136,7 @@ this.config = ( function() {
 			},
 			'valueParsers/ValueParserStore': {
 				exports: 'valueParsers.ValueParserStore',
-				deps: ['valueParsers/valueParsers', 'jquery']
+				deps: [ 'valueParsers/valueParsers', 'jquery' ]
 			},
 
 			'parsers/BoolParser': [
@@ -163,7 +163,7 @@ this.config = ( function() {
 				'parsers/ValueParser',
 				'values/StringValue'
 			],
-			'parsers/ValueParser': ['valueParsers/valueParsers', 'util/util.inherit', 'jquery'],
+			'parsers/ValueParser': [ 'valueParsers/valueParsers', 'util/util.inherit', 'jquery' ],
 
 			// TODO: These tests should not require any specific DataValue constructor but rather
 			// use mocks. Properly define the module after removing the dependencies:
@@ -232,4 +232,4 @@ this.config = ( function() {
 		]
 	};
 
-} )();
+}() );

build/travis/script.sh

@@ -102,7 +102,7 @@ var SELF = dv.TimeValue = util.inherit( 'DvTimeValue', PARENT, function( timesta
 		if( key === 'calendarModel' && !SELF.getCalendarModelKeyByUri( value ) ) {
 			throw new Error( 'Setting ' + key + ': No valid calendar model URI provided' );
 		}
-		if( $.inArray( key, ['precision', 'before', 'after', 'timezone'] ) !== -1
+		if( $.inArray( key, [ 'precision', 'before', 'after', 'timezone' ] ) !== -1
 			&& typeof value !== 'number'
 		) {
 			throw new Error( 'Setting ' + key + ': Expected "number" type' );

config.js

@@ -124,7 +124,7 @@ define( [
 					'is instance of actual data value implementation\'s constructor'
 				);
 				assert.equal(
-					typeof( instance.getType() ),
+					typeof instance.getType(),
 					'string',
 					'getType method is present and returns string'
 				);
@@ -144,7 +144,7 @@ define( [
 				keyType;
 
 			for ( i in instances ) {
-				keyType = typeof( instances[i].getSortKey() );
+				keyType = typeof instances[i].getSortKey();
 
 				assert.ok(
 					keyType === 'string' || keyType === 'number',
@@ -288,7 +288,7 @@ define( [
 				instance = this.getInstance( constructorArgs[i] );
 
 				QUnit.assert.strictEqual(
-					instance[functionName].call( instance ),
+					instance[functionName](),
 					constructorArgs[i][argNumber],
 					functionName + ' must return the value that was provided as argument ' + argNumber + ' in the constructor'
 				);

src/values/TimeValue.js

@@ -65,7 +65,7 @@ define( [
 	QUnit.test( 'registerDataTypeFormatter(): Error handling', function( assert ) {
 		var formatterStore = new vf.ValueFormatterStore();
 
-		assert.throws(
+		assert['throws'](
 			function() {
 				formatterStore.registerDataTypeFormatter( 'invalid', stringType.getId() );
 			},
@@ -74,7 +74,7 @@ define( [
 
 		formatterStore.registerDataTypeFormatter( StringFormatter, stringType.getId() );
 
-		assert.throws(
+		assert['throws'](
 			function() {
 				formatterStore.getFormatter( stringType );
 			},
@@ -85,7 +85,7 @@ define( [
 	QUnit.test( 'registerDataValueFormatter(): Error handling', function( assert ) {
 		var formatterStore = new vf.ValueFormatterStore();
 
-		assert.throws(
+		assert['throws'](
 			function() {
 				formatterStore.registerDataValueFormatter( 'invalid', StringValue.TYPE );
 			},
@@ -94,7 +94,7 @@ define( [
 
 		formatterStore.registerDataValueFormatter( StringFormatter, StringValue.TYPE );
 
-		assert.throws(
+		assert['throws'](
 			function() {
 				formatterStore.getFormatter( StringValue );
 			},
@@ -133,7 +133,7 @@ define( [
 		);
 
 		assert.equal(
-			formatterStore.getFormatter( numberType.getDataValueType(), numberType.getId()  ),
+			formatterStore.getFormatter( numberType.getDataValueType(), numberType.getId() ),
 			NullFormatter,
 			'Still returning default formatter if no formatter is registered for a specific data '
 				+ 'type.'
@@ -220,7 +220,7 @@ define( [
 	 *        parameter. Each inner array should contain a data type, data value or data value
 	 *        constructor and a ValueFormatter which is expected to be registered for it.
 	 */
-	function valueFormatterStoreRegistrationTest( assert, toRegister, toExpect  ) {
+	function valueFormatterStoreRegistrationTest( assert, toRegister, toExpect ) {
 		var formatterStore = new vf.ValueFormatterStore();
 
 		// Register ValueFormatters as per definition:

tests/src/dataValues.DataValue.tests.js

@@ -65,7 +65,7 @@ define( [
 	QUnit.test( 'registerDataTypeParser(): Error handling', function( assert ) {
 		var parserStore = new vp.ValueParserStore();
 
-		assert.throws(
+		assert['throws'](
 			function() {
 				parserStore.registerDataTypeParser( 'invalid', stringType.getId() );
 			},
@@ -74,7 +74,7 @@ define( [
 
 		parserStore.registerDataTypeParser( StringParser, stringType.getId() );
 
-		assert.throws(
+		assert['throws'](
 			function() {
 				parserStore.getParser( stringType );
 			},
@@ -85,7 +85,7 @@ define( [
 	QUnit.test( 'registerDataValueParser(): Error handling', function( assert ) {
 		var parserStore = new vp.ValueParserStore();
 
-		assert.throws(
+		assert['throws'](
 			function() {
 				parserStore.registerDataValueParser( 'invalid', StringValue.TYPE );
 			},
@@ -94,7 +94,7 @@ define( [
 
 		parserStore.registerDataValueParser( StringParser, StringValue.TYPE );
 
-		assert.throws(
+		assert['throws'](
 			function() {
 				parserStore.getParser( StringValue );
 			},
@@ -217,7 +217,7 @@ define( [
 	 *        parameter. Each inner array should contain a data type, data value or data value
 	 *        constructor and a ValueParser which is expected to be registered for it.
 	 */
-	function valueParserStoreRegistrationTest( assert, toRegister, toExpect  ) {
+	function valueParserStoreRegistrationTest( assert, toRegister, toExpect ) {
 		var parserStore = new vp.ValueParserStore();
 
 		// Register ValueParsers as per definition:

tests/src/valueFormatters/ValueFormatterStore.tests.js

@@ -33,21 +33,21 @@ define( [
 		 */
 		getConstructorArguments: function() {
 			return [
-				[0],
-				[1],
-				[1e30],
-				[1.5e30],
-				[1.5e-30],
-				[-1],
-				[-1.5e-30],
-				['+0'],
-				['+1'],
-				['-0'],
-				['-1'],
-				['+100000000000000000'],
-				['-100000000000000000'],
-				['-0.1'],
-				['+0.1']
+				[ 0 ],
+				[ 1 ],
+				[ 1e30 ],
+				[ 1.5e30 ],
+				[ 1.5e-30 ],
+				[ -1 ],
+				[ -1.5e-30 ],
+				[ '+0' ],
+				[ '+1' ],
+				[ '-0' ],
+				[ '-1' ],
+				[ '+100000000000000000' ],
+				[ '-100000000000000000' ],
+				[ '-0.1' ],
+				[ '+0.1' ]
 			];
 		}
 

tests/src/valueParsers/ValueParserStore.tests.js

@@ -34,11 +34,11 @@ define( [
 		 */
 		getConstructorArguments: function() {
 			return [
-				[new dv.DecimalValue( 0 ), 'some unit', new dv.DecimalValue( 0 ), new dv.DecimalValue( 0 )],
-				[new dv.DecimalValue( 0 ), 'some unit', new dv.DecimalValue( -1 ), new dv.DecimalValue( 1 )],
-				[new dv.DecimalValue( 5 ), 'some unit', new dv.DecimalValue( 4 ), new dv.DecimalValue( 6 )],
-				[new dv.DecimalValue( 6 ), 'some unit', null, null],
-				[new dv.DecimalValue( 7 ), 'some unit']
+				[ new dv.DecimalValue( 0 ), 'some unit', new dv.DecimalValue( 0 ), new dv.DecimalValue( 0 ) ],
+				[ new dv.DecimalValue( 0 ), 'some unit', new dv.DecimalValue( -1 ), new dv.DecimalValue( 1 ) ],
+				[ new dv.DecimalValue( 5 ), 'some unit', new dv.DecimalValue( 4 ), new dv.DecimalValue( 6 ) ],
+				[ new dv.DecimalValue( 6 ), 'some unit', null, null ],
+				[ new dv.DecimalValue( 7 ), 'some unit' ]
 			];
 		}