From 763813d6d85493d1f78572d6ab95d1ad5fe68ecb Mon Sep 17 00:00:00 2001
From: Tim Plunkett <git@plnktt.com>
Date: Mon, 13 Aug 2012 11:41:17 -0400
Subject: [PATCH] Enable views_ui by default, to help tests pass.
---
lib/Drupal/views/Tests/AccessTest.php | 1 -
lib/Drupal/views/Tests/Field/ApiDataTest.php | 2 --
lib/Drupal/views/Tests/Field/ApiTestBase.php | 1 -
.../views/Tests/Field/HandlerFieldFieldTest.php | 1 -
lib/Drupal/views/Tests/Handler/FilterDateTest.php | 1 -
lib/Drupal/views/Tests/TranslatableTest.php | 1 -
lib/Drupal/views/Tests/UiGroupByTest.php | 4 +---
lib/Drupal/views/Tests/UiSettingsTest.php | 4 +---
lib/Drupal/views/Tests/ViewsSqlTest.php | 14 --------------
lib/Drupal/views/Tests/ViewsTestBase.php | 12 +++++++++++-
10 files changed, 13 insertions(+), 28 deletions(-)
diff --git a/lib/Drupal/views/Tests/AccessTest.php b/lib/Drupal/views/Tests/AccessTest.php
index 599362ff104a..6cd3283ee640 100644
--- a/lib/Drupal/views/Tests/AccessTest.php
+++ b/lib/Drupal/views/Tests/AccessTest.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Tests;
-use Drupal\simpletest\WebTestBase;
use Drupal\views\View;
/**
diff --git a/lib/Drupal/views/Tests/Field/ApiDataTest.php b/lib/Drupal/views/Tests/Field/ApiDataTest.php
index fc6082116f61..18c62c5da6b9 100644
--- a/lib/Drupal/views/Tests/Field/ApiDataTest.php
+++ b/lib/Drupal/views/Tests/Field/ApiDataTest.php
@@ -7,8 +7,6 @@
namespace Drupal\views\Tests\Field;
-use Drupal\simpletest\WebTestBase;
-
/**
* Test the produced views_data.
*/
diff --git a/lib/Drupal/views/Tests/Field/ApiTestBase.php b/lib/Drupal/views/Tests/Field/ApiTestBase.php
index 8b8b7165962c..7e2c897a0efc 100644
--- a/lib/Drupal/views/Tests/Field/ApiTestBase.php
+++ b/lib/Drupal/views/Tests/Field/ApiTestBase.php
@@ -18,7 +18,6 @@
namespace Drupal\views\Tests\Field;
-use Drupal\simpletest\WebTestBase;
use Drupal\views\Tests\ViewsSqlTest;
/**
diff --git a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
index cb4f608360d6..9116d2c2c8a0 100644
--- a/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
+++ b/lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php
@@ -7,7 +7,6 @@
namespace Drupal\views\Tests\Field;
-use Drupal\simpletest\WebTestBase;
use Drupal\views\View;
/**
diff --git a/lib/Drupal/views/Tests/Handler/FilterDateTest.php b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
index d5a22f953347..e86bed10e08a 100644
--- a/lib/Drupal/views/Tests/Handler/FilterDateTest.php
+++ b/lib/Drupal/views/Tests/Handler/FilterDateTest.php
@@ -34,7 +34,6 @@ function setUp() {
$this->map = array(
'nid' => 'nid',
);
- $this->enableViewsUi();
}
/**
diff --git a/lib/Drupal/views/Tests/TranslatableTest.php b/lib/Drupal/views/Tests/TranslatableTest.php
index 585e0080fc2d..7a10282d4b37 100644
--- a/lib/Drupal/views/Tests/TranslatableTest.php
+++ b/lib/Drupal/views/Tests/TranslatableTest.php
@@ -30,7 +30,6 @@ public function setUp() {
// Reset the plugin data.
views_fetch_plugin_data(NULL, NULL, TRUE);
$this->strings = array('Master1', 'Apply1', 'Sort By1', 'Asc1', 'Desc1', 'more1', 'Reset1', 'Offset1', 'Master1', 'title1', 'Items per page1', 'fieldlabel1', 'filterlabel1');
- $this->enableViewsUi();
}
/**
diff --git a/lib/Drupal/views/Tests/UiGroupByTest.php b/lib/Drupal/views/Tests/UiGroupByTest.php
index 06418781d762..d4174f0c5ad2 100644
--- a/lib/Drupal/views/Tests/UiGroupByTest.php
+++ b/lib/Drupal/views/Tests/UiGroupByTest.php
@@ -7,12 +7,10 @@
namespace Drupal\views\Tests;
-use Drupal\simpletest\WebTestBase;
-
/**
* Tests UI of aggregate functionality..
*/
-class UiGroupByTest extends WebTestBase {
+class UiGroupByTest extends ViewsTestBase {
/**
* Modules to enable.
diff --git a/lib/Drupal/views/Tests/UiSettingsTest.php b/lib/Drupal/views/Tests/UiSettingsTest.php
index 2f36be30afd2..5542847e601a 100644
--- a/lib/Drupal/views/Tests/UiSettingsTest.php
+++ b/lib/Drupal/views/Tests/UiSettingsTest.php
@@ -7,12 +7,10 @@
namespace Drupal\views\Tests;
-use Drupal\simpletest\WebTestBase;
-
/**
* Tests the various settings in the views ui.
*/
-class UiSettingsTest extends WebTestBase {
+class UiSettingsTest extends ViewsTestBase {
/**
* Modules to enable.
diff --git a/lib/Drupal/views/Tests/ViewsSqlTest.php b/lib/Drupal/views/Tests/ViewsSqlTest.php
index d6db786e260a..2c54c92bedd9 100644
--- a/lib/Drupal/views/Tests/ViewsSqlTest.php
+++ b/lib/Drupal/views/Tests/ViewsSqlTest.php
@@ -40,20 +40,6 @@ protected function setUp() {
$this->checkPermissions(array(), TRUE);
}
- /**
- * This function allows to enable views ui from a higher class which can't change the setup function anymore.
- *
- * @TODO
- * Convert existing setUp functions.
- */
- function enableViewsUi() {
- module_enable(array('views_ui'));
- // @TODO Figure out why it's required to clear the cache here.
- views_module_include('views_default', TRUE);
- views_get_all_views(TRUE);
- menu_router_rebuild();
- }
-
/**
* The schema definition.
*/
diff --git a/lib/Drupal/views/Tests/ViewsTestBase.php b/lib/Drupal/views/Tests/ViewsTestBase.php
index 443ffa1ca582..5e0db3001176 100644
--- a/lib/Drupal/views/Tests/ViewsTestBase.php
+++ b/lib/Drupal/views/Tests/ViewsTestBase.php
@@ -18,7 +18,17 @@ abstract class ViewsTestBase extends WebTestBase {
*
* @var array
*/
- public static $modules = array('views');
+ public static $modules = array('views', 'views_ui');
+
+ protected function setUp() {
+ parent::setUp();
+
+ // @todo Remove this hack or move it to child classes.
+ views_init();
+ views_module_include('views_default', TRUE);
+ views_get_all_views(TRUE);
+ menu_router_rebuild();
+ }
/**
* Helper function: verify a result set returned by view.
--
GitLab