mirror of
https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools
synced 2024-09-24 02:48:18 +00:00
Merge "Rename tests/qunit/utils.js to .../testUtils.js"
This commit is contained in:
commit
fecc23ecd7
|
@ -134,7 +134,7 @@
|
|||
"remoteExtPath": "DiscussionTools/tests/qunit",
|
||||
"packageFiles": [
|
||||
"index.js",
|
||||
"utils.js",
|
||||
"testUtils.js",
|
||||
{
|
||||
"name": "data-en.json",
|
||||
"callback": "DiscussionToolsData::getLocalData",
|
||||
|
|
|
@ -1,9 +1,9 @@
|
|||
var
|
||||
utils = require( './utils.js' ),
|
||||
testUtils = require( './testUtils.js' ),
|
||||
parser = require( 'ext.discussionTools.init' ).parser,
|
||||
modifier = require( 'ext.discussionTools.init' ).modifier;
|
||||
|
||||
QUnit.module( 'mw.dt.modifier', utils.newEnvironment() );
|
||||
QUnit.module( 'mw.dt.modifier', testUtils.newEnvironment() );
|
||||
|
||||
QUnit.test( '#addListItem/#removeListItem', function ( assert ) {
|
||||
var i, j, cases,
|
||||
|
@ -65,8 +65,8 @@ QUnit.test( '#addListItem/#removeListItem', function ( assert ) {
|
|||
fixture = document.getElementById( 'qunit-fixture' );
|
||||
|
||||
for ( i = 0; i < cases.length; i++ ) {
|
||||
utils.overrideMwConfig( cases[ i ].config );
|
||||
utils.overrideParserData( cases[ i ].data );
|
||||
testUtils.overrideMwConfig( cases[ i ].config );
|
||||
testUtils.overrideParserData( cases[ i ].data );
|
||||
|
||||
$( fixture ).empty().append( cases[ i ].expected );
|
||||
expectedHtml = fixture.innerHTML;
|
||||
|
@ -145,8 +145,8 @@ QUnit.test( '#addReplyLink', function ( assert ) {
|
|||
fixture = document.getElementById( 'qunit-fixture' );
|
||||
|
||||
for ( i = 0; i < cases.length; i++ ) {
|
||||
utils.overrideMwConfig( cases[ i ].config );
|
||||
utils.overrideParserData( cases[ i ].data );
|
||||
testUtils.overrideMwConfig( cases[ i ].config );
|
||||
testUtils.overrideParserData( cases[ i ].data );
|
||||
|
||||
$( fixture ).empty().append( cases[ i ].expected );
|
||||
expectedHtml = fixture.innerHTML;
|
||||
|
|
|
@ -1,14 +1,14 @@
|
|||
/* global moment */
|
||||
var
|
||||
utils = require( './utils.js' ),
|
||||
testUtils = require( './testUtils.js' ),
|
||||
parser = require( 'ext.discussionTools.init' ).parser;
|
||||
|
||||
QUnit.module( 'mw.dt.parser', utils.newEnvironment() );
|
||||
QUnit.module( 'mw.dt.parser', testUtils.newEnvironment() );
|
||||
|
||||
QUnit.test( '#getTimestampRegexp', function ( assert ) {
|
||||
var i, cases;
|
||||
|
||||
utils.overrideParserData( require( './data-en.json' ) );
|
||||
testUtils.overrideParserData( require( './data-en.json' ) );
|
||||
|
||||
cases = [
|
||||
{
|
||||
|
@ -60,7 +60,7 @@ QUnit.test( '#getTimestampRegexp', function ( assert ) {
|
|||
QUnit.test( '#getTimestampParser', function ( assert ) {
|
||||
var i, cases, expectedDate, tsParser;
|
||||
|
||||
utils.overrideParserData( require( './data-en.json' ) );
|
||||
testUtils.overrideParserData( require( './data-en.json' ) );
|
||||
|
||||
expectedDate = moment( '2011-02-03T04:05:00+00:00' );
|
||||
|
||||
|
@ -95,7 +95,7 @@ QUnit.test( '#getTimestampParser', function ( assert ) {
|
|||
QUnit.test( '#getTimestampParser (at DST change)', function ( assert ) {
|
||||
var i, cases, format, timezone, timezoneAbbrs, regexp, tsParser, date;
|
||||
|
||||
utils.overrideParserData( require( './data-en.json' ) );
|
||||
testUtils.overrideParserData( require( './data-en.json' ) );
|
||||
|
||||
format = 'H:i, j M Y';
|
||||
timezone = 'Europe/Warsaw';
|
||||
|
@ -206,14 +206,14 @@ QUnit.test( '#getComments/#groupThreads', function ( assert ) {
|
|||
|
||||
for ( i = 0; i < cases.length; i++ ) {
|
||||
$( fixture ).empty().append( cases[ i ].dom );
|
||||
utils.overrideMwConfig( cases[ i ].config );
|
||||
utils.overrideParserData( cases[ i ].data );
|
||||
testUtils.overrideMwConfig( cases[ i ].config );
|
||||
testUtils.overrideParserData( cases[ i ].data );
|
||||
|
||||
comments = parser.getComments( fixture );
|
||||
threads = parser.groupThreads( comments );
|
||||
|
||||
for ( j = 0; j < threads.length; j++ ) {
|
||||
utils.serializeComments( threads[ j ], fixture );
|
||||
testUtils.serializeComments( threads[ j ], fixture );
|
||||
|
||||
assert.deepEqual(
|
||||
JSON.parse( JSON.stringify( threads[ j ] ) ),
|
||||
|
@ -251,8 +251,8 @@ QUnit.test( '#getTranscludedFrom', function ( assert ) {
|
|||
|
||||
for ( i = 0; i < cases.length; i++ ) {
|
||||
$( fixture ).empty().append( cases[ i ].dom );
|
||||
utils.overrideMwConfig( cases[ i ].config );
|
||||
utils.overrideParserData( cases[ i ].data );
|
||||
testUtils.overrideMwConfig( cases[ i ].config );
|
||||
testUtils.overrideParserData( cases[ i ].data );
|
||||
|
||||
comments = parser.getComments( fixture );
|
||||
parser.groupThreads( comments );
|
||||
|
|
Loading…
Reference in a new issue