jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/325336 )
Change subject: Hygiene: Organise change listeners
......................................................................
Hygiene: Organise change listeners
Move all of the change listeners into
resources/ext.popups/changeListeners and remove the ChangeListener
suffix. Also, do the above for the associated tests.
Bug: T152225
Change-Id: I90ada465ea291d601f8f1c5c6e775148a2100319
---
M Popups.hooks.php
M extension.json
R resources/ext.popups/changeListeners/eventLogging.js
R resources/ext.popups/changeListeners/footerLink.js
R resources/ext.popups/changeListeners/linkTitle.js
R resources/ext.popups/changeListeners/previewCount.js
R resources/ext.popups/changeListeners/render.js
R tests/qunit/ext.popups/changeListeners/footerLink.test.js
R tests/qunit/ext.popups/changeListeners/linkTitle.test.js
R tests/qunit/ext.popups/changeListeners/previewCount.test.js
R tests/qunit/ext.popups/changeListeners/render.test.js
11 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Popups.hooks.php b/Popups.hooks.php
index ccc5512..810f515 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -95,7 +95,7 @@
*/
public static function onResourceLoaderTestModules( array
&$testModules, ResourceLoader &$resourceLoader ) {
$localBasePath = __DIR__;
- $scripts = glob(
"{$localBasePath}/tests/qunit/ext.popups/*.test.js" );
+ $scripts = glob(
"{$localBasePath}/tests/qunit/ext.popups/{,**/}*.test.js", GLOB_BRACE );
$start = strlen( $localBasePath ) + 1;
$scripts = array_map( function ( $script ) use ( $start ) {
diff --git a/extension.json b/extension.json
index 3dfaf95..b3ab4fd 100644
--- a/extension.json
+++ b/extension.json
@@ -67,13 +67,13 @@
"resources/ext.popups/gateway.js",
"resources/ext.popups/reducers.js",
"resources/ext.popups/changeListener.js",
-
"resources/ext.popups/footerLinkChangeListener.js",
-
"resources/ext.popups/linkTitleChangeListener.js",
"resources/ext.popups/renderer.js",
- "resources/ext.popups/renderChangeListener.js",
"resources/ext.popups/schema.js",
-
"resources/ext.popups/eventLoggingChangeListener.js",
-
"resources/ext.popups/previewCountChangeListener.js",
+
"resources/ext.popups/changeListeners/footerLink.js",
+
"resources/ext.popups/changeListeners/linkTitle.js",
+
"resources/ext.popups/changeListeners/render.js",
+
"resources/ext.popups/changeListeners/eventLogging.js",
+
"resources/ext.popups/changeListeners/previewCount.js",
"resources/ext.popups/boot.js"
],
"templates": {
diff --git a/resources/ext.popups/eventLoggingChangeListener.js
b/resources/ext.popups/changeListeners/eventLogging.js
similarity index 100%
rename from resources/ext.popups/eventLoggingChangeListener.js
rename to resources/ext.popups/changeListeners/eventLogging.js
diff --git a/resources/ext.popups/footerLinkChangeListener.js
b/resources/ext.popups/changeListeners/footerLink.js
similarity index 100%
rename from resources/ext.popups/footerLinkChangeListener.js
rename to resources/ext.popups/changeListeners/footerLink.js
diff --git a/resources/ext.popups/linkTitleChangeListener.js
b/resources/ext.popups/changeListeners/linkTitle.js
similarity index 100%
rename from resources/ext.popups/linkTitleChangeListener.js
rename to resources/ext.popups/changeListeners/linkTitle.js
diff --git a/resources/ext.popups/previewCountChangeListener.js
b/resources/ext.popups/changeListeners/previewCount.js
similarity index 100%
rename from resources/ext.popups/previewCountChangeListener.js
rename to resources/ext.popups/changeListeners/previewCount.js
diff --git a/resources/ext.popups/renderChangeListener.js
b/resources/ext.popups/changeListeners/render.js
similarity index 100%
rename from resources/ext.popups/renderChangeListener.js
rename to resources/ext.popups/changeListeners/render.js
diff --git a/tests/qunit/ext.popups/footerLinkChangeListener.test.js
b/tests/qunit/ext.popups/changeListeners/footerLink.test.js
similarity index 95%
rename from tests/qunit/ext.popups/footerLinkChangeListener.test.js
rename to tests/qunit/ext.popups/changeListeners/footerLink.test.js
index e09150e..e541a96 100644
--- a/tests/qunit/ext.popups/footerLinkChangeListener.test.js
+++ b/tests/qunit/ext.popups/changeListeners/footerLink.test.js
@@ -2,7 +2,7 @@
// Since mw.popups.changeListeners.footerLink manipulates the DOM, this
test
// is, by necessity, an integration test.
- QUnit.module( 'ext.popups/footerLinkChangeListener @integration', {
+ QUnit.module( 'ext.popups/changeListeners/footerLink @integration', {
setup: function () {
var boundActions = {},
that = this;
diff --git a/tests/qunit/ext.popups/linkTitleChangeListener.test.js
b/tests/qunit/ext.popups/changeListeners/linkTitle.test.js
similarity index 94%
rename from tests/qunit/ext.popups/linkTitleChangeListener.test.js
rename to tests/qunit/ext.popups/changeListeners/linkTitle.test.js
index e83392b..9630da1 100644
--- a/tests/qunit/ext.popups/linkTitleChangeListener.test.js
+++ b/tests/qunit/ext.popups/changeListeners/linkTitle.test.js
@@ -2,7 +2,7 @@
// Since mw.popups.changeListeners.footerLink manipulates the DOM, this
test
// is, by necessity, an integration test.
- QUnit.module( 'ext.popups/footerLinkChangeListener @integration', {
+ QUnit.module( 'ext.popups/changeListeners/footerLink @integration', {
setup: function () {
var that = this;
diff --git a/tests/qunit/ext.popups/previewCountChangeListener.test.js
b/tests/qunit/ext.popups/changeListeners/previewCount.test.js
similarity index 94%
rename from tests/qunit/ext.popups/previewCountChangeListener.test.js
rename to tests/qunit/ext.popups/changeListeners/previewCount.test.js
index 4972327..ae71616 100644
--- a/tests/qunit/ext.popups/previewCountChangeListener.test.js
+++ b/tests/qunit/ext.popups/changeListeners/previewCount.test.js
@@ -1,6 +1,6 @@
( function ( mw, $ ) {
- QUnit.module( 'ext.popups/previewCountChangeListener', {
+ QUnit.module( 'ext.popups/changeListeners/previewCount', {
setup: function () {
this.userSettings = {
setPreviewCount: this.sandbox.spy()
diff --git a/tests/qunit/ext.popups/renderChangeListener.test.js
b/tests/qunit/ext.popups/changeListeners/render.test.js
similarity index 91%
rename from tests/qunit/ext.popups/renderChangeListener.test.js
rename to tests/qunit/ext.popups/changeListeners/render.test.js
index 7b65dc7..cce2de1 100644
--- a/tests/qunit/ext.popups/renderChangeListener.test.js
+++ b/tests/qunit/ext.popups/changeListeners/render.test.js
@@ -2,7 +2,7 @@
// Since mw.popups.changeListeners.render manipulates the DOM, this
test is,
// by necessity, an integration test.
- QUnit.module( 'ext.popups/renderChangeListener @integration' );
+ QUnit.module( 'ext.popups/changeListeners/render @integration' );
QUnit.test(
'it should call the showPreview action creator when the preview
is shown',
--
To view, visit https://gerrit.wikimedia.org/r/325336
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I90ada465ea291d601f8f1c5c6e775148a2100319
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: mpga
Gerrit-Owner: Phuedx <samsm...@wikimedia.org>
Gerrit-Reviewer: Jhernandez <jhernan...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
