jenkins-bot has submitted this change and it was merged.
Change subject: Renaming things for consistency: DataProvider -> Provider
......................................................................
Renaming things for consistency: DataProvider -> Provider
Change-Id: Ia1f022baef02b477296c9664e7280c75b1c84515
---
M tests/qunit/provider/mmv.provider.GlobalUsage.test.js
M tests/qunit/provider/mmv.provider.ImageUsage.test.js
2 files changed, 26 insertions(+), 26 deletions(-)
Approvals:
Aarcos: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/qunit/provider/mmv.provider.GlobalUsage.test.js
b/tests/qunit/provider/mmv.provider.GlobalUsage.test.js
index 7a53aca..558e040 100644
--- a/tests/qunit/provider/mmv.provider.GlobalUsage.test.js
+++ b/tests/qunit/provider/mmv.provider.GlobalUsage.test.js
@@ -21,11 +21,11 @@
QUnit.test( 'GlobalUsage constructor sanity check', 2, function (
assert ) {
var api = { get: function() {} },
options = {},
- globalUsageDataProvider = new
mw.mmv.provider.GlobalUsage( api, options ),
- globalUsageDataProviderWithNoOptions = new
mw.mmv.provider.GlobalUsage( api );
+ globalUsageProvider = new mw.mmv.provider.GlobalUsage(
api, options ),
+ globalUsageProviderWithNoOptions = new
mw.mmv.provider.GlobalUsage( api );
- assert.ok( globalUsageDataProvider );
- assert.ok( globalUsageDataProviderWithNoOptions );
+ assert.ok( globalUsageProvider );
+ assert.ok( globalUsageProviderWithNoOptions );
} );
QUnit.asyncTest( 'GlobalUsage get test', 7, function ( assert ) {
@@ -53,9 +53,9 @@
} },
options = {},
file = new mw.Title( 'File:Stuff.jpg' ),
- globalUsageDataProvider = new
mw.mmv.provider.GlobalUsage ( api, options );
+ globalUsageProvider = new mw.mmv.provider.GlobalUsage (
api, options );
- globalUsageDataProvider.get( file ).then( function( fileUsage )
{
+ globalUsageProvider.get( file ).then( function( fileUsage ) {
assert.strictEqual( fileUsage.file, file, 'File is set
correctly' );
assert.strictEqual( fileUsage.scope,
mw.mmv.model.FileUsage.Scope.GLOBAL, 'Scope is set correctly' );
assert.strictEqual( fileUsage.pages[0].wiki,
'en.wikipedia.org', 'Wiki is set correctly' );
@@ -64,7 +64,7 @@
assert.strictEqual( fileUsage.totalCountIsLowerBound,
false, 'Count flag is set correctly' );
} ).then( function() {
// call the data provider a second time to check caching
- return globalUsageDataProvider.get( file );
+ return globalUsageProvider.get( file );
} ).then( function() {
assert.strictEqual( apiCallCount, 1 );
QUnit.start();
@@ -99,9 +99,9 @@
} },
options = {},
file = new mw.Title( 'File:Stuff.jpg' ),
- globalUsageDataProvider = new mw.mmv.provider.GlobalUsage( api,
options );
+ globalUsageProvider = new mw.mmv.provider.GlobalUsage( api,
options );
- globalUsageDataProvider.get( file ).then( function( fileUsage )
{
+ globalUsageProvider.get( file ).then( function( fileUsage ) {
assert.strictEqual( fileUsage.totalCountIsLowerBound,
true, 'Count flag is set correctly' );
QUnit.start();
} );
@@ -124,9 +124,9 @@
} },
options = {},
file = new mw.Title( 'File:Stuff.jpg' ),
- globalUsageDataProvider = new
mw.mmv.provider.GlobalUsage( api, options );
+ globalUsageProvider = new mw.mmv.provider.GlobalUsage(
api, options );
- globalUsageDataProvider.get( file ).then( function( fileUsage )
{
+ globalUsageProvider.get( file ).then( function( fileUsage ) {
assert.strictEqual( fileUsage.totalCount, 0, 'Count
flag is set correctly' );
QUnit.start();
} );
@@ -143,9 +143,9 @@
} },
options = {},
file = new mw.Title( 'File:Stuff.jpg' ),
- globalUsageDataProvider = new
mw.mmv.provider.GlobalUsage( api, options );
+ globalUsageProvider = new mw.mmv.provider.GlobalUsage(
api, options );
- globalUsageDataProvider.get( file ).fail( function(
errorMessage ) {
+ globalUsageProvider.get( file ).fail( function( errorMessage ) {
assert.strictEqual(
errorMessage,
'unknown_action: Unrecognized value for
parameter \'action\': querry',
@@ -159,9 +159,9 @@
var api = {},
options = { doNotUseApi: true },
file = new mw.Title( 'File:Stuff.jpg' ),
- globalUsageDataProvider = new
mw.mmv.provider.GlobalUsage( api, options );
+ globalUsageProvider = new mw.mmv.provider.GlobalUsage(
api, options );
- globalUsageDataProvider.get( file ).done( function( fileUsage )
{
+ globalUsageProvider.get( file ).done( function( fileUsage ) {
assert.strictEqual( fileUsage.pages.length, 0, 'Does
not return any pages' );
assert.ok( fileUsage.fake );
QUnit.start();
diff --git a/tests/qunit/provider/mmv.provider.ImageUsage.test.js
b/tests/qunit/provider/mmv.provider.ImageUsage.test.js
index 4e0a84c..21552da 100644
--- a/tests/qunit/provider/mmv.provider.ImageUsage.test.js
+++ b/tests/qunit/provider/mmv.provider.ImageUsage.test.js
@@ -21,11 +21,11 @@
QUnit.test( 'ImageUsage constructor sanity check', 2, function ( assert
) {
var api = { get: function() {} },
options = {},
- imageUsageDataProvider = new
mw.mmv.provider.ImageUsage( api, options ),
- imageUsageDataProviderWithNoOptions = new
mw.mmv.provider.ImageUsage( api );
+ imageUsageProvider = new mw.mmv.provider.ImageUsage(
api, options ),
+ imageUsageProviderWithNoOptions = new
mw.mmv.provider.ImageUsage( api );
- assert.ok( imageUsageDataProvider );
- assert.ok( imageUsageDataProviderWithNoOptions );
+ assert.ok( imageUsageProvider );
+ assert.ok( imageUsageProviderWithNoOptions );
} );
QUnit.asyncTest( 'ImageUsage get test', 7, function ( assert ) {
@@ -45,9 +45,9 @@
} },
options = {},
file = new mw.Title( 'File:Albert Einsteing Head.jpg' ),
- imageUsageDataProvider = new
mw.mmv.provider.ImageUsage( api, options );
+ imageUsageProvider = new mw.mmv.provider.ImageUsage(
api, options );
- imageUsageDataProvider.get( file ).then( function( fileUsage ) {
+ imageUsageProvider.get( file ).then( function( fileUsage ) {
assert.strictEqual( fileUsage.file, file, 'File is set
correctly' );
assert.strictEqual( fileUsage.scope,
mw.mmv.model.FileUsage.Scope.LOCAL, 'Scope is set correctly' );
assert.strictEqual( fileUsage.pages[0].wiki, null,
'Wiki is not set' );
@@ -56,7 +56,7 @@
assert.strictEqual( fileUsage.totalCountIsLowerBound,
false, 'Count flag is set correctly' );
} ).then( function() {
// call the data provider a second time to check caching
- return imageUsageDataProvider.get( file );
+ return imageUsageProvider.get( file );
} ).then( function() {
assert.strictEqual( apiCallCount, 1 );
QUnit.start();
@@ -83,9 +83,9 @@
} },
options = {},
file = new mw.Title( 'File:Albert Einsteing Head.jpg' ),
- imageUsageDataProvider = new
mw.mmv.provider.ImageUsage( api, options );
+ imageUsageProvider = new mw.mmv.provider.ImageUsage(
api, options );
- imageUsageDataProvider.get( file ).then( function( fileUsage ) {
+ imageUsageProvider.get( file ).then( function( fileUsage ) {
assert.strictEqual( fileUsage.totalCountIsLowerBound,
true, 'Count flag is set correctly' );
QUnit.start();
} );
@@ -102,9 +102,9 @@
} },
options = {},
file = new mw.Title( 'File:Albert Einsteing Head.jpg' ),
- imageUsageDataProvider = new
mw.mmv.provider.ImageUsage( api, options );
+ imageUsageProvider = new mw.mmv.provider.ImageUsage(
api, options );
- imageUsageDataProvider.get( file ).fail( function( errorMessage
) {
+ imageUsageProvider.get( file ).fail( function( errorMessage ) {
assert.strictEqual(
errorMessage,
'iumissingparam: One of the parameters iutitle,
iupageid is required',
--
To view, visit https://gerrit.wikimedia.org/r/111150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia1f022baef02b477296c9664e7280c75b1c84515
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <[email protected]>
Gerrit-Reviewer: Aarcos <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
