Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172697
Change subject: Move wikibase.utilities from lib to repo
......................................................................
Move wikibase.utilities from lib to repo
This is currently only used by jquery.wikibase.*, which will soon be moved to
repo, too.
Change-Id: Ibc9f7d56e07ed5016fc63712f052684247fe36fb
---
M lib/resources/Resources.php
M lib/tests/qunit/resources.php
M repo/resources/Resources.php
R repo/resources/utilities/resources.php
R repo/resources/utilities/wikibase.utilities.ClaimGuidGenerator.js
R repo/resources/utilities/wikibase.utilities.GuidGenerator.js
R repo/resources/utilities/wikibase.utilities.js
R repo/resources/utilities/wikibase.utilities.ui.css
R repo/resources/utilities/wikibase.utilities.ui.js
M repo/tests/qunit/resources.php
R repo/tests/qunit/utilities/ClaimGuidGenerator.tests.js
R repo/tests/qunit/utilities/GuidGenerator.tests.js
A repo/tests/qunit/utilities/resources.php
13 files changed, 47 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/97/172697/1
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 7846e87..458cfa8 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -174,8 +174,7 @@
include( __DIR__ . '/jquery.wikibase/resources.php' ),
include( __DIR__ . '/parsers/resources.php' ),
include( __DIR__ . '/wikibase.RepoApi/resources.php' ),
- include( __DIR__ . '/wikibase.store/resources.php' ),
- include( __DIR__ . '/wikibase.utilities/resources.php' )
+ include( __DIR__ . '/wikibase.store/resources.php' )
);
if ( defined( 'ULS_VERSION' ) ) {
diff --git a/lib/tests/qunit/resources.php b/lib/tests/qunit/resources.php
index 1fda429..e5e524b 100644
--- a/lib/tests/qunit/resources.php
+++ b/lib/tests/qunit/resources.php
@@ -117,24 +117,6 @@
),
),
- 'wikibase.utilities.ClaimGuidGenerator.tests' => $moduleBase +
array(
- 'scripts' => array(
-
'wikibase.utilities/wikibase.utilities.ClaimGuidGenerator.tests.js',
- ),
- 'dependencies' => array(
- 'wikibase.utilities.ClaimGuidGenerator',
- ),
- ),
-
- 'wikibase.utilities.GuidGenerator.tests' => $moduleBase + array(
- 'scripts' => array(
-
'wikibase.utilities/wikibase.utilities.GuidGenerator.tests.js',
- ),
- 'dependencies' => array(
- 'wikibase.utilities.GuidGenerator',
- ),
- ),
-
'wikibase.Site.tests' => $moduleBase + array(
'scripts' => array(
'wikibase.Site.tests.js',
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index 2fc36a9..17476de 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -181,6 +181,9 @@
$modules['wikibase.special.entitiesWithout']['dependencies'][]
= 'ext.uls.mediawiki';
}
- return $modules;
+ return array_merge(
+ $modules,
+ include( __DIR__ . '/utilities/resources.php' )
+ );
} );
// @codeCoverageIgnoreEnd
diff --git a/lib/resources/wikibase.utilities/resources.php
b/repo/resources/utilities/resources.php
similarity index 100%
rename from lib/resources/wikibase.utilities/resources.php
rename to repo/resources/utilities/resources.php
diff --git
a/lib/resources/wikibase.utilities/wikibase.utilities.ClaimGuidGenerator.js
b/repo/resources/utilities/wikibase.utilities.ClaimGuidGenerator.js
similarity index 100%
rename from
lib/resources/wikibase.utilities/wikibase.utilities.ClaimGuidGenerator.js
rename to repo/resources/utilities/wikibase.utilities.ClaimGuidGenerator.js
diff --git
a/lib/resources/wikibase.utilities/wikibase.utilities.GuidGenerator.js
b/repo/resources/utilities/wikibase.utilities.GuidGenerator.js
similarity index 100%
rename from lib/resources/wikibase.utilities/wikibase.utilities.GuidGenerator.js
rename to repo/resources/utilities/wikibase.utilities.GuidGenerator.js
diff --git a/lib/resources/wikibase.utilities/wikibase.utilities.js
b/repo/resources/utilities/wikibase.utilities.js
similarity index 100%
rename from lib/resources/wikibase.utilities/wikibase.utilities.js
rename to repo/resources/utilities/wikibase.utilities.js
diff --git a/lib/resources/wikibase.utilities/wikibase.utilities.ui.css
b/repo/resources/utilities/wikibase.utilities.ui.css
similarity index 100%
rename from lib/resources/wikibase.utilities/wikibase.utilities.ui.css
rename to repo/resources/utilities/wikibase.utilities.ui.css
diff --git a/lib/resources/wikibase.utilities/wikibase.utilities.ui.js
b/repo/resources/utilities/wikibase.utilities.ui.js
similarity index 100%
rename from lib/resources/wikibase.utilities/wikibase.utilities.ui.js
rename to repo/resources/utilities/wikibase.utilities.ui.js
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index fe38f43..52356f7 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -26,6 +26,9 @@
),
);
- return $modules;
+ return array_merge(
+ $modules,
+ include __DIR__ . '/utilities/resources.php'
+ );
} );
diff --git
a/lib/tests/qunit/wikibase.utilities/wikibase.utilities.ClaimGuidGenerator.tests.js
b/repo/tests/qunit/utilities/ClaimGuidGenerator.tests.js
similarity index 100%
rename from
lib/tests/qunit/wikibase.utilities/wikibase.utilities.ClaimGuidGenerator.tests.js
rename to repo/tests/qunit/utilities/ClaimGuidGenerator.tests.js
diff --git
a/lib/tests/qunit/wikibase.utilities/wikibase.utilities.GuidGenerator.tests.js
b/repo/tests/qunit/utilities/GuidGenerator.tests.js
similarity index 100%
rename from
lib/tests/qunit/wikibase.utilities/wikibase.utilities.GuidGenerator.tests.js
rename to repo/tests/qunit/utilities/GuidGenerator.tests.js
diff --git a/repo/tests/qunit/utilities/resources.php
b/repo/tests/qunit/utilities/resources.php
new file mode 100644
index 0000000..ab8a330
--- /dev/null
+++ b/repo/tests/qunit/utilities/resources.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+ * @license GNU GPL v2+
+ * @author H. Snater < [email protected] >
+ */
+return call_user_func( function() {
+ $remoteExtPathParts = explode(
+ DIRECTORY_SEPARATOR . 'extensions' . DIRECTORY_SEPARATOR,
__DIR__, 2
+ );
+ $moduleBase = array(
+ 'localBasePath' => __DIR__,
+ 'remoteExtPath' => $remoteExtPathParts[1],
+ );
+
+ $modules = array(
+
+ 'wikibase.utilities.ClaimGuidGenerator.tests' => $moduleBase +
array(
+ 'scripts' => array(
+ 'ClaimGuidGenerator.tests.js',
+ ),
+ 'dependencies' => array(
+ 'wikibase.utilities.ClaimGuidGenerator',
+ ),
+ ),
+
+ 'wikibase.utilities.GuidGenerator.tests' => $moduleBase + array(
+ 'scripts' => array(
+ 'GuidGenerator.tests.js',
+ ),
+ 'dependencies' => array(
+ 'wikibase.utilities.GuidGenerator',
+ ),
+ ),
+ );
+
+ return $modules;
+} );
--
To view, visit https://gerrit.wikimedia.org/r/172697
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibc9f7d56e07ed5016fc63712f052684247fe36fb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
