Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/365422 )
Change subject: Hygiene: Remove and update references to MobileFrontend
......................................................................
Hygiene: Remove and update references to MobileFrontend
Changes:
* namespace tests to MinervaNeue
* Update docs
* Update browser test artifacts
* Update comments
Change-Id: I83432b3f7f0bcd07ed08259972b8ff89147104b6
---
M includes/Minerva.hooks.php
M tests/browser/README.mediawiki
M tests/browser/features/step_definitions/common_steps.rb
M tests/browser/features/step_definitions/create_page_api_steps.rb
M tests/phpunit/MenuBuilderTest.php
M tests/phpunit/skins/SkinMinervaPageActionsTest.php
M tests/phpunit/skins/SkinMinervaTest.php
M tests/phpunit/skins/SkinUserPageHelperTest.php
8 files changed, 16 insertions(+), 18 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/MinervaNeue
refs/changes/22/365422/1
diff --git a/includes/Minerva.hooks.php b/includes/Minerva.hooks.php
index dcb2894..804ee13 100644
--- a/includes/Minerva.hooks.php
+++ b/includes/Minerva.hooks.php
@@ -5,8 +5,6 @@
/**
* Hook handlers for Minerva skin.
- * Hooks specific to all skins running in mobile mode should belong in
- * MobileFrontend.hooks.php
*
* Hook handler method names should be in the form of:
* on<HookName>()
@@ -66,7 +64,7 @@
'skins.minerva.notifications.badge'
],
'localBasePath' => dirname( __DIR__ ),
- 'remoteExtPath' => 'MobileFrontend',
+ 'remoteExtPath' => 'MinervaNeue',
'targets' => [ 'mobile', 'desktop' ],
'scripts' => [
'tests/qunit/skins.minerva.notifications.badge/test_NotificationBadge.js'
diff --git a/tests/browser/README.mediawiki b/tests/browser/README.mediawiki
index 4c8af26..8874a78 100644
--- a/tests/browser/README.mediawiki
+++ b/tests/browser/README.mediawiki
@@ -7,7 +7,7 @@
Note including this in a production instance is not advised given it fiddles
with permissions.
<pre>
-include_once "$IP/extensions/MobileFrontend/tests/browser/LocalSettings.php";
+include_once "$IP/skins/MinervaNeue/tests/browser/LocalSettings.php";
</pre>
Further tweaks may be necessary to run tests that are not tagged @integration:
@@ -18,11 +18,6 @@
* Create an account and store the username in MEDIAWIKI_USER which has
** an edit count of greater than 0
** Ensure user has bureaucrat and admin rights (set via Special:UserRights)
-
-= MobileFrontend Extension =
-
-For general information about MobileFrontend Extension please see
-README.mediawiki file in the root of the repository.
==== Selenium tests ====
@@ -58,9 +53,9 @@
the MEDIAWIKI_API_URL environment variable, e.g.
export MEDIAWIKI_API_URL=http://en.wikipedia.beta.wmflabs.org/w/api.php
-Run the tests from the MobileFrontend directory with:
+Run the tests from the Minerva directory with:
- make cucumber
+ bundle exec cucumber tests/browser/features
If you want to run a single set of tests, go to the tests/browser directory and
call 'bundle exec cucumber' with the path to the test file. For example, to run
diff --git a/tests/browser/features/step_definitions/common_steps.rb
b/tests/browser/features/step_definitions/common_steps.rb
index a27d3fc..5139e54 100644
--- a/tests/browser/features/step_definitions/common_steps.rb
+++ b/tests/browser/features/step_definitions/common_steps.rb
@@ -62,7 +62,7 @@
end
Given(/^the "(.*?)" page is protected\.$/) do |page|
- api.protect_page(page, 'MobileFrontend Selenium test protected this page')
+ api.protect_page(page, 'MinervaNeue Selenium test protected this page')
end
When(/^I click the browser back button$/) do
diff --git a/tests/browser/features/step_definitions/create_page_api_steps.rb
b/tests/browser/features/step_definitions/create_page_api_steps.rb
index 2cbb858..7faf837 100644
--- a/tests/browser/features/step_definitions/create_page_api_steps.rb
+++ b/tests/browser/features/step_definitions/create_page_api_steps.rb
@@ -1,6 +1,6 @@
# export MEDIAWIKI_API_URL = http://en.wikipedia.beta.wmflabs.org/w/api.php
Given(/^I go to a page that has references$/) do
- wikitext = "MobileFrontend is a MediaWiki extension.
+ wikitext = "MinervaNeue is a MediaWiki skin.
{{#tag:ref|This is a note.<ref>This is a nested ref.</ref>|group=note}}
==Notes==
<references group=note />
diff --git a/tests/phpunit/MenuBuilderTest.php
b/tests/phpunit/MenuBuilderTest.php
index da6430c..dc9b07c 100644
--- a/tests/phpunit/MenuBuilderTest.php
+++ b/tests/phpunit/MenuBuilderTest.php
@@ -6,7 +6,7 @@
use MediaWiki\Minerva\MenuEntry;
/**
- * @group MobileFrontend
+ * @group MinervaNeue
*/
class MenuTest extends \PHPUnit_Framework_TestCase {
private $homeComponent = [
diff --git a/tests/phpunit/skins/SkinMinervaPageActionsTest.php
b/tests/phpunit/skins/SkinMinervaPageActionsTest.php
index c807593..e5eead2 100644
--- a/tests/phpunit/skins/SkinMinervaPageActionsTest.php
+++ b/tests/phpunit/skins/SkinMinervaPageActionsTest.php
@@ -1,5 +1,7 @@
<?php
+namespace Tests\MediaWiki\Minerva;
+
// FIXME: That this class exists is an indicator that at least
SkinMinerva#isAllowedPageAction
// should be extracted from SkinMinerva.
class TestSkinMinerva extends SkinMinerva {
@@ -21,7 +23,7 @@
}
/**
- * @group MobileFrontend
+ * @group MinervaNeue
*/
class SkinMinervaPageActionsTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/skins/SkinMinervaTest.php
b/tests/phpunit/skins/SkinMinervaTest.php
index 7970ed6..d5c7689 100644
--- a/tests/phpunit/skins/SkinMinervaTest.php
+++ b/tests/phpunit/skins/SkinMinervaTest.php
@@ -1,6 +1,6 @@
<?php
-namespace Tests\MobileFrontend\Skins;
+namespace Tests\MediaWiki\Minerva;
use MediaWikiTestCase;
use MobileUI;
@@ -34,7 +34,7 @@
/**
* @coversDefaultClass SkinMinerva
- * @group MobileFrontend
+ * @group MinervaNeue
*/
class SkinMinervaTest extends MediaWikiTestCase {
diff --git a/tests/phpunit/skins/SkinUserPageHelperTest.php
b/tests/phpunit/skins/SkinUserPageHelperTest.php
index 8edd6a6..aa50b0a 100644
--- a/tests/phpunit/skins/SkinUserPageHelperTest.php
+++ b/tests/phpunit/skins/SkinUserPageHelperTest.php
@@ -1,8 +1,11 @@
<?php
+
+namespace Tests\MediaWiki\Minerva;
+
use MediaWiki\Minerva\SkinUserPageHelper;
/**
- * @group MobileFrontend
+ * @group MinervaNeue
* @coversDefaultClass MediaWiki\Minerva\SkinUserPageHelper
*/
class SkinUserPageHelperTest extends MediaWikiTestCase {
--
To view, visit https://gerrit.wikimedia.org/r/365422
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I83432b3f7f0bcd07ed08259972b8ff89147104b6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/MinervaNeue
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
