Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/172959
Change subject: Move store from lib to repo
......................................................................
Move store from lib to repo
It's only used by repo and jquery.wikibase tests, which will be moved to repo.
Change-Id: I770ae34e62feab42b047ee12bdd372045cf464d8
---
M lib/resources/Resources.php
M lib/tests/qunit/resources.php
M repo/resources/Resources.php
R repo/resources/store/resources.php
R repo/resources/store/store.ApiEntityStore.js
R repo/resources/store/store.CombiningEntityStore.js
R repo/resources/store/store.EntityStore.js
R repo/resources/store/store.FetchedContent.js
R repo/resources/store/store.FetchedContentUnserializer.js
R repo/resources/store/store.MwConfigEntityStore.js
R repo/resources/store/store.js
M repo/tests/qunit/resources.php
A repo/tests/qunit/store/resources.php
R repo/tests/qunit/store/store.CombiningEntityStore.tests.js
R repo/tests/qunit/store/store.MwConfigEntityStore.tests.js
15 files changed, 46 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/59/172959/1
diff --git a/lib/resources/Resources.php b/lib/resources/Resources.php
index 4198b19..72d8d32 100644
--- a/lib/resources/Resources.php
+++ b/lib/resources/Resources.php
@@ -154,8 +154,7 @@
include( __DIR__ . '/formatters/resources.php' ),
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.RepoApi/resources.php' )
);
if ( defined( 'ULS_VERSION' ) ) {
diff --git a/lib/tests/qunit/resources.php b/lib/tests/qunit/resources.php
index 4bea8bb..8d6662d 100644
--- a/lib/tests/qunit/resources.php
+++ b/lib/tests/qunit/resources.php
@@ -98,25 +98,6 @@
),
),
- 'wikibase.store.CombiningEntityStore.tests' => $moduleBase +
array(
- 'scripts' => array(
-
'wikibase.store/store.CombiningEntityStore.tests.js',
- ),
- 'dependencies' => array(
- 'wikibase.store.CombiningEntityStore',
- 'wikibase.store.EntityStore',
- ),
- ),
-
- 'wikibase.store.MwConfigEntityStore.tests' => $moduleBase +
array(
- 'scripts' => array(
-
'wikibase.store/store.MwConfigEntityStore.tests.js',
- ),
- 'dependencies' => array(
- 'wikibase.store.MwConfigEntityStore',
- ),
- ),
-
'wikibase.Site.tests' => $moduleBase + array(
'scripts' => array(
'wikibase.Site.tests.js',
diff --git a/repo/resources/Resources.php b/repo/resources/Resources.php
index 216926b..7895024 100644
--- a/repo/resources/Resources.php
+++ b/repo/resources/Resources.php
@@ -203,6 +203,7 @@
return array_merge(
$modules,
include( __DIR__ . '/entityChangers/resources.php' ),
+ include( __DIR__ . '/store/resources.php' ),
include( __DIR__ . '/utilities/resources.php' )
);
} );
diff --git a/lib/resources/wikibase.store/resources.php
b/repo/resources/store/resources.php
similarity index 100%
rename from lib/resources/wikibase.store/resources.php
rename to repo/resources/store/resources.php
diff --git a/lib/resources/wikibase.store/store.ApiEntityStore.js
b/repo/resources/store/store.ApiEntityStore.js
similarity index 100%
rename from lib/resources/wikibase.store/store.ApiEntityStore.js
rename to repo/resources/store/store.ApiEntityStore.js
diff --git a/lib/resources/wikibase.store/store.CombiningEntityStore.js
b/repo/resources/store/store.CombiningEntityStore.js
similarity index 100%
rename from lib/resources/wikibase.store/store.CombiningEntityStore.js
rename to repo/resources/store/store.CombiningEntityStore.js
diff --git a/lib/resources/wikibase.store/store.EntityStore.js
b/repo/resources/store/store.EntityStore.js
similarity index 100%
rename from lib/resources/wikibase.store/store.EntityStore.js
rename to repo/resources/store/store.EntityStore.js
diff --git a/lib/resources/wikibase.store/store.FetchedContent.js
b/repo/resources/store/store.FetchedContent.js
similarity index 100%
rename from lib/resources/wikibase.store/store.FetchedContent.js
rename to repo/resources/store/store.FetchedContent.js
diff --git a/lib/resources/wikibase.store/store.FetchedContentUnserializer.js
b/repo/resources/store/store.FetchedContentUnserializer.js
similarity index 100%
rename from lib/resources/wikibase.store/store.FetchedContentUnserializer.js
rename to repo/resources/store/store.FetchedContentUnserializer.js
diff --git a/lib/resources/wikibase.store/store.MwConfigEntityStore.js
b/repo/resources/store/store.MwConfigEntityStore.js
similarity index 100%
rename from lib/resources/wikibase.store/store.MwConfigEntityStore.js
rename to repo/resources/store/store.MwConfigEntityStore.js
diff --git a/lib/resources/wikibase.store/store.js
b/repo/resources/store/store.js
similarity index 100%
rename from lib/resources/wikibase.store/store.js
rename to repo/resources/store/store.js
diff --git a/repo/tests/qunit/resources.php b/repo/tests/qunit/resources.php
index 0d2502d..f7c81a0 100644
--- a/repo/tests/qunit/resources.php
+++ b/repo/tests/qunit/resources.php
@@ -51,6 +51,7 @@
return array_merge(
$modules,
include( __DIR__ . '/entityChangers/resources.php' ),
+ include __DIR__ . '/store/resources.php',
include __DIR__ . '/utilities/resources.php'
);
diff --git a/repo/tests/qunit/store/resources.php
b/repo/tests/qunit/store/resources.php
new file mode 100644
index 0000000..ff0cb0e
--- /dev/null
+++ b/repo/tests/qunit/store/resources.php
@@ -0,0 +1,43 @@
+<?php
+
+/**
+ * @licence GNU GPL v2+
+ * @author H. Snater < [email protected] >
+ *
+ * @codeCoverageIgnoreStart
+ */
+return call_user_func( function() {
+ $remoteExtPathParts = explode(
+ DIRECTORY_SEPARATOR . 'extensions' . DIRECTORY_SEPARATOR,
__DIR__, 2
+ );
+ $moduleBase = array(
+ 'localBasePath' => __DIR__,
+ 'remoteExtPath' => $remoteExtPathParts[1],
+ );
+
+ $modules = array(
+
+ 'wikibase.store.CombiningEntityStore.tests' => $moduleBase +
array(
+ 'scripts' => array(
+ 'store.CombiningEntityStore.tests.js',
+ ),
+ 'dependencies' => array(
+ 'wikibase.store.CombiningEntityStore',
+ 'wikibase.store.EntityStore',
+ ),
+ ),
+
+ 'wikibase.store.MwConfigEntityStore.tests' => $moduleBase +
array(
+ 'scripts' => array(
+ 'store.MwConfigEntityStore.tests.js',
+ ),
+ 'dependencies' => array(
+ 'wikibase.store.MwConfigEntityStore',
+ ),
+ ),
+
+ );
+
+ return $modules;
+
+} );
diff --git a/lib/tests/qunit/wikibase.store/store.CombiningEntityStore.tests.js
b/repo/tests/qunit/store/store.CombiningEntityStore.tests.js
similarity index 100%
rename from lib/tests/qunit/wikibase.store/store.CombiningEntityStore.tests.js
rename to repo/tests/qunit/store/store.CombiningEntityStore.tests.js
diff --git a/lib/tests/qunit/wikibase.store/store.MwConfigEntityStore.tests.js
b/repo/tests/qunit/store/store.MwConfigEntityStore.tests.js
similarity index 100%
rename from lib/tests/qunit/wikibase.store/store.MwConfigEntityStore.tests.js
rename to repo/tests/qunit/store/store.MwConfigEntityStore.tests.js
--
To view, visit https://gerrit.wikimedia.org/r/172959
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I770ae34e62feab42b047ee12bdd372045cf464d8
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
