From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 18 Jan 2013 16:46:04 +0100 Subject: Update to MediaWiki 1.20.2 this update includes: * adjusted Arch Linux skin * updated FluxBBAuthPlugin * patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024 --- tests/qunit/QUnitTestResources.php | 15 +- tests/qunit/data/callMwLoaderTestCallback.js | 1 + tests/qunit/data/defineTestCallback.js | 4 - tests/qunit/data/load.mock.php | 58 ++ tests/qunit/data/qunitOkCall.js | 4 +- tests/qunit/data/styleTest.css.php | 61 ++ tests/qunit/data/testrunner.js | 194 +++++-- tests/qunit/data/testwarm.inject.js | 349 ------------ tests/qunit/index.html | 139 ----- .../resources/jquery/jquery.autoEllipsis.test.js | 25 +- .../resources/jquery/jquery.byteLength.test.js | 37 +- .../resources/jquery/jquery.byteLimit.test.js | 397 +++++++------ .../suites/resources/jquery/jquery.client.test.js | 64 ++- .../resources/jquery/jquery.colorUtil.test.js | 69 +-- .../resources/jquery/jquery.delayedBind.test.js | 40 +- .../resources/jquery/jquery.getAttrs.test.js | 14 +- .../resources/jquery/jquery.highlightText.test.js | 25 +- .../resources/jquery/jquery.localize.test.js | 84 +-- .../resources/jquery/jquery.mwExtension.test.js | 62 +- .../resources/jquery/jquery.tabIndex.test.js | 25 +- .../resources/jquery/jquery.tablesorter.test.js | 309 +++++++--- .../resources/jquery/jquery.textSelection.test.js | 44 +- .../mediawiki.api/mediawiki.api.parse.test.js | 26 + .../resources/mediawiki.api/mediawiki.api.test.js | 59 ++ .../mediawiki.special.recentchanges.test.js | 27 +- .../resources/mediawiki/mediawiki.Title.test.js | 121 ++-- .../resources/mediawiki/mediawiki.Uri.test.js | 388 +++++++++++++ .../resources/mediawiki/mediawiki.cldr.test.js | 74 +++ .../mediawiki/mediawiki.jqueryMsg.test.js | 124 ++-- .../resources/mediawiki/mediawiki.jscompat.test.js | 40 +- .../resources/mediawiki/mediawiki.language.test.js | 394 +++++++++++++ .../suites/resources/mediawiki/mediawiki.test.js | 631 +++++++++++++++++---- .../resources/mediawiki/mediawiki.user.test.js | 57 +- .../resources/mediawiki/mediawiki.util.test.js | 241 ++++---- 34 files changed, 2721 insertions(+), 1481 deletions(-) create mode 100644 tests/qunit/data/callMwLoaderTestCallback.js delete mode 100644 tests/qunit/data/defineTestCallback.js create mode 100644 tests/qunit/data/load.mock.php create mode 100644 tests/qunit/data/styleTest.css.php delete mode 100644 tests/qunit/data/testwarm.inject.js delete mode 100644 tests/qunit/index.html create mode 100644 tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js create mode 100644 tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js create mode 100644 tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js create mode 100644 tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js create mode 100644 tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js (limited to 'tests/qunit') diff --git a/tests/qunit/QUnitTestResources.php b/tests/qunit/QUnitTestResources.php index 670e3d11..59ae73cd 100644 --- a/tests/qunit/QUnitTestResources.php +++ b/tests/qunit/QUnitTestResources.php @@ -19,13 +19,18 @@ return array( 'tests/qunit/suites/resources/jquery/jquery.tabIndex.test.js', 'tests/qunit/suites/resources/jquery/jquery.tablesorter.test.js', 'tests/qunit/suites/resources/jquery/jquery.textSelection.test.js', + 'tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js', 'tests/qunit/suites/resources/mediawiki/mediawiki.jscompat.test.js', 'tests/qunit/suites/resources/mediawiki/mediawiki.test.js', 'tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js', + 'tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js', 'tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js', 'tests/qunit/suites/resources/mediawiki/mediawiki.util.test.js', + 'tests/qunit/suites/resources/mediawiki.api/mediawiki.api.test.js', + 'tests/qunit/suites/resources/mediawiki.api/mediawiki.api.parse.test.js', 'tests/qunit/suites/resources/mediawiki.special/mediawiki.special.recentchanges.test.js', - "tests/qunit/suites/resources/mediawiki/mediawiki.jqueryMsg.test.js", + 'tests/qunit/suites/resources/mediawiki/mediawiki.language.test.js', + 'tests/qunit/suites/resources/mediawiki/mediawiki.cldr.test.js', ), 'dependencies' => array( 'jquery.autoEllipsis', @@ -42,11 +47,17 @@ return array( 'jquery.tablesorter', 'jquery.textSelection', 'mediawiki', + 'mediawiki.api', + 'mediawiki.api.parse', + 'mediawiki.jqueryMsg', 'mediawiki.Title', + 'mediawiki.Uri', 'mediawiki.user', 'mediawiki.util', 'mediawiki.special.recentchanges', - 'mediawiki.jqueryMsg', + 'mediawiki.language', + 'mediawiki.cldr', ), + 'position' => 'top', ) ); diff --git a/tests/qunit/data/callMwLoaderTestCallback.js b/tests/qunit/data/callMwLoaderTestCallback.js new file mode 100644 index 00000000..3f2ee92f --- /dev/null +++ b/tests/qunit/data/callMwLoaderTestCallback.js @@ -0,0 +1 @@ +mw.loader.testCallback(); diff --git a/tests/qunit/data/defineTestCallback.js b/tests/qunit/data/defineTestCallback.js deleted file mode 100644 index 6fcd4595..00000000 --- a/tests/qunit/data/defineTestCallback.js +++ /dev/null @@ -1,4 +0,0 @@ -window.mw.loader.testCallback = function() { - start(); - ok( true, 'Implementing a module, is the callback timed properly ?'); -}; diff --git a/tests/qunit/data/load.mock.php b/tests/qunit/data/load.mock.php new file mode 100644 index 00000000..1c189703 --- /dev/null +++ b/tests/qunit/data/load.mock.php @@ -0,0 +1,58 @@ + " +mw.loader.implement( 'testUsesMissing', function () { + QUnit.ok( false, 'Module test.usesMissing script should not run.'); + QUnit.start(); +}, {}, {}); +", + + 'testUsesNestedMissing' => " +mw.loader.implement( 'testUsesNestedMissing', function () { + QUnit.ok( false, 'Module testUsesNestedMissing script should not run.'); +}, {}, {}); +", +); + +$response = ''; + +// Only support for non-encoded module names, full module names expected +if ( isset( $_GET['modules'] ) ) { + $modules = explode( ',', $_GET['modules'] ); + foreach ( $modules as $module ) { + if ( isset( $moduleImplementations[$module] ) ) { + $response .= $moduleImplementations[$module]; + } else { + $response .= Xml::encodeJsCall( 'mw.loader.state', array( $module, 'missing' ) ); + } + } +} + +echo $response; diff --git a/tests/qunit/data/qunitOkCall.js b/tests/qunit/data/qunitOkCall.js index 2fb6e01d..25c42d6a 100644 --- a/tests/qunit/data/qunitOkCall.js +++ b/tests/qunit/data/qunitOkCall.js @@ -1,2 +1,2 @@ -start(); -ok( true, 'Successfully loaded!'); +QUnit.start(); +QUnit.assert.ok( true, 'Successfully loaded!'); diff --git a/tests/qunit/data/styleTest.css.php b/tests/qunit/data/styleTest.css.php new file mode 100644 index 00000000..1870d5a3 --- /dev/null +++ b/tests/qunit/data/styleTest.css.php @@ -0,0 +1,61 @@ +" ); +// Only if the current url indicates that there is a TestSwarm instance watching us +// (TestSwarm appends swarmURL to the test suites url it loads in iframes). +// Otherwise this is just a simple view of Special:JavaScriptTest/qunit directly, +// no point in loading inject.js in that case. Also, make sure that this instance +// of MediaWiki has actually been configured with the required url to that inject.js +// script. By default it is false. +if ( QUnit.urlParams.swarmURL && mw.config.get( 'QUnitTestSwarmInjectJSPath' ) ) { + document.write( "" ); } /** * CompletenessTest */ // Adds toggle checkbox to header -QUnit.config.urlConfig.push( 'completenesstest' ); +QUnit.config.urlConfig.push( { + id: 'completenesstest', + label: 'Run CompletenessTest', + tooltip: 'Run the completeness test' +} ); // Initiate when enabled if ( QUnit.urlParams.completenesstest ) { @@ -77,70 +94,87 @@ if ( QUnit.urlParams.completenesstest ) { QUnit.config.urlConfig.push( 'mwlogenv' ); /** - * Reset mw.config to a fresh copy of the live config for each test(); - * @param override {Object} [optional] - * @example: - * - * module( .., newMwEnvironment() ); - * - * test( .., function () { - * mw.config.set( 'foo', 'bar' ); // just for this test - * } ); - * - * test( .., function () { - * mw.config.get( 'foo' ); // doesn't exist - * } ); - * - * - * module( .., newMwEnvironment({ quux: 'corge' }) ); - * - * test( .., function () { - * mw.config.get( 'quux' ); // "corge" - * mw.config.set( 'quux', "grault" ); - * } ); - * - * test( .., function () { - * mw.config.get( 'quux' ); // "corge" - * } ); + * Reset mw.config and others to a fresh copy of the live config for each test(), + * and restore it back to the live one afterwards. + * @param localEnv {Object} [optional] + * @example (see test suite at the bottom of this file) * */ QUnit.newMwEnvironment = ( function () { - var liveConfig, freshConfigCopy, log; + var log, liveConfig, liveMessages; liveConfig = mw.config.values; + liveMessages = mw.messages.values; - freshConfigCopy = function ( custom ) { + function freshConfigCopy( custom ) { // "deep=true" is important here. // Otherwise we just create a new object with values referring to live config. // e.g. mw.config.set( 'wgFileExtensions', [] ) would not effect liveConfig, // but mw.config.get( 'wgFileExtensions' ).push( 'png' ) would as the array // was passed by reference in $.extend's loop. - return $.extend({}, liveConfig, custom, /*deep=*/true ); - }; + return $.extend( {}, liveConfig, custom, /*deep=*/true ); + } + + function freshMessagesCopy( custom ) { + return $.extend( {}, liveMessages, custom, /*deep=*/true ); + } log = QUnit.urlParams.mwlogenv ? mw.log : function () {}; - return function ( override ) { - override = override || {}; + return function ( localEnv ) { + localEnv = $.extend( { + // QUnit + setup: $.noop, + teardown: $.noop, + // MediaWiki + config: {}, + messages: {} + }, localEnv ); return { setup: function () { log( 'MwEnvironment> SETUP for "' + QUnit.config.current.module + ': ' + QUnit.config.current.testName + '"' ); - // Greetings, mock configuration! - mw.config.values = freshConfigCopy( override ); + + // Greetings, mock environment! + mw.config.values = freshConfigCopy( localEnv.config ); + mw.messages.values = freshMessagesCopy( localEnv.messages ); + + localEnv.setup(); }, teardown: function () { log( 'MwEnvironment> TEARDOWN for "' + QUnit.config.current.module + ': ' + QUnit.config.current.testName + '"' ); - // Farewell, mock configuration! + + localEnv.teardown(); + + // Farewell, mock environment! mw.config.values = liveConfig; + mw.messages.values = liveMessages; } }; }; }() ); +// $.when stops as soon as one fails, which makes sense in most +// practical scenarios, but not in a unit test where we really do +// need to wait until all of them are finished. +QUnit.whenPromisesComplete = function () { + var altPromises = []; + + $.each( arguments, function ( i, arg ) { + var alt = $.Deferred(); + altPromises.push( alt ); + + // Whether this one fails or not, forwards it to + // the 'done' (resolve) callback of the alternative promise. + arg.always( alt.resolve ); + }); + + return $.when.apply( $, altPromises ); +}; + /** * Add-on assertion helpers */ @@ -149,12 +183,12 @@ addons = { // Expect boolean true assertTrue: function ( actual, message ) { - strictEqual( actual, true, message ); + QUnit.push( actual === true, actual, true, message ); }, // Expect boolean false assertFalse: function ( actual, message ) { - strictEqual( actual, false, message ); + QUnit.push( actual === false, actual, false, message ); }, // Expect numerical value less than X @@ -175,14 +209,58 @@ addons = { // Expect numerical value greater than or equal to X gtOrEq: function ( actual, expected, message ) { QUnit.push( actual >= expected, actual, 'greater than or equal to ' + expected, message ); + } +}; + +$.extend( QUnit.assert, addons ); + +/** + * Small test suite to confirm proper functionality of the utilities and + * initializations in this file. + */ +var envExecCount = 0; +QUnit.module( 'mediawiki.tests.qunit.testrunner', QUnit.newMwEnvironment({ + setup: function () { + envExecCount += 1; + this.mwHtmlLive = mw.html; + mw.html = { + escape: function () { + return 'mocked-' + envExecCount; + } + }; + }, + teardown: function () { + mw.html = this.mwHtmlLive; + }, + config: { + testVar: 'foo' }, + messages: { + testMsg: 'Foo.' + } +}) ); - // Backwards compatible with new verions of QUnit - equals: window.equal, - same: window.deepEqual -}; +QUnit.test( 'Setup', 3, function ( assert ) { + assert.equal( mw.html.escape( 'foo' ), 'mocked-1', 'extra setup() callback was ran.' ); + assert.equal( mw.config.get( 'testVar' ), 'foo', 'config object applied' ); + assert.equal( mw.messages.get( 'testMsg' ), 'Foo.', 'messages object applied' ); + + mw.config.set( 'testVar', 'bar' ); + mw.messages.set( 'testMsg', 'Bar.' ); +}); + +QUnit.test( 'Teardown', 3, function ( assert ) { + assert.equal( mw.html.escape( 'foo' ), 'mocked-2', 'extra setup() callback was re-ran.' ); + assert.equal( mw.config.get( 'testVar' ), 'foo', 'config object restored and re-applied after test()' ); + assert.equal( mw.messages.get( 'testMsg' ), 'Foo.', 'messages object restored and re-applied after test()' ); +}); + +QUnit.module( 'mediawiki.tests.qunit.testrunner-after', QUnit.newMwEnvironment() ); -$.extend( QUnit, addons ); -$.extend( window, addons ); +QUnit.test( 'Teardown', 3, function ( assert ) { + assert.equal( mw.html.escape( '<' ), '<', 'extra teardown() callback was ran.' ); + assert.equal( mw.config.get( 'testVar' ), null, 'config object restored to live in next module()' ); + assert.equal( mw.messages.get( 'testMsg' ), null, 'messages object restored to live in next module()' ); +}); -})( jQuery, mediaWiki, QUnit ); +}( jQuery, mediaWiki, QUnit ) ); diff --git a/tests/qunit/data/testwarm.inject.js b/tests/qunit/data/testwarm.inject.js deleted file mode 100644 index 14ee8f93..00000000 --- a/tests/qunit/data/testwarm.inject.js +++ /dev/null @@ -1,349 +0,0 @@ -/* - Copyright (c) 2009 John Resig - - Permission is hereby granted, free of charge, to any person - obtaining a copy of this software and associated documentation - files (the "Software"), to deal in the Software without - restriction, including without limitation the rights to use, - copy, modify, merge, publish, distribute, sublicense, and/or sell - copies of the Software, and to permit persons to whom the - Software is furnished to do so, subject to the following - conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES - OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT - HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, - WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR - OTHER DEALINGS IN THE SOFTWARE. - -*/ -(function(){ - - var DEBUG = false; - - var doPost = false; - - try { - doPost = !!window.top.postMessage; - } catch(e){} - - var search = window.location.search, - url, index; - if( ( index = search.indexOf( "swarmURL=" ) ) != -1 ) - url = decodeURIComponent( search.slice( index + 9 ) ); - - if ( !DEBUG && (!url || url.indexOf("http") !== 0) ) { - return; - } - - var submitTimeout = 5; - - var curHeartbeat; - var beatRate = 20; - - // Expose the TestSwarm API - window.TestSwarm = { - submit: submit, - heartbeat: function(){ - if ( curHeartbeat ) { - clearTimeout( curHeartbeat ); - } - - curHeartbeat = setTimeout(function(){ - submit({ fail: -1, total: -1 }); - }, beatRate * 1000); - }, - serialize: function(){ - return trimSerialize(); - } - }; - - // Prevent careless things from executing - window.print = window.confirm = window.alert = window.open = function(){}; - - window.onerror = function(e){ - document.body.appendChild( document.createTextNode( "ERROR: " + e )); - submit({ fail: 0, error: 1, total: 1 }); - return false; - }; - - // QUnit (jQuery) - // http://docs.jquery.com/QUnit - if ( typeof QUnit !== "undefined" ) { - QUnit.done = function(results){ - submit({ - fail: results.failed, - error: 0, - total: results.total - }); - }; - - QUnit.log = window.TestSwarm.heartbeat; - window.TestSwarm.heartbeat(); - - window.TestSwarm.serialize = function(){ - // Clean up the HTML (remove any un-needed test markup) - remove("nothiddendiv"); - remove("loadediframe"); - remove("dl"); - remove("main"); - - // Show any collapsed results - var ol = document.getElementsByTagName("ol"); - for ( var i = 0; i < ol.length; i++ ) { - ol[i].style.display = "block"; - } - - return trimSerialize(); - }; - - // UnitTestJS (Prototype, Scriptaculous) - // http://github.com/tobie/unittest_js/tree/master - } else if ( typeof Test !== "undefined" && Test && Test.Unit && Test.Unit.runners ) { - var total_runners = Test.Unit.runners.length, cur_runners = 0; - var total = 0, fail = 0, error = 0; - - for (var i = 0; i < Test.Unit.runners.length; i++) (function(i){ - var finish = Test.Unit.runners[i].finish; - Test.Unit.runners[i].finish = function(){ - finish.call( this ); - - var results = this.getResult(); - total += results.assertions; - fail += results.failures; - error += results.errors; - - if ( ++cur_runners === total_runners ) { - submit({ - fail: fail, - error: error, - total: total - }); - } - }; - })(i); - - // JSSpec (MooTools) - // http://jania.pe.kr/aw/moin.cgi/JSSpec - } else if ( typeof JSSpec !== "undefined" && JSSpec && JSSpec.Logger ) { - var onRunnerEnd = JSSpec.Logger.prototype.onRunnerEnd; - JSSpec.Logger.prototype.onRunnerEnd = function(){ - onRunnerEnd.call(this); - - // Show any collapsed results - var ul = document.getElementsByTagName("ul"); - for ( var i = 0; i < ul.length; i++ ) { - ul[i].style.display = "block"; - } - - submit({ - fail: JSSpec.runner.getTotalFailures(), - error: JSSpec.runner.getTotalErrors(), - total: JSSpec.runner.totalExamples - }); - }; - - window.TestSwarm.serialize = function(){ - // Show any collapsed results - var ul = document.getElementsByTagName("ul"); - for ( var i = 0; i < ul.length; i++ ) { - ul[i].style.display = "block"; - } - - return trimSerialize(); - }; - - // JSUnit - // http://www.jsunit.net/ - // Note: Injection file must be included before the frames - // are document.write()d into the page. - } else if ( typeof JsUnitTestManager !== "undefined" ) { - var _done = JsUnitTestManager.prototype._done; - JsUnitTestManager.prototype._done = function(){ - _done.call(this); - - submit({ - fail: this.failureCount, - error: this.errorCount, - total: this.totalCount - }); - }; - - window.TestSwarm.serialize = function(){ - return "
" + this.log.join("\n") + "
"; - }; - - // Selenium Core - // http://seleniumhq.org/projects/core/ - } else if ( typeof SeleniumTestResult !== "undefined" && typeof LOG !== "undefined" ) { - // Completely overwrite the postback - SeleniumTestResult.prototype.post = function(){ - submit({ - fail: this.metrics.numCommandFailures, - error: this.metrics.numCommandErrors, - total: this.metrics.numCommandPasses + this.metrics.numCommandFailures + this.metrics.numCommandErrors - }); - }; - - window.TestSwarm.serialize = function(){ - var results = []; - while ( LOG.pendingMessages.length ) { - var msg = LOG.pendingMessages.shift(); - results.push( msg.type + ": " + msg.msg ); - } - - return "
" + results.join("\n") + "
"; - }; - - // Dojo Objective Harness - // http://docs.dojocampus.org/quickstart/doh - } else if ( typeof doh !== "undefined" && doh._report ) { - var _report = doh._report; - doh._report = function(){ - _report.apply(this, arguments); - - submit({ - fail: doh._failureCount, - error: doh._errorCount, - total: doh._testCount - }); - }; - - window.TestSwarm.serialize = function(){ - return "
" + document.getElementById("logBody").innerHTML + "
"; - }; - // Screw.Unit - // git://github.com/nathansobo/screw-unit.git - } else if ( typeof Screw !== "undefined" && typeof jQuery !== 'undefined' && Screw && Screw.Unit ) { - $(Screw).bind("after", function() { - var passed = $('.passed').length; - var failed = $('.failed').length; - submit({ - fail: failed, - error: 0, - total: failed + passed - }); - }); - - $(Screw).bind("loaded", function() { - $('.it') - .bind("passed", window.TestSwarm.heartbeat) - .bind("failed", window.TestSwarm.heartbeat); - window.TestSwarm.heartbeat(); - }); - - window.TestSwarm.serialize = function(){ - return trimSerialize(); - }; - } - - function trimSerialize(doc) { - doc = doc || document; - - var scripts = doc.getElementsByTagName("script"); - while ( scripts.length ) { - remove( scripts[0] ); - } - - var root = window.location.href.replace(/(https?:\/\/.*?)\/.*/, "$1"); - var cur = window.location.href.replace(/[^\/]*$/, ""); - - var links = doc.getElementsByTagName("link"); - for ( var i = 0; i < links.length; i++ ) { - var href = links[i].href; - if ( href.indexOf("/") === 0 ) { - href = root + href; - } else if ( !/^https?:\/\//.test( href ) ) { - href = cur + href; - } - links[i].href = href; - } - - return ("" + doc.documentElement.innerHTML + "") - .replace(/\s+/g, " "); - } - - function remove(elem){ - if ( typeof elem === "string" ) { - elem = document.getElementById( elem ); - } - - if ( elem ) { - elem.parentNode.removeChild( elem ); - } - } - - function submit(params){ - if ( curHeartbeat ) { - clearTimeout( curHeartbeat ); - } - - var paramItems = (url.split("?")[1] || "").split("&"); - - for ( var i = 0; i < paramItems.length; i++ ) { - if ( paramItems[i] ) { - var parts = paramItems[i].split("="); - if ( !params[ parts[0] ] ) { - params[ parts[0] ] = parts[1]; - } - } - } - - if ( !params.state ) { - params.state = "saverun"; - } - - if ( !params.results ) { - params.results = window.TestSwarm.serialize(); - } - - if ( doPost ) { - // Build Query String - var query = ""; - - for ( var i in params ) { - query += ( query ? "&" : "" ) + i + "=" + - encodeURIComponent(params[i]); - } - - if ( DEBUG ) { - alert( query ); - } else { - window.top.postMessage( query, "*" ); - } - - } else { - var form = document.createElement("form"); - form.action = url; - form.method = "POST"; - - for ( var i in params ) { - var input = document.createElement("input"); - input.type = "hidden"; - input.name = i; - input.value = params[i]; - form.appendChild( input ); - } - - if ( DEBUG ) { - alert( form.innerHTML ); - } else { - - // Watch for the result submission timing out - setTimeout(function(){ - submit( params ); - }, submitTimeout * 1000); - - document.body.appendChild( form ); - form.submit(); - } - } - } - -})(); diff --git a/tests/qunit/index.html b/tests/qunit/index.html deleted file mode 100644 index ef7ff8de..00000000 --- a/tests/qunit/index.html +++ /dev/null @@ -1,139 +0,0 @@ - - - - MediaWiki JavaScript Test Suite - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

