Daniel Werner has uploaded a new change for review.
https://gerrit.wikimedia.org/r/67289
Change subject: Added wb.Site.prototype.getGroup
......................................................................
Added wb.Site.prototype.getGroup
Updates test plus some general overdue cleanup.
Change-Id: Iedfa02a75fd9ce634cb3e46bd42100838033b153
---
M lib/resources/wikibase.Site.js
M lib/tests/qunit/wikibase.Site.tests.js
2 files changed, 41 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/89/67289/1
diff --git a/lib/resources/wikibase.Site.js b/lib/resources/wikibase.Site.js
index ab615ec..4d959b3 100644
--- a/lib/resources/wikibase.Site.js
+++ b/lib/resources/wikibase.Site.js
@@ -8,7 +8,7 @@
* @licence GNU GPL v2+
* @author Daniel Werner
*/
-( function( mw, wb, $, undefined ) {
+( function( mw, wb, $ ) {
'use strict';
/**
@@ -16,7 +16,9 @@
* @constructor
* @since 0.1
*/
-var SELF = wb.Site = function( siteDetails ) {
+var SELF = wb.Site = function WbSite( siteDetails ) {
+ // TODO: Validate site details, throw error if invalid.
+ // TODO: Keep copy of details, no reference.
this._siteDetails = siteDetails;
};
$.extend( SELF.prototype, {
@@ -52,6 +54,17 @@
*/
getGlobalSiteId: function() {
return this._siteDetails.globalSiteId;
+ },
+
+ /**
+ * Returns the group of the site.
+ *
+ * @since 0.4
+ *
+ * @return string
+ */
+ getGroup: function() {
+ return this._siteDetails.group;
},
/**
@@ -123,12 +136,10 @@
dir = 'rtl';
}
} else {
- // TODO: This should probably be logged somehow,
- // because it really shouldn't happen.
+ // TODO: This should probably be logged somehow,
because it really shouldn't happen.
dir = 'auto';
}
- // TODO: use a language object from the Universal Language
Selector
return {
code: languageCode,
dir: dir
diff --git a/lib/tests/qunit/wikibase.Site.tests.js
b/lib/tests/qunit/wikibase.Site.tests.js
index e546b41..ef14f3d 100644
--- a/lib/tests/qunit/wikibase.Site.tests.js
+++ b/lib/tests/qunit/wikibase.Site.tests.js
@@ -18,49 +18,63 @@
this.siteDetails = {
apiUrl: 'http://en.wikipedia.org/w/api.php',
id: 'en',
+ globalSiteId: 'en-global',
name: 'English Wikipedia',
pageUrl: 'http://en.wikipedia.org/wiki/$1',
shortName: 'English',
- languageCode: 'en'
+ languageCode: 'en',
+ group: 'wikipedia'
};
this.string = 'test';
this.site = new wb.Site( this.siteDetails );
},
- teardown: function() {}
+ teardown: function() {
+ delete( this.site );
+ }
} ) );
QUnit.test( 'check init', function( assert ) {
-
- assert.equal(
+ assert.strictEqual(
this.site._siteDetails,
this.siteDetails,
'set site details'
);
- assert.equal(
+ assert.strictEqual(
this.site.getId(),
this.siteDetails.id,
'verified site id'
);
- assert.equal(
+ assert.strictEqual(
+ this.site.getGlobalSiteId(),
+ this.siteDetails.globalSiteId,
+ 'verified global site id'
+ );
+
+ assert.strictEqual(
this.site.getName(),
this.siteDetails.name,
- 'verified site id'
+ 'verified site name'
);
- assert.equal(
+ assert.strictEqual(
this.site.getShortName(),
this.siteDetails.shortName,
- 'verified site id'
+ 'verified short site name'
);
- assert.equal(
+ assert.strictEqual(
this.site.getApi(),
this.siteDetails.apiUrl,
- 'verified site id'
+ 'verified site api'
);
+ assert.strictEqual(
+ this.site.getGroup(),
+ this.siteDetails.group,
+ 'verified site group'
+ );
} );
QUnit.test( 'link handling', function( assert ) {
--
To view, visit https://gerrit.wikimedia.org/r/67289
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedfa02a75fd9ce634cb3e46bd42100838033b153
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Daniel Werner <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
