Thiemo Mättig (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/370324 )
Change subject: Update QUnit tests to use assert.expect() instead
......................................................................
Update QUnit tests to use assert.expect() instead
This is a baseline to make all our tests more compatible with future
QUnit versions.
I'm removing all numbers that are super trivial. For example, if there
is only one assertion, the test will create a warning anyway if this
assertion is not executed.
Bug: T170515
Change-Id: Ie59c73f2c3e6687803f8619ca8868869bf903208
---
M lib/tests/qunit/wikibase.sites.tests.js
M lib/tests/qunit/wikibase.tests.js
M view/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
M view/tests/qunit/jquery/ui/jquery.ui.closeable.tests.js
M view/tests/qunit/jquery/ui/jquery.ui.tagadata.tests.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.aliasesview.tests.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.badgeselector.tests.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.descriptionview.tests.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.entityselector.tests.js
M
view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.pagesuggester.tests.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinkgroupview.tests.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinklistview.tests.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinkview.tests.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.snaklistview.tests.js
M view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
M
view/tests/qunit/jquery/wikibase/toolbar/jquery.wikibase.toolbarbutton.tests.js
M view/tests/qunit/wikibase/store/store.CachingEntityStore.tests.js
M view/tests/qunit/wikibase/store/store.CombiningEntityStore.tests.js
M view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
21 files changed, 52 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/24/370324/1
diff --git a/lib/tests/qunit/wikibase.sites.tests.js
b/lib/tests/qunit/wikibase.sites.tests.js
index 08bb363..a907028 100644
--- a/lib/tests/qunit/wikibase.sites.tests.js
+++ b/lib/tests/qunit/wikibase.sites.tests.js
@@ -53,7 +53,7 @@
}
} ) );
- QUnit.test( 'basic', 1, function ( assert ) {
+ QUnit.test( 'basic', function ( assert ) {
assert.ok(
wb.sites instanceof Object,
'initiated wikibase object'
@@ -118,7 +118,7 @@
} );
} );
- QUnit.test( 'wikibase.sites.getSite()', 2, function ( assert ) {
+ QUnit.test( 'wikibase.sites.getSite()', function ( assert ) {
assert.ok(
wb.sites.getSite( 'nnwiki' ) instanceof Site,
'trying to get a known site by its ID returns a site
object'
@@ -131,7 +131,7 @@
);
} );
- QUnit.test( 'wikibase.sites.hasSite()', 2, function ( assert ) {
+ QUnit.test( 'wikibase.sites.hasSite()', function ( assert ) {
assert.strictEqual(
wb.sites.hasSite( 'nnwiki' ),
true,
@@ -145,7 +145,7 @@
);
} );
- QUnit.test( 'wikibase.sites.getSiteGroups()', 2 +
TEST_SITE_GROUPS.length, function ( assert ) {
+ QUnit.test( 'wikibase.sites.getSiteGroups()', function ( assert ) {
assert.expect( 4 );
var siteGroups = wb.sites.getSiteGroups();
diff --git a/lib/tests/qunit/wikibase.tests.js
b/lib/tests/qunit/wikibase.tests.js
index 919ecd6..e0019af 100644
--- a/lib/tests/qunit/wikibase.tests.js
+++ b/lib/tests/qunit/wikibase.tests.js
@@ -18,7 +18,7 @@
QUnit.module( 'wikibase' );
- QUnit.test( 'basic', 1, function ( assert ) {
+ QUnit.test( 'basic', function ( assert ) {
assert.ok(
wb instanceof Object,
'initiated wikibase object'
diff --git a/view/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
b/view/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
index 78c28ae..fc175e7 100644
--- a/view/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
+++ b/view/tests/qunit/jquery/jquery.util.EventSingletonManager.tests.js
@@ -7,7 +7,8 @@
QUnit.module( 'jquery.util.EventSingletonManager' );
- QUnit.test( 'register() & unregister() (single source)', 2, function (
assert ) {
+ QUnit.test( 'register() & unregister() (single source)', function (
assert ) {
+ assert.expect( 2 );
var manager = new $.util.EventSingletonManager(),
$source = $( '<div/>' ),
$target = $( '<div/>' ),
@@ -38,7 +39,8 @@
$target.trigger( event );
} );
- QUnit.test( 'register() & unregister() (multiple sources)', 4, function
( assert ) {
+ QUnit.test( 'register() & unregister() (multiple sources)', function (
assert ) {
+ assert.expect( 4 );
var manager = new $.util.EventSingletonManager(),
$sources = $( '<div/><div/>' ),
sources = $sources.map( function () { return this; } ),
@@ -83,7 +85,8 @@
manager.unregister( $sources.get( 0 ), $target.get( 0 ),
'.namespace' );
} );
- QUnit.test( 'unregister() & unregister() (multiple events)', 8,
function ( assert ) {
+ QUnit.test( 'unregister() & unregister() (multiple events)', function (
assert ) {
+ assert.expect( 8 );
var manager = new $.util.EventSingletonManager(),
$source = $( '<div/>' ),
$target = $( '<div/>' ),
diff --git a/view/tests/qunit/jquery/ui/jquery.ui.closeable.tests.js
b/view/tests/qunit/jquery/ui/jquery.ui.closeable.tests.js
index f240c50..f3a8d1d 100644
--- a/view/tests/qunit/jquery/ui/jquery.ui.closeable.tests.js
+++ b/view/tests/qunit/jquery/ui/jquery.ui.closeable.tests.js
@@ -69,7 +69,8 @@
);
} );
- QUnit.test( 'setContent()', 7, function ( assert ) {
+ QUnit.test( 'setContent()', function ( assert ) {
+ assert.expect( 7 );
var $closeable = createCloseable(),
closeable = $closeable.data( 'closeable' ),
$content = $( '<span>test</span>' );
diff --git a/view/tests/qunit/jquery/ui/jquery.ui.tagadata.tests.js
b/view/tests/qunit/jquery/ui/jquery.ui.tagadata.tests.js
index 5a594a0..fa0c531 100644
--- a/view/tests/qunit/jquery/ui/jquery.ui.tagadata.tests.js
+++ b/view/tests/qunit/jquery/ui/jquery.ui.tagadata.tests.js
@@ -120,7 +120,7 @@
);
} );
- QUnit.test( 'removeAll()', 1, function ( assert ) {
+ QUnit.test( 'removeAll()', function ( assert ) {
var $tagadata = createTagadata(),
tagadata = $tagadata.data( 'tagadata' ),
i = tagadata.getTags().length;
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.aliasesview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.aliasesview.tests.js
index 0441199..a744cb3 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.aliasesview.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.aliasesview.tests.js
@@ -92,7 +92,8 @@
} );
} );
- QUnit.test( 'startEditing() & stopEditing()', 6, function ( assert ) {
+ QUnit.test( 'startEditing() & stopEditing()', function ( assert ) {
+ assert.expect( 6 );
var $aliasesview = createAliasesview(),
aliasesview = $aliasesview.data( 'aliasesview' );
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.badgeselector.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.badgeselector.tests.js
index 4169aaa..9950563 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.badgeselector.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.badgeselector.tests.js
@@ -61,7 +61,8 @@
);
} );
- QUnit.test( 'startEditing() & stopEditing()', 2, function ( assert ) {
+ QUnit.test( 'startEditing() & stopEditing()', function ( assert ) {
+ assert.expect( 2 );
var $badgeselector = createBadgeselector(),
badgeselector = $badgeselector.data( 'badgeselector' );
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.descriptionview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.descriptionview.tests.js
index 1508f3f..87ccaf2 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.descriptionview.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.descriptionview.tests.js
@@ -64,7 +64,8 @@
);
} );
- QUnit.test( 'startEditing() & stopEditing()', 5, function ( assert ) {
+ QUnit.test( 'startEditing() & stopEditing()', function ( assert ) {
+ assert.expect( 5 );
var $descriptionview = createDescriptionview(),
descriptionview = $descriptionview.data(
'descriptionview' );
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.entityselector.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.entityselector.tests.js
index 173abcd..909b4bb 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.entityselector.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.entityselector.tests.js
@@ -61,7 +61,8 @@
);
} );
- QUnit.test( 'Implicitly select entity by matching label /
selectedEntity()', 2, function ( assert ) {
+ QUnit.test( 'Implicitly select entity by matching label /
selectedEntity()', function ( assert ) {
+ assert.expect( 2 );
var $entitySelector = newTestEntitySelector(),
entitySelector = $entitySelector.data( 'entityselector'
);
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js
index 70a0741..79e528b 100644
---
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js
+++
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.entitytermsforlanguageview.tests.js
@@ -71,7 +71,8 @@
);
} );
- QUnit.test( 'startEditing() & stopEditing()', 6, function ( assert ) {
+ QUnit.test( 'startEditing() & stopEditing()', function ( assert ) {
+ assert.expect( 6 );
var $entitytermsforlanguageview =
createEntitytermsforlanguageview(),
entitytermsforlanguageview
= $entitytermsforlanguageview.data(
'entitytermsforlanguageview' );
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js
index 0a09e60..4f28338 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.labelview.tests.js
@@ -64,7 +64,8 @@
);
} );
- QUnit.test( 'startEditing() & stopEditing()', 5, function ( assert ) {
+ QUnit.test( 'startEditing() & stopEditing()', function ( assert ) {
+ assert.expect( 5 );
var $labelview = createLabelview(),
labelview = $labelview.data( 'labelview' );
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.pagesuggester.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.pagesuggester.tests.js
index 24758dd..e4f7511 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.pagesuggester.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.pagesuggester.tests.js
@@ -39,7 +39,7 @@
);
} );
- QUnit.test( 'Try searching for suggestions without a site', 1, function
( assert ) {
+ QUnit.test( 'Try searching for suggestions without a site', function (
assert ) {
var $pageSuggester = newTestPageSuggester(),
pageSuggester = $pageSuggester.data( 'pagesuggester' );
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinkgroupview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinkgroupview.tests.js
index c2e994b..2ab9483 100644
---
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinkgroupview.tests.js
+++
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinkgroupview.tests.js
@@ -123,7 +123,8 @@
);
} );
- QUnit.test( 'startEditing() & stopEditing()', 3, function ( assert ) {
+ QUnit.test( 'startEditing() & stopEditing()', function ( assert ) {
+ assert.expect( 3 );
var $sitelinkgroupview = createSitelinkgroupview( {
groupName: 'group1',
value: new wb.datamodel.SiteLinkSet( [ new
wb.datamodel.SiteLink( 'enwiki', 'enwiki-page' ) ] )
@@ -222,7 +223,7 @@
$queue.dequeue( 'tests' );
} );
- QUnit.test( 'setError()', 1, function ( assert ) {
+ QUnit.test( 'setError()', function ( assert ) {
var $sitelinkgroupview = createSitelinkgroupview( {
groupName: 'group1',
value: new wb.datamodel.SiteLinkSet( [] )
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinklistview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinklistview.tests.js
index 7567b7b..0ac9f0d 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinklistview.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinklistview.tests.js
@@ -184,7 +184,8 @@
);
} );
- QUnit.test( 'startEditing() & stopEditing()', 4, function ( assert ) {
+ QUnit.test( 'startEditing() & stopEditing()', function ( assert ) {
+ assert.expect( 4 );
var $sitelinklistview = createSitelinklistview( {
value: [ new wb.datamodel.SiteLink( 'enwiki',
'enwiki-page' ) ]
} ),
@@ -291,7 +292,7 @@
$queue.dequeue( 'tests' );
} );
- QUnit.test( 'setError()', 1, function ( assert ) {
+ QUnit.test( 'setError()', function ( assert ) {
var $sitelinklistview = createSitelinklistview(),
sitelinklistview = $sitelinklistview.data(
'sitelinklistview' );
@@ -335,7 +336,7 @@
);
} );
- QUnit.test( 'enterNewItem()', 1, function ( assert ) {
+ QUnit.test( 'enterNewItem()', function ( assert ) {
var $sitelinklistview = createSitelinklistview(),
sitelinklistview = $sitelinklistview.data(
'sitelinklistview' );
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinkview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinkview.tests.js
index df71e88..63f11cd 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinkview.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.sitelinkview.tests.js
@@ -113,7 +113,8 @@
);
} );
- QUnit.test( 'startEditing() & stopEditing()', 4, function ( assert ) {
+ QUnit.test( 'startEditing() & stopEditing()', function ( assert ) {
+ assert.expect( 4 );
var $sitelinkview = createSitelinkview(),
sitelinkview = $sitelinkview.data( 'sitelinkview' );
@@ -151,7 +152,8 @@
sitelinkview.stopEditing();
} );
- QUnit.test( 'startEditing(), stopEditing() with initial value', 5,
function ( assert ) {
+ QUnit.test( 'startEditing(), stopEditing() with initial value',
function ( assert ) {
+ assert.expect( 5 );
var siteLink = new wikibase.datamodel.SiteLink( 'enwiki', 'Main
Page' ),
$sitelinkview = createSitelinkview( {
value: siteLink
@@ -271,7 +273,7 @@
);
} );
- QUnit.test( 'setError()', 1, function ( assert ) {
+ QUnit.test( 'setError()', function ( assert ) {
var $sitelinkview = createSitelinkview(),
sitelinkview = $sitelinkview.data( 'sitelinkview' );
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.snaklistview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.snaklistview.tests.js
index ba2f051..3deaefa 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.snaklistview.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.snaklistview.tests.js
@@ -231,7 +231,8 @@
);
} );
- QUnit.test( 'Basic start and stop editing', 5, function ( assert ) {
+ QUnit.test( 'Basic start and stop editing', function ( assert ) {
+ assert.expect( 5 );
var $node = createSnaklistview(),
snaklistview = $node.data( 'snaklistview' );
@@ -286,7 +287,8 @@
snaklistview.stopEditing();
} );
- QUnit.test( 'Basic start and stop editing of filled snaklistview', 5,
function ( assert ) {
+ QUnit.test( 'Basic start and stop editing of filled snaklistview',
function ( assert ) {
+ assert.expect( 5 );
var $node = createSnaklistview( snakLists[ 0 ] ),
snaklistview = $node.data( 'snaklistview' );
diff --git
a/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
b/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
index e650995..8111447 100644
--- a/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
+++ b/view/tests/qunit/jquery/wikibase/jquery.wikibase.statementview.tests.js
@@ -169,7 +169,7 @@
} );
} );
- QUnit.test( 'Using the generic tooltip for new claims', 1, function (
assert ) {
+ QUnit.test( 'Using the generic tooltip for new claims', function (
assert ) {
var $statementview = createStatementview(),
statementview = $statementview.data( 'statementview' );
@@ -180,7 +180,7 @@
} );
} );
- QUnit.test( 'Using tooltip specific for existing claims', 1, function (
assert ) {
+ QUnit.test( 'Using tooltip specific for existing claims', function (
assert ) {
var $statementview = createStatementview( {
value: new wb.datamodel.Statement( new
wb.datamodel.Claim(
new wb.datamodel.PropertyNoValueSnak( 'P1', new
dv.StringValue( 'g' ) )
diff --git
a/view/tests/qunit/jquery/wikibase/toolbar/jquery.wikibase.toolbarbutton.tests.js
b/view/tests/qunit/jquery/wikibase/toolbar/jquery.wikibase.toolbarbutton.tests.js
index 76042f1..e47332a 100644
---
a/view/tests/qunit/jquery/wikibase/toolbar/jquery.wikibase.toolbarbutton.tests.js
+++
b/view/tests/qunit/jquery/wikibase/toolbar/jquery.wikibase.toolbarbutton.tests.js
@@ -48,7 +48,7 @@
);
} );
- QUnit.test( 'action event', 1, function ( assert ) {
+ QUnit.test( 'action event', function ( assert ) {
var $button = createTestButton(),
button = $button.data( 'toolbarbutton' );
diff --git a/view/tests/qunit/wikibase/store/store.CachingEntityStore.tests.js
b/view/tests/qunit/wikibase/store/store.CachingEntityStore.tests.js
index 90a50c5..66c3fb7 100644
--- a/view/tests/qunit/wikibase/store/store.CachingEntityStore.tests.js
+++ b/view/tests/qunit/wikibase/store/store.CachingEntityStore.tests.js
@@ -25,7 +25,8 @@
assert.ok( promise.done, 'done() method exists.' );
} );
- QUnit.test( 'upstream store is called', 2, function ( assert ) {
+ QUnit.test( 'upstream store is called', function ( assert ) {
+ assert.expect( 2 );
var store = new wb.store.EntityStore();
store.get = sinon.spy( function ( entityId ) {
return $.Deferred().resolve();
@@ -42,7 +43,7 @@
} );
} );
- QUnit.test( 'upstream store is called once', 1, function ( assert ) {
+ QUnit.test( 'upstream store is called once', function ( assert ) {
var store = new wb.store.EntityStore();
store.get = sinon.spy( function ( entityId ) {
return $.Deferred().resolve();
@@ -62,7 +63,7 @@
} );
} );
- QUnit.test( 'upstream store is called once for parallel calls', 1,
function ( assert ) {
+ QUnit.test( 'upstream store is called once for parallel calls',
function ( assert ) {
var store = new wb.store.EntityStore();
store.get = sinon.spy( function ( entityId ) {
var deferred = $.Deferred();
diff --git
a/view/tests/qunit/wikibase/store/store.CombiningEntityStore.tests.js
b/view/tests/qunit/wikibase/store/store.CombiningEntityStore.tests.js
index 3a8af06..002b83f 100644
--- a/view/tests/qunit/wikibase/store/store.CombiningEntityStore.tests.js
+++ b/view/tests/qunit/wikibase/store/store.CombiningEntityStore.tests.js
@@ -23,8 +23,8 @@
QUnit.test(
'Promise is resolved asynchronously, even if the entity is
cached',
- 2,
function ( assert ) {
+ assert.expect( 2 );
var store = new wb.store.EntityStore();
store.get = function ( entityId ) {
return $.Deferred().resolve();
diff --git a/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
b/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
index c9daa4c..4ad7ca6 100644
--- a/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
+++ b/view/tests/qunit/wikibase/wikibase.getLanguageNameByCode.tests.js
@@ -8,7 +8,7 @@
QUnit.module( 'wikibase.getLanguageNameByCode' );
- QUnit.test( 'wikibase.getLanguageNameByCode()', 2, function ( assert ) {
+ QUnit.test( 'wikibase.getLanguageNameByCode()', function ( assert ) {
// TODO: Don't assume global state, control what languages are
available for this test!
// Better might be to turn this into a LanguageNameLookup
service and set language
// name in getEntityTermsView in ViewFactory. Then, all places
that need language name
--
To view, visit https://gerrit.wikimedia.org/r/370324
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie59c73f2c3e6687803f8619ca8868869bf903208
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) <thiemo.maet...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