MediaWiki JavaScript Test Suite

-

-
-

See testing documentation on mediawiki.org

-
-

-
    -
    - - -
    - - diff --git a/tests/qunit/suites/resources/jquery/jquery.autoEllipsis.test.js b/tests/qunit/suites/resources/jquery/jquery.autoEllipsis.test.js index 6e371384..0dee2ef0 100644 --- a/tests/qunit/suites/resources/jquery/jquery.autoEllipsis.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.autoEllipsis.test.js @@ -1,9 +1,6 @@ -module( 'jquery.autoEllipsis', QUnit.newMwEnvironment() ); +( function ( mw, $ ) { -test( '-- Initial check', function() { - expect(1); - ok( $.fn.autoEllipsis, 'jQuery.fn.autoEllipsis defined' ); -}); +QUnit.module( 'jquery.autoEllipsis', QUnit.newMwEnvironment() ); function createWrappedDiv( text, width ) { var $wrapper = $( '
    ' ).css( 'width', width ); @@ -14,15 +11,13 @@ function createWrappedDiv( text, width ) { function findDivergenceIndex( a, b ) { var i = 0; - while ( i < a.length && i < b.length && a[i] == b[i] ) { + while ( i < a.length && i < b.length && a[i] === b[i] ) { i++; } return i; } -test( 'Position right', function() { - expect(4); - +QUnit.test( 'Position right', 4, function ( assert ) { // We need this thing to be visible, so append it to the DOM var origText = 'This is a really long random string and there is no way it fits in 100 pixels.'; var $wrapper = createWrappedDiv( origText, '100px' ); @@ -31,25 +26,27 @@ test( 'Position right', function() { // Verify that, and only one, span element was created var $span = $wrapper.find( '> span' ); - strictEqual( $span.length, 1, 'autoEllipsis wrapped the contents in a span element' ); + assert.strictEqual( $span.length, 1, 'autoEllipsis wrapped the contents in a span element' ); // Check that the text fits by turning on word wrapping $span.css( 'whiteSpace', 'nowrap' ); - ltOrEq( $span.width(), $span.parent().width(), "Text fits (making the span 'white-space:nowrap' does not make it wider than its parent)" ); + assert.ltOrEq( $span.width(), $span.parent().width(), "Text fits (making the span 'white-space:nowrap' does not make it wider than its parent)" ); // Add two characters using scary black magic var spanText = $span.text(); var d = findDivergenceIndex( origText, spanText ); var spanTextNew = spanText.substr( 0, d ) + origText[d] + origText[d] + '...'; - gt( spanTextNew.length, spanText.length, 'Verify that the new span-length is indeed greater' ); + assert.gt( spanTextNew.length, spanText.length, 'Verify that the new span-length is indeed greater' ); // Put this text in the span and verify it doesn't fit $span.text( spanTextNew ); // In IE6 width works like min-width, allow IE6's width to be "equal to" if ( $.browser.msie && Number( $.browser.version ) === 6 ) { - gtOrEq( $span.width(), $span.parent().width(), 'Fit is maximal (adding two characters makes it not fit any more) - IE6: Maybe equal to as well due to width behaving like min-width in IE6' ); + assert.gtOrEq( $span.width(), $span.parent().width(), 'Fit is maximal (adding two characters makes it not fit any more) - IE6: Maybe equal to as well due to width behaving like min-width in IE6' ); } else { - gt( $span.width(), $span.parent().width(), 'Fit is maximal (adding two characters makes it not fit any more)' ); + assert.gt( $span.width(), $span.parent().width(), 'Fit is maximal (adding two characters makes it not fit any more)' ); } }); + +}( mediaWiki, jQuery ) ); diff --git a/tests/qunit/suites/resources/jquery/jquery.byteLength.test.js b/tests/qunit/suites/resources/jquery/jquery.byteLength.test.js index 15fac691..a6ddfca6 100644 --- a/tests/qunit/suites/resources/jquery/jquery.byteLength.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.byteLength.test.js @@ -1,32 +1,23 @@ -module( 'jquery.byteLength', QUnit.newMwEnvironment() ); - -test( '-- Initial check', function() { - expect(1); - ok( $.byteLength, 'jQuery.byteLength defined' ); -} ); - -test( 'Simple text', function() { - expect(5); +QUnit.module( 'jquery.byteLength', QUnit.newMwEnvironment() ); +QUnit.test( 'Simple text', 5, function ( assert ) { var azLc = 'abcdefghijklmnopqrstuvwxyz', azUc = 'ABCDEFGHIJKLMNOPQRSTUVWXYZ', num = '0123456789', x = '*', space = ' '; - equal( $.byteLength( azLc ), 26, 'Lowercase a-z' ); - equal( $.byteLength( azUc ), 26, 'Uppercase A-Z' ); - equal( $.byteLength( num ), 10, 'Numbers 0-9' ); - equal( $.byteLength( x ), 1, 'An asterisk' ); - equal( $.byteLength( space ), 3, '3 spaces' ); + assert.equal( $.byteLength( azLc ), 26, 'Lowercase a-z' ); + assert.equal( $.byteLength( azUc ), 26, 'Uppercase A-Z' ); + assert.equal( $.byteLength( num ), 10, 'Numbers 0-9' ); + assert.equal( $.byteLength( x ), 1, 'An asterisk' ); + assert.equal( $.byteLength( space ), 3, '3 spaces' ); } ); -test( 'Special text', window.foo = function() { - expect(5); - +QUnit.test( 'Special text', 5, function ( assert ) { // http://en.wikipedia.org/wiki/UTF-8 - var U_0024 = '\u0024', + var U_0024 = '$', U_00A2 = '\u00A2', U_20AC = '\u20AC', U_024B62 = '\u024B62', @@ -34,9 +25,9 @@ test( 'Special text', window.foo = function() { // according to http://www.fileformat.info/info/unicode/char/24B62/index.htm U_024B62_alt = '\uD852\uDF62'; - strictEqual( $.byteLength( U_0024 ), 1, 'U+0024: 1 byte. \u0024 (dollar sign)' ); - strictEqual( $.byteLength( U_00A2 ), 2, 'U+00A2: 2 bytes. \u00A2 (cent sign)' ); - strictEqual( $.byteLength( U_20AC ), 3, 'U+20AC: 3 bytes. \u20AC (euro sign)' ); - strictEqual( $.byteLength( U_024B62 ), 4, 'U+024B62: 4 bytes. \uD852\uDF62 (a Han character)' ); - strictEqual( $.byteLength( U_024B62_alt ), 4, 'U+024B62: 4 bytes. \uD852\uDF62 (a Han character) - alternative method' ); + assert.strictEqual( $.byteLength( U_0024 ), 1, 'U+0024: 1 byte. $ (dollar sign)' ); + assert.strictEqual( $.byteLength( U_00A2 ), 2, 'U+00A2: 2 bytes. \u00A2 (cent sign)' ); + assert.strictEqual( $.byteLength( U_20AC ), 3, 'U+20AC: 3 bytes. \u20AC (euro sign)' ); + assert.strictEqual( $.byteLength( U_024B62 ), 4, 'U+024B62: 4 bytes. \uD852\uDF62 (a Han character)' ); + assert.strictEqual( $.byteLength( U_024B62_alt ), 4, 'U+024B62: 4 bytes. \uD852\uDF62 (a Han character) - alternative method' ); } ); diff --git a/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js b/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js index 3346c2d5..4f86eb96 100644 --- a/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.byteLimit.test.js @@ -1,187 +1,234 @@ -( function () { - -module( 'jquery.byteLimit', QUnit.newMwEnvironment() ); - -test( '-- Initial check', function() { - expect(1); - ok( $.fn.byteLimit, 'jQuery.fn.byteLimit defined' ); -} ); - -// Basic sendkey-implementation -$.addChars = function( $input, charstr ) { - var len = charstr.length; - for ( var i = 0; i < len; i++ ) { - // Keep track of the previous value - var prevVal = $input.val(); - - // Get the key code - var code = charstr.charCodeAt(i); - - // Trigger event and undo if prevented - var event = new jQuery.Event( 'keypress', { keyCode: code, which: code, charCode: code } ); - $input.trigger( event ); - if ( !event.isDefaultPrevented() ) { - $input.val( prevVal + charstr.charAt(i) ); - } - } -}; - -/** - * Test factory for $.fn.byteLimit - * - * @param $input {jQuery} jQuery object in an input element - * @param hasLimit {Boolean} Wether a limit should apply at all - * @param limit {Number} Limit (if used) otherwise undefined - * The limit should be less than 20 (the sample data's length) - */ -var byteLimitTest = function( options ) { - var opt = $.extend({ - description: '', - $input: null, - sample: '', - hasLimit: false, - expected: '', - limit: null - }, options); - - test( opt.description, function() { - - opt.$input.appendTo( '#qunit-fixture' ); - - // Simulate pressing keys for each of the sample characters - $.addChars( opt.$input, opt.sample ); - var rawVal = opt.$input.val(), - fn = opt.$input.data( 'byteLimit-callback' ), - newVal = $.isFunction( fn ) ? fn( rawVal ) : rawVal; - - if ( opt.hasLimit ) { - expect(3); - - ltOrEq( $.byteLength( newVal ), opt.limit, 'Prevent keypresses after byteLimit was reached, length never exceeded the limit' ); - equal( $.byteLength( rawVal ), $.byteLength( opt.expected ), 'Not preventing keypresses too early, length has reached the expected length' ); - equal( rawVal, opt.expected, 'New value matches the expected string' ); +( function ( $, mw ) { + var simpleSample, U_20AC, mbSample; - } else { - expect(2); - equal( newVal, opt.expected, 'New value matches the expected string' ); - equal( $.byteLength( newVal ), $.byteLength( opt.expected ), 'Unlimited scenarios are not affected, expected length reached' ); - } - } ); -}; + QUnit.module( 'jquery.byteLimit', QUnit.newMwEnvironment() ); -var // Simple sample (20 chars, 20 bytes) - simpleSample = '12345678901234567890', + simpleSample = '12345678901234567890'; // 3 bytes (euro-symbol) - U_20AC = '\u20AC', + U_20AC = '\u20AC'; // Multi-byte sample (22 chars, 26 bytes) mbSample = '1234567890' + U_20AC + '1234567890' + U_20AC; -byteLimitTest({ - description: 'Plain text input', - $input: $( '' ) - .attr( 'type', 'text' ), - sample: simpleSample, - hasLimit: false, - expected: simpleSample -}); - -byteLimitTest({ - description: 'Limit using the maxlength attribute', - $input: $( '' ) - .attr( 'type', 'text' ) - .prop( 'maxLength', '10' ) - .byteLimit(), - sample: simpleSample, - hasLimit: true, - limit: 10, - expected: '1234567890' -}); - -byteLimitTest({ - description: 'Limit using a custom value', - $input: $( '' ) - .attr( 'type', 'text' ) - .byteLimit( 10 ), - sample: simpleSample, - hasLimit: true, - limit: 10, - expected: '1234567890' -}); - -byteLimitTest({ - description: 'Limit using a custom value, overriding maxlength attribute', - $input: $( '' ) - .attr( 'type', 'text' ) - .prop( 'maxLength', '10' ) - .byteLimit( 15 ), - sample: simpleSample, - hasLimit: true, - limit: 15, - expected: '123456789012345' -}); - -byteLimitTest({ - description: 'Limit using a custom value (multibyte)', - $input: $( '' ) - .attr( 'type', 'text' ) - .byteLimit( 14 ), - sample: mbSample, - hasLimit: true, - limit: 14, - expected: '1234567890' + U_20AC + '1' -}); - -byteLimitTest({ - description: 'Limit using a custom value (multibyte) overlapping a byte', - $input: $( '' ) - .attr( 'type', 'text' ) - .byteLimit( 12 ), - sample: mbSample, - hasLimit: true, - limit: 12, - expected: '1234567890' + '12' -}); - -byteLimitTest({ - description: 'Pass the limit and a callback as input filter', - $input: $( '' ) - .attr( 'type', 'text' ) - .byteLimit( 6, function( val ) { - // Invalid title - if ( val == '' ) { - return ''; - } + // Basic sendkey-implementation + function addChars( $input, charstr ) { + var c, len; + for ( c = 0, len = charstr.length; c < len; c += 1 ) { + $input + .val( function ( i, val ) { + // Add character to the value + return val + charstr.charAt( c ); + } ) + .trigger( 'change' ); + } + } - // Return without namespace prefix - return new mw.Title( '' + val ).getMain(); - } ), - sample: 'User:Sample', - hasLimit: true, - limit: 6, // 'Sample' length - expected: 'User:Sample' -}); - -byteLimitTest({ - description: 'Limit using the maxlength attribute and pass a callback as input filter', - $input: $( '' ) - .attr( 'type', 'text' ) - .prop( 'maxLength', '6' ) - .byteLimit( function( val ) { - // Invalid title - if ( val === '' ) { - return ''; + /** + * Test factory for $.fn.byteLimit + * + * @param $input {jQuery} jQuery object in an input element + * @param hasLimit {Boolean} Wether a limit should apply at all + * @param limit {Number} Limit (if used) otherwise undefined + * The limit should be less than 20 (the sample data's length) + */ + function byteLimitTest( options ) { + var opt = $.extend({ + description: '', + $input: null, + sample: '', + hasLimit: false, + expected: '', + limit: null + }, options); + + QUnit.asyncTest( opt.description, opt.hasLimit ? 3 : 2, function ( assert ) { + setTimeout( function () { + var rawVal, fn, effectiveVal; + + opt.$input.appendTo( '#qunit-fixture' ); + + // Simulate pressing keys for each of the sample characters + addChars( opt.$input, opt.sample ); + + rawVal = opt.$input.val(); + fn = opt.$input.data( 'byteLimit.callback' ); + effectiveVal = fn ? fn( rawVal ) : rawVal; + + if ( opt.hasLimit ) { + assert.ltOrEq( + $.byteLength( effectiveVal ), + opt.limit, + 'Prevent keypresses after byteLimit was reached, length never exceeded the limit' + ); + assert.equal( + $.byteLength( rawVal ), + $.byteLength( opt.expected ), + 'Not preventing keypresses too early, length has reached the expected length' + ); + assert.equal( rawVal, opt.expected, 'New value matches the expected string' ); + + } else { + assert.equal( + $.byteLength( effectiveVal ), + $.byteLength( opt.expected ), + 'Unlimited scenarios are not affected, expected length reached' + ); + assert.equal( rawVal, opt.expected, 'New value matches the expected string' ); } + QUnit.start(); + }, 10 ); + } ); + } - // Return without namespace prefix - return new mw.Title( '' + val ).getMain(); - } ), - sample: 'User:Sample', - hasLimit: true, - limit: 6, // 'Sample' length - expected: 'User:Sample' -}); - -}() ); \ No newline at end of file + byteLimitTest({ + description: 'Plain text input', + $input: $( '' ), + sample: simpleSample, + hasLimit: false, + expected: simpleSample + }); + + byteLimitTest({ + description: 'Plain text input. Calling byteLimit with no parameters and no maxlength attribute (bug 36310)', + $input: $( '' ) + .byteLimit(), + sample: simpleSample, + hasLimit: false, + expected: simpleSample + }); + + byteLimitTest({ + description: 'Limit using the maxlength attribute', + $input: $( '' ) + .attr( 'maxlength', '10' ) + .byteLimit(), + sample: simpleSample, + hasLimit: true, + limit: 10, + expected: '1234567890' + }); + + byteLimitTest({ + description: 'Limit using a custom value', + $input: $( '' ) + .byteLimit( 10 ), + sample: simpleSample, + hasLimit: true, + limit: 10, + expected: '1234567890' + }); + + byteLimitTest({ + description: 'Limit using a custom value, overriding maxlength attribute', + $input: $( '' ) + .attr( 'maxlength', '10' ) + .byteLimit( 15 ), + sample: simpleSample, + hasLimit: true, + limit: 15, + expected: '123456789012345' + }); + + byteLimitTest({ + description: 'Limit using a custom value (multibyte)', + $input: $( '' ) + .byteLimit( 14 ), + sample: mbSample, + hasLimit: true, + limit: 14, + expected: '1234567890' + U_20AC + '1' + }); + + byteLimitTest({ + description: 'Limit using a custom value (multibyte) overlapping a byte', + $input: $( '' ) + .byteLimit( 12 ), + sample: mbSample, + hasLimit: true, + limit: 12, + expected: '1234567890' + '12' + }); + + byteLimitTest({ + description: 'Pass the limit and a callback as input filter', + $input: $( '' ) + .byteLimit( 6, function ( val ) { + // Invalid title + if ( val === '' ) { + return ''; + } + + // Return without namespace prefix + return new mw.Title( String( val ) ).getMain(); + } ), + sample: 'User:Sample', + hasLimit: true, + limit: 6, // 'Sample' length + expected: 'User:Sample' + }); + + byteLimitTest({ + description: 'Limit using the maxlength attribute and pass a callback as input filter', + $input: $( '' ) + .attr( 'maxlength', '6' ) + .byteLimit( function ( val ) { + // Invalid title + if ( val === '' ) { + return ''; + } + + // Return without namespace prefix + return new mw.Title( String( val ) ).getMain(); + } ), + sample: 'User:Sample', + hasLimit: true, + limit: 6, // 'Sample' length + expected: 'User:Sample' + }); + + QUnit.test( 'Confirm properties and attributes set', 4, function ( assert ) { + var $el, $elA, $elB; + + $el = $( '' ) + .attr( 'maxlength', '7' ) + .appendTo( '#qunit-fixture' ) + .byteLimit(); + + assert.strictEqual( $el.attr( 'maxlength' ), '7', 'maxlength attribute unchanged for simple limit' ); + + $el = $( '' ) + .attr( 'maxlength', '7' ) + .appendTo( '#qunit-fixture' ) + .byteLimit( 12 ); + + assert.strictEqual( $el.attr( 'maxlength' ), '12', 'maxlength attribute updated for custom limit' ); + + $el = $( '' ) + .attr( 'maxlength', '7' ) + .appendTo( '#qunit-fixture' ) + .byteLimit( 12, function ( val ) { + return val; + } ); + + assert.strictEqual( $el.attr( 'maxlength' ), undefined, 'maxlength attribute removed for limit with callback' ); + + $elA = $( '' ) + .addClass( 'mw-test-byteLimit-foo' ) + .attr( 'maxlength', '7' ) + .appendTo( '#qunit-fixture' ); + + $elB = $( '' ) + .addClass( 'mw-test-byteLimit-foo' ) + .attr( 'maxlength', '12' ) + .appendTo( '#qunit-fixture' ); + + $el = $( '.mw-test-byteLimit-foo' ); + + assert.strictEqual( $el.length, 2, 'Verify that there are no other elements clashing with this test suite' ); + + $el.byteLimit(); + }); + +}( jQuery, mediaWiki ) ); diff --git a/tests/qunit/suites/resources/jquery/jquery.client.test.js b/tests/qunit/suites/resources/jquery/jquery.client.test.js index 7be41971..bf62b39a 100644 --- a/tests/qunit/suites/resources/jquery/jquery.client.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.client.test.js @@ -1,14 +1,9 @@ -module( 'jquery.client', QUnit.newMwEnvironment() ); - -test( '-- Initial check', function() { - expect(1); - ok( jQuery.client, 'jQuery.client defined' ); -}); +QUnit.module( 'jquery.client', QUnit.newMwEnvironment() ); /** Number of user-agent defined */ var uacount = 0; -var uas = (function() { +var uas = (function () { // Object keyed by userAgent. Value is an array (human-readable name, client-profile object, navigator.platform value) // Info based on results from http://toolserver.org/~krinkle/testswarm/job/174/ @@ -205,42 +200,59 @@ var uas = (function() { ltr: true, rtl: true } + }, + // Bug #34924 + 'Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.34 (KHTML, like Gecko) rekonq Safari/534.34': { + title: 'Rekonq', + platform: 'Linux i686', + profile: { + "name": "rekonq", + "layout": "webkit", + "layoutVersion": 534, + "platform": "linux", + "version": "534.34", + "versionBase": "534", + "versionNumber": 534.34 + }, + wikiEditor: { + ltr: true, + rtl: true + } } }; - $.each( uas, function() { uacount++ }); + $.each( uas, function () { + uacount++; + }); return uas; -})(); - -test( 'profile userAgent support', function() { - expect(uacount); +}()); +QUnit.test( 'profile userAgent support', uacount, function ( assert ) { // Generate a client profile object and compare recursively var uaTest = function( rawUserAgent, data ) { var ret = $.client.profile( { userAgent: rawUserAgent, platform: data.platform } ); - deepEqual( ret, data.profile, 'Client profile support check for ' + data.title + ' (' + data.platform + '): ' + rawUserAgent ); + assert.deepEqual( ret, data.profile, 'Client profile support check for ' + data.title + ' (' + data.platform + '): ' + rawUserAgent ); }; // Loop through and run tests $.each( uas, uaTest ); } ); -test( 'profile return validation for current user agent', function() { - expect(7); +QUnit.test( 'profile return validation for current user agent', 7, function ( assert ) { var p = $.client.profile(); - var unknownOrType = function( val, type, summary ) { - return ok( typeof val === type || val === 'unknown', summary ); - }; + function unknownOrType( val, type, summary ) { + assert.ok( typeof val === type || val === 'unknown', summary ); + } - equal( typeof p, 'object', 'profile returns an object' ); + assert.equal( typeof p, 'object', 'profile returns an object' ); unknownOrType( p.layout, 'string', 'p.layout is a string (or "unknown")' ); unknownOrType( p.layoutVersion, 'number', 'p.layoutVersion is a number (or "unknown")' ); unknownOrType( p.platform, 'string', 'p.platform is a string (or "unknown")' ); unknownOrType( p.version, 'string', 'p.version is a string (or "unknown")' ); unknownOrType( p.versionBase, 'string', 'p.versionBase is a string (or "unknown")' ); - equal( typeof p.versionNumber, 'number', 'p.versionNumber is a number' ); + assert.equal( typeof p.versionNumber, 'number', 'p.versionNumber is a number' ); }); // Example from WikiEditor @@ -271,20 +283,16 @@ var testMap = { } }; -test( 'test', function() { - expect(1); - +QUnit.test( 'test', 1, function ( assert ) { // .test() uses eval, make sure no exceptions are thrown // then do a basic return value type check var testMatch = $.client.test( testMap ); - equal( typeof testMatch, 'boolean', 'test returns a boolean value' ); + assert.equal( typeof testMatch, 'boolean', 'test returns a boolean value' ); }); -test( 'User-agent matches against WikiEditor\'s compatibility map', function() { - expect( uacount * 2 ); // double since we test both LTR and RTL - +QUnit.test( 'User-agent matches against WikiEditor\'s compatibility map', uacount * 2, function ( assert ) { var $body = $( 'body' ), bodyClasses = $body.attr( 'class' ); @@ -299,7 +307,7 @@ test( 'User-agent matches against WikiEditor\'s compatibility map', function() { var testMatch = $.client.test( testMap, profile ); $body.removeClass( dir ); - equal( testMatch, data.wikiEditor[dir], 'testing comparison based on ' + dir + ', ' + agent ); + assert.equal( testMatch, data.wikiEditor[dir], 'testing comparison based on ' + dir + ', ' + agent ); }); }); diff --git a/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js b/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js index 655ee564..7b37f5a0 100644 --- a/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.colorUtil.test.js @@ -1,40 +1,31 @@ -module( 'jquery.colorUtil', QUnit.newMwEnvironment() ); - -test( '-- Initial check', function() { - expect(1); - ok( $.colorUtil, '$.colorUtil defined' ); -}); - -test( 'getRGB', function() { - expect(18); - - strictEqual( $.colorUtil.getRGB(), undefined, 'No arguments' ); - strictEqual( $.colorUtil.getRGB( '' ), undefined, 'Empty string' ); - deepEqual( $.colorUtil.getRGB( [0, 100, 255] ), [0, 100, 255], 'Parse array of rgb values' ); - deepEqual( $.colorUtil.getRGB( 'rgb(0,100,255)' ), [0, 100, 255], 'Parse simple rgb string' ); - deepEqual( $.colorUtil.getRGB( 'rgb(0, 100, 255)' ), [0, 100, 255], 'Parse simple rgb string with spaces' ); - deepEqual( $.colorUtil.getRGB( 'rgb(0%,20%,40%)' ), [0, 51, 102], 'Parse rgb string with percentages' ); - deepEqual( $.colorUtil.getRGB( 'rgb(0%, 20%, 40%)' ), [0, 51, 102], 'Parse rgb string with percentages and spaces' ); - deepEqual( $.colorUtil.getRGB( '#f2ddee' ), [242, 221, 238], 'Hex string: 6 char lowercase' ); - deepEqual( $.colorUtil.getRGB( '#f2DDEE' ), [242, 221, 238], 'Hex string: 6 char uppercase' ); - deepEqual( $.colorUtil.getRGB( '#f2DdEe' ), [242, 221, 238], 'Hex string: 6 char mixed' ); - deepEqual( $.colorUtil.getRGB( '#eee' ), [238, 238, 238], 'Hex string: 3 char lowercase' ); - deepEqual( $.colorUtil.getRGB( '#EEE' ), [238, 238, 238], 'Hex string: 3 char uppercase' ); - deepEqual( $.colorUtil.getRGB( '#eEe' ), [238, 238, 238], 'Hex string: 3 char mixed' ); - deepEqual( $.colorUtil.getRGB( 'rgba(0, 0, 0, 0)' ), [255, 255, 255], 'Zero rgba for Safari 3; Transparent (whitespace)' ); +QUnit.module( 'jquery.colorUtil', QUnit.newMwEnvironment() ); + +QUnit.test( 'getRGB', 18, function ( assert ) { + assert.strictEqual( $.colorUtil.getRGB(), undefined, 'No arguments' ); + assert.strictEqual( $.colorUtil.getRGB( '' ), undefined, 'Empty string' ); + assert.deepEqual( $.colorUtil.getRGB( [0, 100, 255] ), [0, 100, 255], 'Parse array of rgb values' ); + assert.deepEqual( $.colorUtil.getRGB( 'rgb(0,100,255)' ), [0, 100, 255], 'Parse simple rgb string' ); + assert.deepEqual( $.colorUtil.getRGB( 'rgb(0, 100, 255)' ), [0, 100, 255], 'Parse simple rgb string with spaces' ); + assert.deepEqual( $.colorUtil.getRGB( 'rgb(0%,20%,40%)' ), [0, 51, 102], 'Parse rgb string with percentages' ); + assert.deepEqual( $.colorUtil.getRGB( 'rgb(0%, 20%, 40%)' ), [0, 51, 102], 'Parse rgb string with percentages and spaces' ); + assert.deepEqual( $.colorUtil.getRGB( '#f2ddee' ), [242, 221, 238], 'Hex string: 6 char lowercase' ); + assert.deepEqual( $.colorUtil.getRGB( '#f2DDEE' ), [242, 221, 238], 'Hex string: 6 char uppercase' ); + assert.deepEqual( $.colorUtil.getRGB( '#f2DdEe' ), [242, 221, 238], 'Hex string: 6 char mixed' ); + assert.deepEqual( $.colorUtil.getRGB( '#eee' ), [238, 238, 238], 'Hex string: 3 char lowercase' ); + assert.deepEqual( $.colorUtil.getRGB( '#EEE' ), [238, 238, 238], 'Hex string: 3 char uppercase' ); + assert.deepEqual( $.colorUtil.getRGB( '#eEe' ), [238, 238, 238], 'Hex string: 3 char mixed' ); + assert.deepEqual( $.colorUtil.getRGB( 'rgba(0, 0, 0, 0)' ), [255, 255, 255], 'Zero rgba for Safari 3; Transparent (whitespace)' ); // Perhaps this is a bug in colorUtil, but it is the current behaviour so, let's keep // track of it, so we will know in case it would ever change. - strictEqual( $.colorUtil.getRGB( 'rgba(0,0,0,0)' ), undefined, 'Zero rgba without whitespace' ); + assert.strictEqual( $.colorUtil.getRGB( 'rgba(0,0,0,0)' ), undefined, 'Zero rgba without whitespace' ); - deepEqual( $.colorUtil.getRGB( 'lightGreen' ), [144, 238, 144], 'Color names (lightGreen)' ); - deepEqual( $.colorUtil.getRGB( 'transparent' ), [255, 255, 255], 'Color names (transparent)' ); - strictEqual( $.colorUtil.getRGB( 'mediaWiki' ), undefined, 'Inexisting color name' ); + assert.deepEqual( $.colorUtil.getRGB( 'lightGreen' ), [144, 238, 144], 'Color names (lightGreen)' ); + assert.deepEqual( $.colorUtil.getRGB( 'transparent' ), [255, 255, 255], 'Color names (transparent)' ); + assert.strictEqual( $.colorUtil.getRGB( 'mediaWiki' ), undefined, 'Inexisting color name' ); }); -test( 'rgbToHsl', function() { - expect(1); - +QUnit.test( 'rgbToHsl', 1, function ( assert ) { var hsl = $.colorUtil.rgbToHsl( 144, 238, 144 ); // Cross-browser differences in decimals... @@ -45,27 +36,23 @@ test( 'rgbToHsl', function() { // Re-create the rgbToHsl return array items, limited to two decimals. var ret = [dualDecimals(hsl[0]), dualDecimals(hsl[1]), dualDecimals(hsl[2])]; - deepEqual( ret, [0.33, 0.73, 0.75], 'rgb(144, 238, 144): hsl(0.33, 0.73, 0.75)' ); + assert.deepEqual( ret, [0.33, 0.73, 0.75], 'rgb(144, 238, 144): hsl(0.33, 0.73, 0.75)' ); }); -test( 'hslToRgb', function() { - expect(1); - +QUnit.test( 'hslToRgb', 1, function ( assert ) { var rgb = $.colorUtil.hslToRgb( 0.3, 0.7, 0.8 ); // Cross-browser differences in decimals... // Re-create the hslToRgb return array items, rounded to whole numbers. var ret = [Math.round(rgb[0]), Math.round(rgb[1]), Math.round(rgb[2])]; - deepEqual( ret ,[183, 240, 168], 'hsl(0.3, 0.7, 0.8): rgb(183, 240, 168)' ); + assert.deepEqual( ret ,[183, 240, 168], 'hsl(0.3, 0.7, 0.8): rgb(183, 240, 168)' ); }); -test( 'getColorBrightness', function() { - expect(2); - +QUnit.test( 'getColorBrightness', 2, function ( assert ) { var a = $.colorUtil.getColorBrightness( 'red', +0.1 ); - equal( a, 'rgb(255,50,50)', 'Start with named color "red", brighten 10%' ); + assert.equal( a, 'rgb(255,50,50)', 'Start with named color "red", brighten 10%' ); var b = $.colorUtil.getColorBrightness( 'rgb(200,50,50)', -0.2 ); - equal( b, 'rgb(118,29,29)', 'Start with rgb string "rgb(200,50,50)", darken 20%' ); + assert.equal( b, 'rgb(118,29,29)', 'Start with rgb string "rgb(200,50,50)", darken 20%' ); }); diff --git a/tests/qunit/suites/resources/jquery/jquery.delayedBind.test.js b/tests/qunit/suites/resources/jquery/jquery.delayedBind.test.js index 6489a1f1..a3079835 100644 --- a/tests/qunit/suites/resources/jquery/jquery.delayedBind.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.delayedBind.test.js @@ -1,41 +1,35 @@ -test('jquery.delayedBind with data option', function() { +QUnit.asyncTest('jquery.delayedBind with data option', 2, function ( assert ) { var $fixture = $('
    ').appendTo('#qunit-fixture'), data = { magic: "beeswax" }, delay = 50; - $fixture.delayedBind(delay, 'testevent', data, function(event) { - start(); // continue! - ok(true, 'testevent fired'); - ok(event.data === data, 'data is passed through delayedBind'); + $fixture.delayedBind(delay, 'testevent', data, function ( e ) { + QUnit.start(); // continue! + assert.ok( true, 'testevent fired'); + assert.ok( e.data === data, 'data is passed through delayedBind'); }); - expect(2); - stop(); // async! - // We'll trigger it thrice, but it should only happen once. - $fixture.trigger('testevent', {}); - $fixture.trigger('testevent', {}); - $fixture.trigger('testevent', {}); - $fixture.trigger('testevent', {}); + $fixture.trigger( 'testevent', {} ); + $fixture.trigger( 'testevent', {} ); + $fixture.trigger( 'testevent', {} ); + $fixture.trigger( 'testevent', {} ); }); -test('jquery.delayedBind without data option', function() { +QUnit.asyncTest('jquery.delayedBind without data option', 1, function ( assert ) { var $fixture = $('
    ').appendTo('#qunit-fixture'), data = { magic: "beeswax" }, delay = 50; - $fixture.delayedBind(delay, 'testevent', function(event) { - start(); // continue! - ok(true, 'testevent fired'); + $fixture.delayedBind(delay, 'testevent', function ( e ) { + QUnit.start(); // continue! + assert.ok(true, 'testevent fired'); }); - expect(1); - stop(); // async! - // We'll trigger it thrice, but it should only happen once. - $fixture.trigger('testevent', {}); - $fixture.trigger('testevent', {}); - $fixture.trigger('testevent', {}); - $fixture.trigger('testevent', {}); + $fixture.trigger( 'testevent', {} ); + $fixture.trigger( 'testevent', {} ); + $fixture.trigger( 'testevent', {} ); + $fixture.trigger( 'testevent', {} ); }); diff --git a/tests/qunit/suites/resources/jquery/jquery.getAttrs.test.js b/tests/qunit/suites/resources/jquery/jquery.getAttrs.test.js index 9377a2f6..6eef1abb 100644 --- a/tests/qunit/suites/resources/jquery/jquery.getAttrs.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.getAttrs.test.js @@ -1,17 +1,11 @@ -module( 'jquery.getAttrs', QUnit.newMwEnvironment() ); +QUnit.module( 'jquery.getAttrs', QUnit.newMwEnvironment() ); -test( '-- Initial check', function() { - expect(1); - ok( $.fn.getAttrs, 'jQuery.fn.getAttrs defined' ); -} ); - -test( 'Check', function() { - expect(1); +QUnit.test( 'Check', 1, function ( assert ) { var attrs = { foo: 'bar', 'class': 'lorem' }, - $el = $( '
    ', attrs ); + $el = jQuery( '
    ', attrs ); - deepEqual( $el.getAttrs(), attrs, 'getAttrs() return object should match the attributes set, no more, no less' ); + assert.deepEqual( $el.getAttrs(), attrs, 'getAttrs() return object should match the attributes set, no more, no less' ); } ); diff --git a/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js b/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js index 4750d2b8..a94dca31 100644 --- a/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.highlightText.test.js @@ -1,12 +1,7 @@ -module( 'jquery.highlightText', QUnit.newMwEnvironment() ); +QUnit.module( 'jquery.highlightText', QUnit.newMwEnvironment() ); -test( '-- Initial check', function() { - expect(1); - ok( $.fn.highlightText, 'jQuery.fn.highlightText defined' ); -} ); - -test( 'Check', function() { - var cases = [ +QUnit.test( 'Check', function ( assert ) { + var $fixture, cases = [ { desc: 'Test 001', text: 'Blue Öyster Cult', @@ -224,16 +219,14 @@ test( 'Check', function() { expected: 'بول إيردوس' } ]; - expect(cases.length); - var $fixture; + QUnit.expect( cases.length ); - $.each(cases, function( i, item ) { - $fixture = $( '

    ' ).text( item.text ); - $fixture.highlightText( item.highlight ); - equals( + $.each( cases, function ( i, item ) { + $fixture = $( '

    ' ).text( item.text ).highlightText( item.highlight ); + assert.equal( $fixture.html(), - $('

    ' + item.expected + '

    ').html(), // re-parse to normalize! + $( '

    ' ).html( item.expected ).html(), // re-parse to normalize! item.desc || undefined - ); + ); } ); } ); diff --git a/tests/qunit/suites/resources/jquery/jquery.localize.test.js b/tests/qunit/suites/resources/jquery/jquery.localize.test.js index cd828634..c8e1d9f9 100644 --- a/tests/qunit/suites/resources/jquery/jquery.localize.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.localize.test.js @@ -1,13 +1,6 @@ -module( 'jquery.localize', QUnit.newMwEnvironment() ); - -test( '-- Initial check', function() { - expect(1); - ok( $.fn.localize, 'jQuery.fn.localize defined' ); -} ); - -test( 'Handle basic replacements', function() { - expect(3); +QUnit.module( 'jquery.localize', QUnit.newMwEnvironment() ); +QUnit.test( 'Handle basic replacements', 4, function ( assert ) { var html, $lc; mw.messages.set( 'basic', 'Basic stuff' ); @@ -15,24 +8,28 @@ test( 'Handle basic replacements', function() { html = '

    '; $lc = $( html ).localize().find( 'span' ); - strictEqual( $lc.text(), 'Basic stuff', 'Tag: html:msg' ); + assert.strictEqual( $lc.text(), 'Basic stuff', 'Tag: html:msg' ); // Attribute: title-msg - html = '
    '; + html = '
    '; $lc = $( html ).localize().find( 'span' ); - strictEqual( $lc.attr( 'title' ), 'Basic stuff', 'Attribute: title-msg' ); + assert.strictEqual( $lc.attr( 'title' ), 'Basic stuff', 'Attribute: title-msg' ); // Attribute: alt-msg - html = '
    '; + html = '
    '; $lc = $( html ).localize().find( 'span' ); - strictEqual( $lc.attr( 'alt' ), 'Basic stuff', 'Attribute: alt-msg' ); -} ); + assert.strictEqual( $lc.attr( 'alt' ), 'Basic stuff', 'Attribute: alt-msg' ); -test( 'Proper escaping', function() { - expect(2); + // Attribute: placeholder-msg + html = '
    '; + $lc = $( html ).localize().find( 'input' ); + assert.strictEqual( $lc.attr( 'placeholder' ), 'Basic stuff', 'Attribute: placeholder-msg' ); +} ); + +QUnit.test( 'Proper escaping', 2, function ( assert ) { var html, $lc; mw.messages.set( 'properfoo', '' ); @@ -40,21 +37,19 @@ test( 'Proper escaping', function() { // making sure it is actually using text() and attr() (or something with the same effect) // Text escaping - html = '
    '; + html = '
    '; $lc = $( html ).localize().find( 'span' ); - strictEqual( $lc.text(), mw.msg( 'properfoo' ), 'Content is inserted as text, not as html.' ); + assert.strictEqual( $lc.text(), mw.msg( 'properfoo' ), 'Content is inserted as text, not as html.' ); // Attribute escaping - html = '
    '; + html = '
    '; $lc = $( html ).localize().find( 'span' ); - strictEqual( $lc.attr( 'title' ), mw.msg( 'properfoo' ), 'Attributes are not inserted raw.' ); + assert.strictEqual( $lc.attr( 'title' ), mw.msg( 'properfoo' ), 'Attributes are not inserted raw.' ); } ); -test( 'Options', function() { - expect(7); - +QUnit.test( 'Options', 7, function ( assert ) { mw.messages.set( { 'foo-lorem': 'Lorem', 'foo-ipsum': 'Ipsum', @@ -67,17 +62,17 @@ test( 'Options', function() { var html, $lc, attrs, x, sitename = 'Wikipedia'; // Message key prefix - html = '
    '; + html = '
    '; $lc = $( html ).localize( { prefix: 'foo-' } ).find( 'span' ); - strictEqual( $lc.attr( 'title' ), 'Lorem', 'Message key prefix - attr' ); - strictEqual( $lc.text(), 'Ipsum', 'Message key prefix - text' ); + assert.strictEqual( $lc.attr( 'title' ), 'Lorem', 'Message key prefix - attr' ); + assert.strictEqual( $lc.text(), 'Ipsum', 'Message key prefix - text' ); // Variable keys mapping x = 'bar'; - html = '
    '; + html = '
    '; $lc = $( html ).localize( { keys: { 'title': 'foo-' + x + '-title', @@ -85,22 +80,22 @@ test( 'Options', function() { } } ).find( 'span' ); - strictEqual( $lc.attr( 'title' ), 'Read more about bars', 'Variable keys mapping - attr' ); - strictEqual( $lc.text(), 'The Bars', 'Variable keys mapping - text' ); + assert.strictEqual( $lc.attr( 'title' ), 'Read more about bars', 'Variable keys mapping - attr' ); + assert.strictEqual( $lc.text(), 'The Bars', 'Variable keys mapping - text' ); // Passing parameteters to mw.msg - html = '
    '; + html = '
    '; $lc = $( html ).localize( { params: { 'foo-welcome': [sitename, 'yesterday'] } } ).find( 'span' ); - strictEqual( $lc.text(), 'Welcome to Wikipedia! (last visit: yesterday)', 'Passing parameteters to mw.msg' ); + assert.strictEqual( $lc.text(), 'Welcome to Wikipedia! (last visit: yesterday)', 'Passing parameteters to mw.msg' ); // Combination of options prefix, params and keys x = 'bazz'; - html = '
    '; + html = '
    '; $lc = $( html ).localize( { prefix: 'foo-', keys: { @@ -114,6 +109,25 @@ test( 'Options', function() { } } ).find( 'span' ); - strictEqual( $lc.text(), 'The Bazz (Wikipedia)', 'Combination of options prefix, params and keys - text' ); - strictEqual( $lc.attr( 'title' ), 'Read more about bazz at Wikipedia (last modified: 3 minutes ago)', 'Combination of options prefix, params and keys - attr' ); + assert.strictEqual( $lc.text(), 'The Bazz (Wikipedia)', 'Combination of options prefix, params and keys - text' ); + assert.strictEqual( $lc.attr( 'title' ), 'Read more about bazz at Wikipedia (last modified: 3 minutes ago)', 'Combination of options prefix, params and keys - attr' ); +} ); + +QUnit.test( 'Handle data text', 2, function ( assert ) { + var html, $lc; + mw.messages.set( 'option-one', 'Item 1' ); + mw.messages.set( 'option-two', 'Item 2' ); + html = ''; + $lc = $( html ).localize().find( 'option' ); + assert.strictEqual( $lc.eq( 0 ).text(), mw.msg( 'option-one' ), 'data-msg-text becomes text of options' ); + assert.strictEqual( $lc.eq( 1 ).text(), mw.msg( 'option-two' ), 'data-msg-text becomes text of options' ); +} ); + +QUnit.test( 'Handle data html', 2, function ( assert ) { + var html, $lc; + mw.messages.set( 'html', 'behold... there is a link here!!' ); + html = '
    '; + $lc = $( html ).localize().find( 'a' ); + assert.strictEqual( $lc.length, 1, 'link is created' ); + assert.strictEqual( $lc.text(), 'link', 'the link text got added' ); } ); diff --git a/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js b/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js index 3a2d0d83..5b566ae0 100644 --- a/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js +++ b/tests/qunit/suites/resources/jquery/jquery.mwExtension.test.js @@ -1,58 +1,58 @@ -module( 'jquery.mwExtension', QUnit.newMwEnvironment() ); +QUnit.module( 'jquery.mwExtension', QUnit.newMwEnvironment() ); -test( 'String functions', function() { +QUnit.test( 'String functions', function ( assert ) { - equal( $.trimLeft( ' foo bar ' ), 'foo bar ', 'trimLeft' ); - equal( $.trimRight( ' foo bar ' ), ' foo bar', 'trimRight' ); - equal( $.ucFirst( 'foo' ), 'Foo', 'ucFirst' ); + assert.equal( $.trimLeft( ' foo bar ' ), 'foo bar ', 'trimLeft' ); + assert.equal( $.trimRight( ' foo bar ' ), ' foo bar', 'trimRight' ); + assert.equal( $.ucFirst( 'foo' ), 'Foo', 'ucFirst' ); - equal( $.escapeRE( '