summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxjm2017-07-24 20:53:25 (GMT)
committerxjm2017-07-24 20:53:25 (GMT)
commit828f315205f28a39dafffff2d2f03b83595d3642 (patch)
tree8a2f22126334ebe9d0f1e68c9202ac0e44be135d
parent40d1a11b580b588c0941802154477eb6793d7486 (diff)
Issue #2895059 by naveenvalecha, marcoscano, seanB, xjm, Berdir: Move media module out of Core (Experimental) package and into the Core package, but mark it hidden
-rw-r--r--core/modules/media/media.info.yml3
-rw-r--r--core/modules/media/tests/src/Functional/MediaInstallTest.php16
2 files changed, 13 insertions, 6 deletions
diff --git a/core/modules/media/media.info.yml b/core/modules/media/media.info.yml
index 07167d6..e69f14a 100644
--- a/core/modules/media/media.info.yml
+++ b/core/modules/media/media.info.yml
@@ -1,9 +1,10 @@
name: Media
description: 'Create reusable media.'
type: module
-package: Core (Experimental)
+package: Core
version: VERSION
core: 8.x
+hidden: true
dependencies:
- file
- image
diff --git a/core/modules/media/tests/src/Functional/MediaInstallTest.php b/core/modules/media/tests/src/Functional/MediaInstallTest.php
index 1d7fcbb..d13c3f0 100644
--- a/core/modules/media/tests/src/Functional/MediaInstallTest.php
+++ b/core/modules/media/tests/src/Functional/MediaInstallTest.php
@@ -29,14 +29,20 @@ class MediaInstallTest extends BrowserTestBase {
*/
public function testReinstallAfterUninstall() {
$page = $this->getSession()->getPage();
+ $assert_session = $this->assertSession();
+
+ // Uninstall the media module.
$this->container->get('module_installer')->uninstall(['media'], FALSE);
+
+ // Install the media module again, through a test module that depends on it.
+ // Note: We use a test module because in 8.4 the media module is hidden.
+ // @todo Simplify this in https://www.drupal.org/node/2897028 once it's
+ // shown again.
$this->drupalGet('/admin/modules');
- $page->checkField('modules[media][enable]');
+ $page->checkField('modules[media_test_views][enable]');
$page->pressButton('Install');
- // @todo Remove this if-statement in https://www.drupal.org/node/2895059
- if ($page->find('css', 'h1')->getText() == 'Are you sure you wish to enable experimental modules?') {
- $page->pressButton('Continue');
- }
+ $assert_session->pageTextContains('Some required modules must be enabled');
+ $page->pressButton('Continue');
$this->assertSession()->pageTextNotContains('could not be moved/copied because a file by that name already exists in the destination directory');
}