jenkins-bot has submitted this change and it was merged. Change subject: Cleaned up QUnit test files ......................................................................
Cleaned up QUnit test files siteselector, entityselector and SiteLinksEditTool test files conform to jshint now. Change-Id: Ice89b00f976469c594c2df0470ef79790cf06539 --- M .jshintignore M lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js M lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js M lib/tests/qunit/wikibase.ui.SiteLinksEditTool.tests.js 4 files changed, 17 insertions(+), 29 deletions(-) Approvals: Tobias Gritschacher: Looks good to me, approved jenkins-bot: Verified diff --git a/.jshintignore b/.jshintignore index fa3e01d..fe966a7 100644 --- a/.jshintignore +++ b/.jshintignore @@ -15,10 +15,7 @@ ./lib/tests/qunit/wikibase.ui.PropertyEditTool.EditableValue.SitePageInterface.tests.js ./lib/tests/qunit/wikibase.ui.PropertyEditTool.EditableValue.tests.js ./lib/tests/qunit/wikibase.ui.PropertyEditTool.tests.js -./lib/tests/qunit/wikibase.ui.SiteLinksEditTool.tests.js ./lib/tests/qunit/data/testrunner.js -./lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js -./lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js ./lib/tests/qunit/parsers/EntityIdParser.tests.js ./lib/tests/qunit/wikibase.datamodel/datamodel.Entity.tests.js ./lib/tests/qunit/wikibase.datamodel/datamodel.Item.tests.js diff --git a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js index 2064ac0..3c8ea4c 100644 --- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js +++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.entityselector.tests.js @@ -1,6 +1,4 @@ /** - * QUnit tests for entity selector jQuery widget - * * @since 0.1 * @file * @ingroup WikibaseLib @@ -9,13 +7,13 @@ * @author H. Snater < [email protected] > */ -( function( $, QUnit, undefined ) { +( function( $, QUnit ) { 'use strict'; /** * Factory for creating a jquery.wikibase.entityselector widget suitable for testing. * - * @param {Object} customOptions + * @param {Object} [customOptions] */ var newTestEntitySelector = function( customOptions ) { var options = { @@ -25,7 +23,8 @@ $.extend( options, customOptions ); } // element needs to be in the DOM for setting text selection range - return $( '<input/>' ).addClass( 'test_entityselector').appendTo( 'body' ).entityselector( options ); + return $( '<input/>' ) + .addClass( 'test_entityselector').appendTo( 'body' ).entityselector( options ); }; QUnit.module( 'jquery.wikibase.entityselector', QUnit.newMwEnvironment( { @@ -79,7 +78,8 @@ assert.equal( input.val(), 'abc', - 'Replaced input element\'s value with first result (remaining part of the string is highlighted).' + 'Replaced input element\'s value with first result (remaining part of the string is ' + + 'highlighted).' ); assert.equal( @@ -97,7 +97,8 @@ assert.equal( $( entityselector.menu.element.children()[2] ).find( 'span' ).length, 2, - 'Created suggestion list section\'s DOM structure - skipping description and aliases when empty.' + 'Created suggestion list section\'s DOM structure - skipping description and aliases ' + + 'when empty.' ); entityselector.close(); diff --git a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js index 3924fe8..8e23181 100644 --- a/lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js +++ b/lib/tests/qunit/jquery.wikibase/jquery.wikibase.siteselector.tests.js @@ -1,20 +1,17 @@ /** - * QUnit tests jquery.wikibase.siteselector widget - * @see https://www.mediawiki.org/wiki/Extension:Wikibase - * * @since 0.1 * @file * @ingroup WikibaseLib * * @licence GNU GPL v2+ - * @author H. Snater < mediawiki at snater.com > + * @author H. Snater < [email protected] > */ ( function( mw, wb, $, QUnit ) { 'use strict'; /** - * Factory for creating a new sitesuggester enhanced input element. + * Factory for creating a new site selector enhanced input element. * * @param {Object} [options] * @return {jQuery} input element @@ -30,7 +27,7 @@ options = $.merge( { resultSet: siteList }, options ); var input = $( '<input/>' ).addClass( 'test-siteselector' ).siteselector( options ); - input.data( 'siteselector' ).testSearch = function( string ) { + input.data( 'siteselector' ).__testSearch = function( string ) { this.element.val( string ); // trigger opening menu without setTimeout delay invoked in jquery.ui.autocomplete @@ -91,7 +88,7 @@ var testString = function( string, expectedSiteId ) { assert.equal( - siteselector.testSearch( string ), + siteselector.__testSearch( string ), expectedSiteId, 'Selected "' + expectedSiteId + '" by specifying "' + string + '".' ); @@ -112,13 +109,13 @@ } assert.equal( - siteselector.testSearch( 'en-doesnotexist' ), + siteselector.__testSearch( 'en-doesnotexist' ), null, 'No site selected after filling input box with a not existing value.' ); assert.equal( - siteselector.testSearch( '' ), + siteselector.__testSearch( '' ), null, 'No site selected after clearing input box.' ); @@ -137,7 +134,7 @@ siteselector.setResultSet( [] ); assert.equal( - siteselector.testSearch( 'en' ), + siteselector.__testSearch( 'en' ), null, 'No site found after having cleared the result set.' ); @@ -145,7 +142,7 @@ siteselector.setResultSet( siteList ); assert.equal( - siteselector.testSearch( 'en' ), + siteselector.__testSearch( 'en' ), 'enwiki', 'Found site id after re-filling the result set.' ); diff --git a/lib/tests/qunit/wikibase.ui.SiteLinksEditTool.tests.js b/lib/tests/qunit/wikibase.ui.SiteLinksEditTool.tests.js index 9e80e10..963d4f2 100644 --- a/lib/tests/qunit/wikibase.ui.SiteLinksEditTool.tests.js +++ b/lib/tests/qunit/wikibase.ui.SiteLinksEditTool.tests.js @@ -1,7 +1,4 @@ /** - * QUnit tests for site links edit tool - * @see https://www.mediawiki.org/wiki/Extension:Wikibase - * * @since 0.1 * @file * @ingroup WikibaseLib @@ -84,8 +81,7 @@ * @returns {wb.ui.PropertyEditTool.EditableValue} */ function hackyValueInsertion( editTool, siteLink, siteLinkGlobalId ) { - var initialValue = siteLink, - newValue = editTool.enterNewValue( initialValue ); + var newValue = editTool.enterNewValue( siteLink ); // override AJAX API call newValue.triggerApi = function( deferred, apiAction ) { @@ -123,9 +119,6 @@ return newValue; } - - var enSiteLink = [ 'enwiki', 'London' ], - deSiteLink = [ 'dewiki', 'Berlin' ]; QUnit.test( 'getUnusedAllowedSiteIds()', function( assert ) { var subject = this.subject; -- To view, visit https://gerrit.wikimedia.org/r/76721 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ice89b00f976469c594c2df0470ef79790cf06539 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Henning Snater <[email protected]> Gerrit-Reviewer: Tobias Gritschacher <[email protected]> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
