Enable views_ui by default, to help tests pass.

lib/Drupal/views/Tests/AccessTest.php

@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests;
 
-use Drupal\simpletest\WebTestBase;
 use Drupal\views\View;
 
 /**

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.
  */

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;
 
 /**

lib/Drupal/views/Tests/Field/HandlerFieldFieldTest.php

@@ -7,7 +7,6 @@
 
 namespace Drupal\views\Tests\Field;
 
-use Drupal\simpletest\WebTestBase;
 use Drupal\views\View;
 
 /**

lib/Drupal/views/Tests/Handler/FilterDateTest.php

@@ -34,7 +34,6 @@ class FilterDateTest extends ViewsSqlTest {
     $this->map = array(
       'nid' => 'nid',
     );
-    $this->enableViewsUi();
   }
 
   /**

lib/Drupal/views/Tests/TranslatableTest.php

@@ -30,7 +30,6 @@ class TranslatableTest extends ViewsSqlTest {
     // 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();
   }
 
   /**

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.

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.

lib/Drupal/views/Tests/ViewsSqlTest.php

@@ -40,20 +40,6 @@ abstract class ViewsSqlTest extends ViewsTestBase {
     $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.
    */

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.