From 39b12c461cd48df0b0eda4491323a809cb18e990 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Thu, 17 Mar 2022 14:05:52 +0000
Subject: [PATCH] Issue #3264122 by Spokje, Taran2L, ankithashetty, quietone,
catch, xjm, daffie: Move all non migration aggregator tests to the module in
preparation of removal in d10
---
.../Drupal/Core/Annotation/QueueWorker.php | 2 +-
core/modules/aggregator/aggregator.module | 13 +++
...views.view.test_aggregator_style_opml.yml} | 4 +-
.../src/Functional/Jsonapi}/FeedTest.php | 5 +-
.../src/Functional/Jsonapi}/ItemTest.php | 5 +-
.../Views/Handler/HandlerAggregatorTest.php | 100 +++++++++++++++++
.../Views}/Plugin/StyleOpmlTest.php | 16 ++-
.../views_ui/DisplayOpmlFeedTest.php | 103 ++++++++++++++++++
.../NewViewAggregatorConfigSchemaTest.php | 51 +++++++++
.../tests/src/Unit/BubbleableMetadataTest.php | 73 +++++++++++++
.../src/Functional/Views/DisplayBlockTest.php | 6 +-
.../src/Kernel/BlockConfigSchemaTest.php | 1 -
.../Views/BlockContentFieldFilterTest.php | 4 +-
.../Functional/Views/BlockContentTestBase.php | 9 +-
.../Functional/Views/BookRelationshipTest.php | 4 +-
.../Views/CommentFieldFilterTest.php | 2 +-
.../src/Functional/Views/CommentTestBase.php | 5 +-
.../Views/DefaultViewRecentCommentsTest.php | 4 +-
.../tests/src/Functional/Views/WizardTest.php | 4 +-
.../ConfigTranslationViewListUiTest.php | 4 +-
.../src/Functional/Views/ContactLinkTest.php | 7 +-
.../ViewsModerationStateFilterTest.php | 4 +-
.../tests/src/Functional/DateFilterTest.php | 6 +-
.../src/Functional/Views/FieldTestBase.php | 7 +-
.../src/Functional/Views/FieldUITest.php | 4 +-
.../Functional/Views/ForumIntegrationTest.php | 7 +-
core/modules/jsonapi/jsonapi.module | 10 --
.../RestExportJsonApiUnsupported.php | 6 +-
.../Functional/Views/LinkViewsTokensTest.php | 6 +-
.../Functional/Views/BulkFormAccessTest.php | 4 +-
.../src/Functional/Views/BulkFormTest.php | 4 +-
.../Functional/Views/FilterNodeAccessTest.php | 4 +-
.../src/Functional/Views/FrontPageTest.php | 4 +-
.../Functional/Views/NodeFieldFilterTest.php | 4 +-
.../src/Functional/Views/NodeLanguageTest.php | 4 +-
.../src/Functional/Views/NodeTestBase.php | 9 +-
.../src/Functional/Views/PathPluginTest.php | 4 +-
.../src/Functional/Views/RowPluginTest.php | 4 +-
.../src/Functional/ViewsIntegrationTest.php | 4 +-
.../Views/ExcludedFieldTokenTest.php | 7 +-
.../src/Functional/Views/FieldCounterTest.php | 7 +-
.../Functional/Views/RestExportAuthTest.php | 4 +-
.../Functional/Views/StyleSerializerTest.php | 7 +-
.../src/Functional/Views/IntegrationTest.php | 7 +-
.../Views/TaxonomyFieldFilterTest.php | 4 +-
.../Views/TaxonomyIndexTidUiTest.php | 4 +-
.../Functional/Views/TaxonomyParentUITest.php | 7 +-
.../Views/TaxonomyRelationshipTest.php | 4 +-
.../Views/TaxonomyTermArgumentDepthTest.php | 4 +-
.../Views/TaxonomyTermFilterDepthTest.php | 4 +-
.../Functional/Views/TaxonomyTermViewTest.php | 4 +-
.../src/Functional/Views/TaxonomyTestBase.php | 15 ++-
.../Views/TaxonomyVocabularyArgumentTest.php | 4 +-
.../tests/src/Functional/AccessRoleUITest.php | 7 +-
.../src/Functional/UserPermissionsTest.php | 6 +-
.../src/Functional/Views/AccessRoleTest.php | 7 ++
.../src/Functional/Views/AccessTestBase.php | 4 +-
.../Views/FilterPermissionUiTest.php | 6 +-
.../Views/HandlerFilterUserNameTest.php | 7 +-
.../src/Functional/Views/UserChangedTest.php | 7 +-
.../src/Functional/Views/UserTestBase.php | 7 +-
.../tests/src/Functional/DefaultViewsTest.php | 4 +-
.../Functional/Entity/BaseFieldAccessTest.php | 6 +-
.../src/Functional/Entity/FieldEntityTest.php | 6 +-
.../Entity/FieldEntityTranslationTest.php | 4 +-
.../FieldRenderedEntityTranslationTest.php | 4 +-
.../tests/src/Functional/Handler/AreaTest.php | 4 +-
.../Functional/Handler/AreaTitleWebTest.php | 4 +-
.../Handler/FieldDropButtonTest.php | 4 +-
.../Handler/FieldEntityLinkBaseTest.php | 4 +-
.../Handler/FieldEntityOperationsTest.php | 4 +-
.../Handler/FieldGroupRowsWebTest.php | 4 +-
.../src/Functional/Handler/FieldWebTest.php | 4 +-
.../src/Functional/Handler/FilterDateTest.php | 4 +-
.../src/Functional/Handler/HandlerAllTest.php | 1 -
.../src/Functional/Handler/HandlerTest.php | 4 +-
.../src/Functional/Plugin/AccessTest.php | 4 +-
.../Functional/Plugin/ArgumentDefaultTest.php | 4 +-
.../src/Functional/Plugin/CacheTagTest.php | 4 +-
.../src/Functional/Plugin/CacheWebTest.php | 4 +-
.../ContextualFiltersBlockContextTest.php | 4 +-
.../Plugin/ContextualFiltersStringTest.php | 4 +-
.../Functional/Plugin/DisabledDisplayTest.php | 4 +-
.../Plugin/DisplayAttachmentTest.php | 4 +-
.../Plugin/DisplayEntityReferenceTest.php | 4 +-
.../src/Functional/Plugin/DisplayFeedTest.php | 4 +-
.../Plugin/DisplayFeedTranslationTest.php | 4 +-
.../Functional/Plugin/DisplayPageWebTest.php | 4 +-
.../src/Functional/Plugin/DisplayTest.php | 4 +-
.../Plugin/ExposedFormCheckboxesTest.php | 4 +-
.../src/Functional/Plugin/ExposedFormTest.php | 4 +-
.../src/Functional/Plugin/FilterTest.php | 4 +-
.../src/Functional/Plugin/MenuLinkTest.php | 4 +-
.../src/Functional/Plugin/MiniPagerTest.php | 4 +-
.../Functional/Plugin/MonthDatePluginTest.php | 4 +-
.../Plugin/NumericFormatPluralTest.php | 4 +-
.../Functional/Plugin/StyleSummaryTest.php | 4 +-
.../src/Functional/Plugin/StyleTableTest.php | 4 +-
.../src/Functional/Plugin/ViewsBulkTest.php | 4 +-
.../src/Functional/RenderCacheWebTest.php | 4 +-
.../src/Functional/TaxonomyGlossaryTest.php | 4 +-
.../tests/src/Functional/ViewAjaxTest.php | 4 +-
.../tests/src/Functional/ViewElementTest.php | 4 +-
.../tests/src/Functional/ViewTestBase.php | 4 +-
.../src/Functional/ViewTranslationTest.php | 4 +-
.../src/Functional/ViewsEscapingTest.php | 4 +-
.../src/Functional/ViewsFormMultipleTest.php | 4 +-
.../Functional/ViewsNoResultsBehaviorTest.php | 4 +-
.../Functional/ViewsThemeIntegrationTest.php | 4 +-
.../tests/src/Functional/Wizard/BasicTest.php | 4 +-
.../Functional/Wizard/ItemsPerPageTest.php | 4 +-
.../src/Functional/Wizard/SortingTest.php | 4 +-
.../src/Functional/Wizard/TaggedWithTest.php | 4 +-
.../src/Functional/Wizard/WizardTestBase.php | 4 +-
.../tests/src/Functional/DefaultViewsTest.php | 4 +-
.../tests/src/Functional/DisplayFeedTest.php | 6 +-
.../tests/src/Functional/DisplayPathTest.php | 4 +-
.../tests/src/Functional/DuplicateTest.php | 4 +-
.../src/Functional/ExposedFormUITest.php | 4 +-
.../tests/src/Functional/FilterUITest.php | 4 +-
.../tests/src/Functional/HandlerTest.php | 4 +-
.../Functional/NewViewConfigSchemaTest.php | 4 -
.../src/Functional/OverrideDisplaysTest.php | 4 +-
.../tests/src/Functional/SettingsTest.php | 4 +-
.../src/Functional/TranslatedViewTest.php | 4 +-
.../tests/src/Functional/UITestBase.php | 4 +-
.../src/Functional/UnsavedPreviewTest.php | 4 +-
.../tests/src/Functional/ViewsListTest.php | 4 +-
.../Core/Queue/QueueSerializationTest.php | 13 +--
.../Core/Render/BubbleableMetadataTest.php | 59 ----------
130 files changed, 603 insertions(+), 390 deletions(-)
rename core/modules/{views/tests/modules/views_test_config/test_views/views.view.test_style_opml.yml => aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_style_opml.yml} (99%)
rename core/modules/{jsonapi/tests/src/Functional => aggregator/tests/src/Functional/Jsonapi}/FeedTest.php (97%)
rename core/modules/{jsonapi/tests/src/Functional => aggregator/tests/src/Functional/Jsonapi}/ItemTest.php (96%)
create mode 100644 core/modules/aggregator/tests/src/Functional/Views/Handler/HandlerAggregatorTest.php
rename core/modules/{views/tests/src/Functional => aggregator/tests/src/Functional/Views}/Plugin/StyleOpmlTest.php (83%)
create mode 100644 core/modules/aggregator/tests/src/Functional/views_ui/DisplayOpmlFeedTest.php
create mode 100644 core/modules/aggregator/tests/src/Functional/views_ui/NewViewAggregatorConfigSchemaTest.php
create mode 100644 core/modules/aggregator/tests/src/Unit/BubbleableMetadataTest.php
diff --git a/core/lib/Drupal/Core/Annotation/QueueWorker.php b/core/lib/Drupal/Core/Annotation/QueueWorker.php
index 1f85cb07871d..354642a72c60 100644
--- a/core/lib/Drupal/Core/Annotation/QueueWorker.php
+++ b/core/lib/Drupal/Core/Annotation/QueueWorker.php
@@ -24,7 +24,7 @@
* Plugin Namespace: Plugin\QueueWorker
*
* For a working example, see
- * \Drupal\aggregator\Plugin\QueueWorker\AggregatorRefresh.
+ * \Drupal\locale\Plugin\QueueWorker\LocaleTranslation.
*
* @see \Drupal\Core\Queue\QueueWorkerInterface
* @see \Drupal\Core\Queue\QueueWorkerBase
diff --git a/core/modules/aggregator/aggregator.module b/core/modules/aggregator/aggregator.module
index 9e544073b017..5288a3fd0680 100644
--- a/core/modules/aggregator/aggregator.module
+++ b/core/modules/aggregator/aggregator.module
@@ -5,6 +5,9 @@
* Used to aggregate syndicated content (RSS, RDF, and Atom).
*/
+use Drupal\Core\Access\AccessResult;
+use Drupal\Core\Entity\EntityTypeInterface;
+use Drupal\Core\Session\AccountInterface;
use Drupal\Core\Url;
use Drupal\aggregator\Entity\Feed;
use Drupal\Core\Routing\RouteMatchInterface;
@@ -205,3 +208,13 @@ function aggregator_preprocess_block(&$variables) {
$variables['attributes']['role'] = 'complementary';
}
}
+
+/**
+ * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'aggregator_feed'.
+ */
+function aggregator_jsonapi_aggregator_feed_filter_access(EntityTypeInterface $entity_type, AccountInterface $account) {
+ // @see \Drupal\aggregator\FeedAccessControlHandler::checkAccess()
+ return ([
+ JSONAPI_FILTER_AMONG_ALL => AccessResult::allowedIfHasPermission($account, 'access news feeds'),
+ ]);
+}
diff --git a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_opml.yml b/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_style_opml.yml
similarity index 99%
rename from core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_opml.yml
rename to core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_style_opml.yml
index d050afcc11df..bdd48f637f37 100644
--- a/core/modules/views/tests/modules/views_test_config/test_views/views.view.test_style_opml.yml
+++ b/core/modules/aggregator/tests/modules/aggregator_test_views/test_views/views.view.test_aggregator_style_opml.yml
@@ -3,8 +3,8 @@ status: true
dependencies:
module:
- aggregator
-id: test_style_opml
-label: test_style_opml
+id: test_aggregator_style_opml
+label: test_aggregator_style_opml
module: views
description: ''
tag: default
diff --git a/core/modules/jsonapi/tests/src/Functional/FeedTest.php b/core/modules/aggregator/tests/src/Functional/Jsonapi/FeedTest.php
similarity index 97%
rename from core/modules/jsonapi/tests/src/Functional/FeedTest.php
rename to core/modules/aggregator/tests/src/Functional/Jsonapi/FeedTest.php
index efd4d0a49c01..e71ce50b9a2e 100644
--- a/core/modules/jsonapi/tests/src/Functional/FeedTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Jsonapi/FeedTest.php
@@ -1,15 +1,16 @@
<?php
-namespace Drupal\Tests\jsonapi\Functional;
+namespace Drupal\Tests\aggregator\Functional\Jsonapi;
use Drupal\aggregator\Entity\Feed;
use Drupal\Core\Url;
+use Drupal\Tests\jsonapi\Functional\ResourceTestBase;
use Drupal\Tests\jsonapi\Traits\CommonCollectionFilterAccessTestPatternsTrait;
/**
* JSON:API integration test for the "Feed" content entity type.
*
- * @group jsonapi
+ * @group aggregator
*/
class FeedTest extends ResourceTestBase {
diff --git a/core/modules/jsonapi/tests/src/Functional/ItemTest.php b/core/modules/aggregator/tests/src/Functional/Jsonapi/ItemTest.php
similarity index 96%
rename from core/modules/jsonapi/tests/src/Functional/ItemTest.php
rename to core/modules/aggregator/tests/src/Functional/Jsonapi/ItemTest.php
index 33bbf8b08020..03265c3b8459 100644
--- a/core/modules/jsonapi/tests/src/Functional/ItemTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Jsonapi/ItemTest.php
@@ -1,14 +1,15 @@
<?php
-namespace Drupal\Tests\jsonapi\Functional;
+namespace Drupal\Tests\aggregator\Functional\Jsonapi;
use Drupal\aggregator\Entity\Feed;
use Drupal\aggregator\Entity\Item;
+use Drupal\Tests\jsonapi\Functional\ResourceTestBase;
/**
* JSON:API integration test for the "Item" content entity type.
*
- * @group jsonapi
+ * @group aggregator
*/
class ItemTest extends ResourceTestBase {
diff --git a/core/modules/aggregator/tests/src/Functional/Views/Handler/HandlerAggregatorTest.php b/core/modules/aggregator/tests/src/Functional/Views/Handler/HandlerAggregatorTest.php
new file mode 100644
index 000000000000..19c17e2a91c9
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Functional/Views/Handler/HandlerAggregatorTest.php
@@ -0,0 +1,100 @@
+<?php
+
+namespace Drupal\Tests\aggregator\Functional\Views\Handler;
+
+use Drupal\Tests\views\Functional\ViewTestBase;
+use Drupal\views\Plugin\views\filter\NumericFilter;
+use Drupal\views\ViewExecutable;
+use Drupal\views\Plugin\views\HandlerBase;
+use Drupal\views\Plugin\views\filter\InOperator;
+use Drupal\views\Entity\View;
+
+/**
+ * Tests instances of the aggregator related view handlers.
+ *
+ * @group aggregator
+ */
+class HandlerAggregatorTest extends ViewTestBase {
+
+ /**
+ * Modules to enable.
+ *
+ * @var array
+ */
+ protected static $modules = [
+ 'aggregator',
+ 'node',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * Tests most of the handlers.
+ */
+ public function testHandlers() {
+ $this->drupalCreateContentType(['type' => 'article']);
+
+ $object_types = array_keys(ViewExecutable::getHandlerTypes());
+ foreach ($this->container->get('views.views_data')->getAll() as $base_table => $info) {
+ if (!isset($info['table']['base'])) {
+ continue;
+ }
+
+ $view = View::create(['base_table' => $base_table]);
+ $view = $view->getExecutable();
+
+ // @todo The groupwise relationship is currently broken.
+ $exclude[] = 'users_field_data:uid_representative';
+
+ // Go through all fields and there through all handler types.
+ foreach ($info as $field => $field_info) {
+ // Table is a reserved key for the meta-information.
+ if ($field !== 'table' && !in_array("$base_table:$field", $exclude)) {
+ $item = [
+ 'table' => $base_table,
+ 'field' => $field,
+ ];
+ foreach ($object_types as $type) {
+ if (isset($field_info[$type]['id'])) {
+ $options = [];
+ if ($type === 'filter') {
+ $handler = $this->container->get("plugin.manager.views.$type")->getHandler($item);
+ // Set the value to use for the filter based on the filter type.
+ if ($handler instanceof InOperator) {
+ $options['value'] = [1];
+ }
+ elseif ($handler instanceof NumericFilter) {
+ $options['value'] = ['value' => 1];
+ }
+ else {
+ $options['value'] = 1;
+ }
+ }
+ $view->addHandler('default', $type, $base_table, $field, $options);
+ }
+ }
+ }
+ }
+
+ // Go through each step individually to see whether some parts are
+ // failing.
+ $view->build();
+ $view->preExecute();
+ $view->execute();
+ $view->render();
+
+ // Make sure all handlers extend the HandlerBase.
+ foreach ($object_types as $type) {
+ if (isset($view->{$type})) {
+ foreach ($view->{$type} as $handler) {
+ $this->assertInstanceOf(HandlerBase::class, $handler);
+ }
+ }
+ }
+ }
+ }
+
+}
diff --git a/core/modules/views/tests/src/Functional/Plugin/StyleOpmlTest.php b/core/modules/aggregator/tests/src/Functional/Views/Plugin/StyleOpmlTest.php
similarity index 83%
rename from core/modules/views/tests/src/Functional/Plugin/StyleOpmlTest.php
rename to core/modules/aggregator/tests/src/Functional/Views/Plugin/StyleOpmlTest.php
index c3da72f771dd..7f9ef13ee051 100644
--- a/core/modules/views/tests/src/Functional/Plugin/StyleOpmlTest.php
+++ b/core/modules/aggregator/tests/src/Functional/Views/Plugin/StyleOpmlTest.php
@@ -1,13 +1,13 @@
<?php
-namespace Drupal\Tests\views\Functional\Plugin;
+namespace Drupal\Tests\aggregator\Functional\Views\Plugin;
use Drupal\Tests\views\Functional\ViewTestBase;
/**
* Tests the OPML feed style plugin.
*
- * @group views
+ * @group aggregator
* @see \Drupal\views\Plugin\views\style\Opml
*/
class StyleOpmlTest extends ViewTestBase {
@@ -17,14 +17,14 @@ class StyleOpmlTest extends ViewTestBase {
*
* @var array
*/
- public static $testViews = ['test_style_opml'];
+ public static $testViews = ['test_aggregator_style_opml'];
/**
* Modules to enable.
*
* @var array
*/
- protected static $modules = ['aggregator'];
+ protected static $modules = ['aggregator', 'aggregator_test_views'];
/**
* {@inheritdoc}
@@ -34,10 +34,8 @@ class StyleOpmlTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
-
- $this->enableViewsTestModule();
+ protected function setUp($import_test_views = TRUE, $modules = ['aggregator_test_views']): void {
+ parent::setUp($import_test_views, $modules);
$admin_user = $this->drupalCreateUser(['administer news feeds']);
$this->drupalLogin($admin_user);
@@ -66,7 +64,7 @@ public function testOpmlOutput() {
$view = $this->container->get('entity_type.manager')
->getStorage('view')
- ->load('test_style_opml');
+ ->load('test_aggregator_style_opml');
$display = &$view->getDisplay('feed_1');
$display['display_options']['row']['options']['type_field'] = 'link';
$display['display_options']['row']['options']['url_field'] = 'url';
diff --git a/core/modules/aggregator/tests/src/Functional/views_ui/DisplayOpmlFeedTest.php b/core/modules/aggregator/tests/src/Functional/views_ui/DisplayOpmlFeedTest.php
new file mode 100644
index 000000000000..7cf309b5b75f
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Functional/views_ui/DisplayOpmlFeedTest.php
@@ -0,0 +1,103 @@
+<?php
+
+namespace Drupal\Tests\aggregator\Functional\views_ui;
+
+use Drupal\Tests\views_ui\Functional\UITestBase;
+
+/**
+ * Tests the views UI for feed display plugin.
+ *
+ * @group aggregator
+ * @see \Drupal\views\Plugin\views\display\Feed
+ */
+class DisplayOpmlFeedTest extends UITestBase {
+
+ /**
+ * Views used by this test.
+ *
+ * @var array
+ */
+ public static $testViews = ['test_aggregator_style_opml'];
+
+ /**
+ * Modules to enable.
+ *
+ * @var array
+ */
+ protected static $modules = [
+ 'views_ui',
+ 'aggregator',
+ 'aggregator_test_views',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp($import_test_views = TRUE, $modules = ['aggregator_test_views']): void {
+ parent::setUp($import_test_views, $modules);
+ }
+
+ /**
+ * Tests feed display admin UI.
+ */
+ public function testFeedUI() {
+ // Test the OPML feed.
+ foreach (self::$testViews as $view_name) {
+ $this->checkFeedViewUi($view_name);
+ }
+ }
+
+ /**
+ * Checks views UI for a specific feed view.
+ *
+ * @param string $view_name
+ * The view name to check against.
+ */
+ protected function checkFeedViewUi($view_name) {
+ $this->drupalGet('admin/structure/views');
+ // Verify that the page lists the $view_name view.
+ // Regression test: ViewListBuilder::getDisplayPaths() did not properly
+ // check whether a DisplayPluginCollection was returned in iterating over
+ // all displays.
+ $this->assertSession()->pageTextContains($view_name);
+
+ // Check the attach TO interface.
+ $this->drupalGet('admin/structure/views/nojs/display/' . $view_name . '/feed_1/displays');
+ // Display labels should be escaped.
+ $this->assertSession()->assertEscaped('<em>Page</em>');
+
+ // Load all the options of the checkbox.
+ $result = $this->xpath('//div[@id="edit-displays"]/div');
+ $options = [];
+ foreach ($result as $item) {
+ $input_node = $item->find('css', 'input');
+ if ($input_node->hasAttribute('value')) {
+ $options[] = $input_node->getAttribute('value');
+ }
+ }
+
+ $this->assertEquals(['default', 'page'], $options, 'Make sure all displays appears as expected.');
+
+ // Post and save this and check the output.
+ $this->drupalGet('admin/structure/views/nojs/display/' . $view_name . '/feed_1/displays');
+ $this->submitForm(['displays[page]' => 'page'], 'Apply');
+ // Options summary should be escaped.
+ $this->assertSession()->assertEscaped('<em>Page</em>');
+ $this->assertSession()->responseNotContains('<em>Page</em>');
+
+ $this->drupalGet('admin/structure/views/view/' . $view_name . '/edit/feed_1');
+ $this->assertSession()->elementTextContains('xpath', '//*[@id="views-feed-1-displays"]', 'Page');
+
+ // Add the default display, so there should now be multiple displays.
+ $this->drupalGet('admin/structure/views/nojs/display/' . $view_name . '/feed_1/displays');
+ $this->submitForm(['displays[default]' => 'default'], 'Apply');
+ $this->drupalGet('admin/structure/views/view/' . $view_name . '/edit/feed_1');
+ $this->assertSession()->elementTextContains('xpath', '//*[@id="views-feed-1-displays"]', 'Multiple displays');
+ }
+
+}
diff --git a/core/modules/aggregator/tests/src/Functional/views_ui/NewViewAggregatorConfigSchemaTest.php b/core/modules/aggregator/tests/src/Functional/views_ui/NewViewAggregatorConfigSchemaTest.php
new file mode 100644
index 000000000000..8bc393a714f0
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Functional/views_ui/NewViewAggregatorConfigSchemaTest.php
@@ -0,0 +1,51 @@
+<?php
+
+namespace Drupal\Tests\aggregator\Functional\views_ui;
+
+use Drupal\Tests\views_ui\Functional\UITestBase;
+
+/**
+ * Tests aggregator configuration schema against new views.
+ *
+ * @group aggregator
+ */
+class NewViewAggregatorConfigSchemaTest extends UITestBase {
+
+ /**
+ * Modules to enable.
+ *
+ * @var array
+ */
+ protected static $modules = [
+ 'views_ui',
+ 'aggregator',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'stark';
+
+ /**
+ * Tests creating brand new views.
+ */
+ public function testNewViews() {
+ $this->drupalLogin($this->drupalCreateUser(['administer views']));
+
+ // Create views with all standard derivative classes for Views wizards.
+ $wizards = [
+ 'standard:aggregator_feed',
+ 'standard:aggregator_item',
+ ];
+ foreach ($wizards as $wizard_key) {
+ $edit = [];
+ $edit['label'] = $this->randomString();
+ $edit['id'] = strtolower($this->randomMachineName());
+ $edit['show[wizard_key]'] = $wizard_key;
+ $edit['description'] = $this->randomString();
+ $this->drupalGet('admin/structure/views/add');
+ $this->submitForm($edit, 'Save and edit');
+ }
+ }
+
+}
diff --git a/core/modules/aggregator/tests/src/Unit/BubbleableMetadataTest.php b/core/modules/aggregator/tests/src/Unit/BubbleableMetadataTest.php
new file mode 100644
index 000000000000..0189486c1222
--- /dev/null
+++ b/core/modules/aggregator/tests/src/Unit/BubbleableMetadataTest.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Drupal\Tests\aggregator\Unit;
+
+use Drupal\Core\Render\BubbleableMetadata;
+use Drupal\Tests\UnitTestCase;
+
+/**
+ * @coversDefaultClass \Drupal\Core\Render\BubbleableMetadata
+ * @group aggregator
+ */
+class BubbleableMetadataTest extends UnitTestCase {
+
+ /**
+ * Tests feed asset merging.
+ *
+ * @covers ::mergeAttachments
+ *
+ * @dataProvider providerTestMergeAttachmentsFeedMerging
+ */
+ public function testMergeAttachmentsFeedMerging($a, $b, $expected) {
+ $this->assertSame($expected, BubbleableMetadata::mergeAttachments($a, $b));
+ }
+
+ /**
+ * Data provider for testMergeAttachmentsFeedMerging.
+ *
+ * @return array
+ */
+ public function providerTestMergeAttachmentsFeedMerging() {
+ $feed_a = [
+ 'aggregator/rss',
+ 'Feed title',
+ ];
+
+ $feed_b = [
+ 'taxonomy/term/1/feed',
+ 'RSS - foo',
+ ];
+
+ $a = [
+ 'feed' => [
+ $feed_a,
+ ],
+ ];
+ $b = [
+ 'feed' => [
+ $feed_b,
+ ],
+ ];
+
+ $expected_a = [
+ 'feed' => [
+ $feed_a,
+ $feed_b,
+ ],
+ ];
+
+ // Merging in the opposite direction yields the opposite library order.
+ $expected_b = [
+ 'feed' => [
+ $feed_b,
+ $feed_a,
+ ],
+ ];
+
+ return [
+ [$a, $b, $expected_a],
+ [$b, $a, $expected_b],
+ ];
+ }
+
+}
diff --git a/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php b/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php
index 05ff8b3c6712..f4f40819a0d1 100644
--- a/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php
+++ b/core/modules/block/tests/src/Functional/Views/DisplayBlockTest.php
@@ -11,7 +11,6 @@
use Drupal\Tests\views\Functional\ViewTestBase;
use Drupal\views\Entity\View;
use Drupal\views\Views;
-use Drupal\views\Tests\ViewTestData;
use Drupal\Core\Template\Attribute;
/**
@@ -53,10 +52,9 @@ class DisplayBlockTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['block_test_views']): void {
+ parent::setUp($import_test_views, $modules);
- ViewTestData::createTestViews(static::class, ['block_test_views']);
$this->enableViewsTestModule();
}
diff --git a/core/modules/block/tests/src/Kernel/BlockConfigSchemaTest.php b/core/modules/block/tests/src/Kernel/BlockConfigSchemaTest.php
index f4e501f6d607..e55b55800c5d 100644
--- a/core/modules/block/tests/src/Kernel/BlockConfigSchemaTest.php
+++ b/core/modules/block/tests/src/Kernel/BlockConfigSchemaTest.php
@@ -20,7 +20,6 @@ class BlockConfigSchemaTest extends KernelTestBase {
*/
protected static $modules = [
'block',
- 'aggregator',
'book',
'block_content',
'comment',
diff --git a/core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php b/core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php
index 2946c9cadb97..9cc7c988b777 100644
--- a/core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php
+++ b/core/modules/block_content/tests/src/Functional/Views/BlockContentFieldFilterTest.php
@@ -39,8 +39,8 @@ class BlockContentFieldFilterTest extends BlockContentTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['block_content_test_views']): void {
+ parent::setUp($import_test_views, $modules);
// Add two new languages.
ConfigurableLanguage::createFromLangcode('fr')->save();
diff --git a/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php b/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
index 04b270f7a9d1..493c91648ee3 100644
--- a/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
+++ b/core/modules/block_content/tests/src/Functional/Views/BlockContentTestBase.php
@@ -6,7 +6,6 @@
use Drupal\block_content\Entity\BlockContentType;
use Drupal\Component\Render\FormattableMarkup;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
/**
* Base class for all block_content tests.
@@ -40,16 +39,12 @@ abstract class BlockContentTestBase extends ViewTestBase {
'block_content_test_views',
];
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['block_content_test_views']): void {
+ parent::setUp($import_test_views, $modules);
// Ensure the basic bundle exists. This is provided by the standard profile.
$this->createBlockContentType(['id' => 'basic']);
$this->adminUser = $this->drupalCreateUser($this->permissions);
-
- if ($import_test_views) {
- ViewTestData::createTestViews(static::class, ['block_content_test_views']);
- }
}
/**
diff --git a/core/modules/book/tests/src/Functional/Views/BookRelationshipTest.php b/core/modules/book/tests/src/Functional/Views/BookRelationshipTest.php
index 5051f0a81eb6..6ab14c1581f9 100644
--- a/core/modules/book/tests/src/Functional/Views/BookRelationshipTest.php
+++ b/core/modules/book/tests/src/Functional/Views/BookRelationshipTest.php
@@ -50,8 +50,8 @@ class BookRelationshipTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
// Create users.
$this->bookAuthor = $this->drupalCreateUser(
diff --git a/core/modules/comment/tests/src/Functional/Views/CommentFieldFilterTest.php b/core/modules/comment/tests/src/Functional/Views/CommentFieldFilterTest.php
index 8f3b45ff822c..678fab6c8e24 100644
--- a/core/modules/comment/tests/src/Functional/Views/CommentFieldFilterTest.php
+++ b/core/modules/comment/tests/src/Functional/Views/CommentFieldFilterTest.php
@@ -37,7 +37,7 @@ class CommentFieldFilterTest extends CommentTestBase {
public $commentTitles = [];
protected function setUp($import_test_views = TRUE, $modules = ['comment_test_views']): void {
- parent::setUp($import_test_views);
+ parent::setUp($import_test_views, $modules);
$this->drupalLogin($this->drupalCreateUser(['access comments']));
// Add two new languages.
diff --git a/core/modules/comment/tests/src/Functional/Views/CommentTestBase.php b/core/modules/comment/tests/src/Functional/Views/CommentTestBase.php
index 50c26457b455..29ca8b49191e 100644
--- a/core/modules/comment/tests/src/Functional/Views/CommentTestBase.php
+++ b/core/modules/comment/tests/src/Functional/Views/CommentTestBase.php
@@ -4,7 +4,6 @@
use Drupal\comment\Tests\CommentTestTrait;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
use Drupal\comment\Entity\Comment;
/**
@@ -57,9 +56,7 @@ abstract class CommentTestBase extends ViewTestBase {
protected $comment;
protected function setUp($import_test_views = TRUE, $modules = ['comment_test_views']): void {
- parent::setUp($import_test_views);
-
- ViewTestData::createTestViews(static::class, $modules);
+ parent::setUp($import_test_views, $modules);
// Add two users, create a node with the user1 as author and another node
// with user2 as author. For the second node add a comment from user1.
diff --git a/core/modules/comment/tests/src/Functional/Views/DefaultViewRecentCommentsTest.php b/core/modules/comment/tests/src/Functional/Views/DefaultViewRecentCommentsTest.php
index 0636c43385e5..e62373a4f2bb 100644
--- a/core/modules/comment/tests/src/Functional/Views/DefaultViewRecentCommentsTest.php
+++ b/core/modules/comment/tests/src/Functional/Views/DefaultViewRecentCommentsTest.php
@@ -65,8 +65,8 @@ class DefaultViewRecentCommentsTest extends ViewTestBase {
*/
public $node;
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
// Create a new content type
$content_type = $this->drupalCreateContentType();
diff --git a/core/modules/comment/tests/src/Functional/Views/WizardTest.php b/core/modules/comment/tests/src/Functional/Views/WizardTest.php
index ecabc08b96b1..c8b206134503 100644
--- a/core/modules/comment/tests/src/Functional/Views/WizardTest.php
+++ b/core/modules/comment/tests/src/Functional/Views/WizardTest.php
@@ -31,8 +31,8 @@ class WizardTest extends WizardTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
// Add comment field to page node type.
$this->addDefaultCommentField('node', 'page');
diff --git a/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php b/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
index c8bae85e9f4a..3cc36c8b51cf 100644
--- a/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
+++ b/core/modules/config_translation/tests/src/Functional/ConfigTranslationViewListUiTest.php
@@ -34,8 +34,8 @@ class ConfigTranslationViewListUiTest extends UITestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$permissions = [
'administer views',
diff --git a/core/modules/contact/tests/src/Functional/Views/ContactLinkTest.php b/core/modules/contact/tests/src/Functional/Views/ContactLinkTest.php
index 836e932f3725..db814ba82268 100644
--- a/core/modules/contact/tests/src/Functional/Views/ContactLinkTest.php
+++ b/core/modules/contact/tests/src/Functional/Views/ContactLinkTest.php
@@ -4,7 +4,6 @@
use Drupal\Core\Cache\Cache;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
use Drupal\user\Entity\User;
/**
@@ -44,10 +43,8 @@ class ContactLinkTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
-
- ViewTestData::createTestViews(static::class, ['contact_test_views']);
+ protected function setUp($import_test_views = TRUE, $modules = ['contact_test_views']): void {
+ parent::setUp($import_test_views, $modules);
$this->userData = $this->container->get('user.data');
}
diff --git a/core/modules/content_moderation/tests/src/Functional/ViewsModerationStateFilterTest.php b/core/modules/content_moderation/tests/src/Functional/ViewsModerationStateFilterTest.php
index 286bbcfedcc0..9099f4c5e9d9 100644
--- a/core/modules/content_moderation/tests/src/Functional/ViewsModerationStateFilterTest.php
+++ b/core/modules/content_moderation/tests/src/Functional/ViewsModerationStateFilterTest.php
@@ -42,8 +42,8 @@ class ViewsModerationStateFilterTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp(FALSE);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp(FALSE, $modules);
NodeType::create([
'type' => 'example_a',
diff --git a/core/modules/datetime/tests/src/Functional/DateFilterTest.php b/core/modules/datetime/tests/src/Functional/DateFilterTest.php
index a7d7d524c43e..5fad417afbab 100644
--- a/core/modules/datetime/tests/src/Functional/DateFilterTest.php
+++ b/core/modules/datetime/tests/src/Functional/DateFilterTest.php
@@ -7,7 +7,6 @@
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\node\Entity\NodeType;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
/**
* Test exposed datetime filters functionality.
@@ -50,9 +49,8 @@ class DateFilterTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
- ViewTestData::createTestViews(static::class, ['datetime_test']);
+ protected function setUp($import_test_views = TRUE, $modules = ['datetime_test']): void {
+ parent::setUp($import_test_views, $modules);
// Add a date field to page nodes.
$node_type = NodeType::create([
diff --git a/core/modules/field/tests/src/Functional/Views/FieldTestBase.php b/core/modules/field/tests/src/Functional/Views/FieldTestBase.php
index 5bda2f24da83..831e6cccc805 100644
--- a/core/modules/field/tests/src/Functional/Views/FieldTestBase.php
+++ b/core/modules/field/tests/src/Functional/Views/FieldTestBase.php
@@ -5,7 +5,6 @@
use Drupal\field\Entity\FieldConfig;
use Drupal\node\Entity\NodeType;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
use Drupal\field\Entity\FieldStorageConfig;
/**
@@ -42,16 +41,14 @@ abstract class FieldTestBase extends ViewTestBase {
*/
public $fields;
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['field_test_views']): void {
+ parent::setUp($import_test_views, $modules);
// Ensure the page node type exists.
NodeType::create([
'type' => 'page',
'name' => 'page',
])->save();
-
- ViewTestData::createTestViews(static::class, ['field_test_views']);
}
public function setUpFieldStorages($amount = 3, $type = 'string') {
diff --git a/core/modules/field/tests/src/Functional/Views/FieldUITest.php b/core/modules/field/tests/src/Functional/Views/FieldUITest.php
index cf4cb50822d1..1e143a51c24d 100644
--- a/core/modules/field/tests/src/Functional/Views/FieldUITest.php
+++ b/core/modules/field/tests/src/Functional/Views/FieldUITest.php
@@ -43,8 +43,8 @@ class FieldUITest extends FieldTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['field_test_views']): void {
+ parent::setUp($import_test_views, $modules);
$this->account = $this->drupalCreateUser(['administer views']);
$this->drupalLogin($this->account);
diff --git a/core/modules/forum/tests/src/Functional/Views/ForumIntegrationTest.php b/core/modules/forum/tests/src/Functional/Views/ForumIntegrationTest.php
index 9405ce6f803c..4b26069ad9ac 100644
--- a/core/modules/forum/tests/src/Functional/Views/ForumIntegrationTest.php
+++ b/core/modules/forum/tests/src/Functional/Views/ForumIntegrationTest.php
@@ -5,7 +5,6 @@
use Drupal\node\NodeInterface;
use Drupal\views\Views;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
/**
* Tests the forum integration into views.
@@ -33,10 +32,8 @@ class ForumIntegrationTest extends ViewTestBase {
*/
public static $testViews = ['test_forum_index'];
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
-
- ViewTestData::createTestViews(static::class, ['forum_test_views']);
+ protected function setUp($import_test_views = TRUE, $modules = ['forum_test_views']): void {
+ parent::setUp($import_test_views, $modules);
}
/**
diff --git a/core/modules/jsonapi/jsonapi.module b/core/modules/jsonapi/jsonapi.module
index d0a58ecf9c84..804e78fd6437 100644
--- a/core/modules/jsonapi/jsonapi.module
+++ b/core/modules/jsonapi/jsonapi.module
@@ -175,16 +175,6 @@ function jsonapi_jsonapi_entity_filter_access(EntityTypeInterface $entity_type,
}
}
-/**
- * Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'aggregator_feed'.
- */
-function jsonapi_jsonapi_aggregator_feed_filter_access(EntityTypeInterface $entity_type, AccountInterface $account) {
- // @see \Drupal\aggregator\FeedAccessControlHandler::checkAccess()
- return ([
- JSONAPI_FILTER_AMONG_ALL => AccessResult::allowedIfHasPermission($account, 'access news feeds'),
- ]);
-}
-
/**
* Implements hook_jsonapi_ENTITY_TYPE_filter_access() for 'block_content'.
*/
diff --git a/core/modules/jsonapi/tests/src/Functional/RestExportJsonApiUnsupported.php b/core/modules/jsonapi/tests/src/Functional/RestExportJsonApiUnsupported.php
index 71ec609f4aaf..6eed86f81eef 100644
--- a/core/modules/jsonapi/tests/src/Functional/RestExportJsonApiUnsupported.php
+++ b/core/modules/jsonapi/tests/src/Functional/RestExportJsonApiUnsupported.php
@@ -3,7 +3,6 @@
namespace Drupal\Tests\jsonapi\Functional;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
/**
* Ensures that the 'api_json' format is not supported by the REST module.
@@ -32,9 +31,8 @@ class RestExportJsonApiUnsupported extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
- ViewTestData::createTestViews(static::class, ['rest_test_views']);
+ protected function setUp($import_test_views = TRUE, $modules = ['rest_test_views']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalLogin($this->drupalCreateUser(['administer views']));
}
diff --git a/core/modules/link/tests/src/Functional/Views/LinkViewsTokensTest.php b/core/modules/link/tests/src/Functional/Views/LinkViewsTokensTest.php
index ff5de02b91ef..8c1f5be9d1cb 100644
--- a/core/modules/link/tests/src/Functional/Views/LinkViewsTokensTest.php
+++ b/core/modules/link/tests/src/Functional/Views/LinkViewsTokensTest.php
@@ -5,7 +5,6 @@
use Drupal\field\Entity\FieldConfig;
use Drupal\field\Entity\FieldStorageConfig;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
/**
* Tests the views integration for link tokens.
@@ -43,9 +42,8 @@ class LinkViewsTokensTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
- ViewTestData::createTestViews(static::class, ['link_test_views']);
+ protected function setUp($import_test_views = TRUE, $modules = ['link_test_views']): void {
+ parent::setUp($import_test_views, $modules);
// Create Basic page node type.
$this->drupalCreateContentType([
diff --git a/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php b/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php
index d3abb517febf..8d1d7b8087f3 100644
--- a/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php
+++ b/core/modules/node/tests/src/Functional/Views/BulkFormAccessTest.php
@@ -45,8 +45,8 @@ class BulkFormAccessTest extends NodeTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['node_test_views']): void {
+ parent::setUp($import_test_views, $modules);
// Create Article node type.
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
diff --git a/core/modules/node/tests/src/Functional/Views/BulkFormTest.php b/core/modules/node/tests/src/Functional/Views/BulkFormTest.php
index 0415f1ad69b7..cdbd7b63c701 100644
--- a/core/modules/node/tests/src/Functional/Views/BulkFormTest.php
+++ b/core/modules/node/tests/src/Functional/Views/BulkFormTest.php
@@ -42,8 +42,8 @@ class BulkFormTest extends NodeTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['node_test_views']): void {
+ parent::setUp($import_test_views, $modules);
ConfigurableLanguage::createFromLangcode('en-gb')->save();
ConfigurableLanguage::createFromLangcode('it')->save();
diff --git a/core/modules/node/tests/src/Functional/Views/FilterNodeAccessTest.php b/core/modules/node/tests/src/Functional/Views/FilterNodeAccessTest.php
index 30e75d63cb9a..a3a5f704a349 100644
--- a/core/modules/node/tests/src/Functional/Views/FilterNodeAccessTest.php
+++ b/core/modules/node/tests/src/Functional/Views/FilterNodeAccessTest.php
@@ -39,8 +39,8 @@ class FilterNodeAccessTest extends NodeTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['node_test_views']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
diff --git a/core/modules/node/tests/src/Functional/Views/FrontPageTest.php b/core/modules/node/tests/src/Functional/Views/FrontPageTest.php
index 1ee1b6606dce..7f36d63580f6 100644
--- a/core/modules/node/tests/src/Functional/Views/FrontPageTest.php
+++ b/core/modules/node/tests/src/Functional/Views/FrontPageTest.php
@@ -48,8 +48,8 @@ class FrontPageTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
$this->nodeStorage = $this->container->get('entity_type.manager')
->getStorage('node');
diff --git a/core/modules/node/tests/src/Functional/Views/NodeFieldFilterTest.php b/core/modules/node/tests/src/Functional/Views/NodeFieldFilterTest.php
index e94a11ecb3ac..cc31f1976e25 100644
--- a/core/modules/node/tests/src/Functional/Views/NodeFieldFilterTest.php
+++ b/core/modules/node/tests/src/Functional/Views/NodeFieldFilterTest.php
@@ -38,8 +38,8 @@ class NodeFieldFilterTest extends NodeTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['node_test_views']): void {
+ parent::setUp($import_test_views, $modules);
// Create Page content type.
if ($this->profile != 'standard') {
diff --git a/core/modules/node/tests/src/Functional/Views/NodeLanguageTest.php b/core/modules/node/tests/src/Functional/Views/NodeLanguageTest.php
index c5bd79ccb953..006a3ade0df2 100644
--- a/core/modules/node/tests/src/Functional/Views/NodeLanguageTest.php
+++ b/core/modules/node/tests/src/Functional/Views/NodeLanguageTest.php
@@ -43,8 +43,8 @@ class NodeLanguageTest extends NodeTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp(FALSE);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp(FALSE, $modules);
// Create Page content type.
if ($this->profile != 'standard') {
diff --git a/core/modules/node/tests/src/Functional/Views/NodeTestBase.php b/core/modules/node/tests/src/Functional/Views/NodeTestBase.php
index 0bbeef888e1d..03d81554ba74 100644
--- a/core/modules/node/tests/src/Functional/Views/NodeTestBase.php
+++ b/core/modules/node/tests/src/Functional/Views/NodeTestBase.php
@@ -3,7 +3,6 @@
namespace Drupal\Tests\node\Functional\Views;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
/**
* Base class for all node Views tests.
@@ -18,12 +17,8 @@ abstract class NodeTestBase extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
-
- if ($import_test_views) {
- ViewTestData::createTestViews(static::class, ['node_test_views']);
- }
+ protected function setUp($import_test_views = TRUE, $modules = ['node_test_views']): void {
+ parent::setUp($import_test_views, $modules);
}
}
diff --git a/core/modules/node/tests/src/Functional/Views/PathPluginTest.php b/core/modules/node/tests/src/Functional/Views/PathPluginTest.php
index d4d5ad3dfcef..8645a6cdd317 100644
--- a/core/modules/node/tests/src/Functional/Views/PathPluginTest.php
+++ b/core/modules/node/tests/src/Functional/Views/PathPluginTest.php
@@ -40,8 +40,8 @@ class PathPluginTest extends NodeTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['node_test_views']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalCreateContentType(['type' => 'article']);
diff --git a/core/modules/node/tests/src/Functional/Views/RowPluginTest.php b/core/modules/node/tests/src/Functional/Views/RowPluginTest.php
index 4ea7d42ffdb0..3aba69fa324a 100644
--- a/core/modules/node/tests/src/Functional/Views/RowPluginTest.php
+++ b/core/modules/node/tests/src/Functional/Views/RowPluginTest.php
@@ -41,8 +41,8 @@ class RowPluginTest extends NodeTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['node_test_views']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalCreateContentType(['type' => 'article']);
diff --git a/core/modules/responsive_image/tests/src/Functional/ViewsIntegrationTest.php b/core/modules/responsive_image/tests/src/Functional/ViewsIntegrationTest.php
index 778de1c563b1..463ed601724d 100644
--- a/core/modules/responsive_image/tests/src/Functional/ViewsIntegrationTest.php
+++ b/core/modules/responsive_image/tests/src/Functional/ViewsIntegrationTest.php
@@ -47,8 +47,8 @@ class ViewsIntegrationTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
diff --git a/core/modules/rest/tests/src/Functional/Views/ExcludedFieldTokenTest.php b/core/modules/rest/tests/src/Functional/Views/ExcludedFieldTokenTest.php
index 71f710e9cf0d..36f085c12067 100644
--- a/core/modules/rest/tests/src/Functional/Views/ExcludedFieldTokenTest.php
+++ b/core/modules/rest/tests/src/Functional/Views/ExcludedFieldTokenTest.php
@@ -4,7 +4,6 @@
use Drupal\node\Entity\Node;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
use Drupal\views\Views;
/**
@@ -48,10 +47,8 @@ class ExcludedFieldTokenTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
-
- ViewTestData::createTestViews(static::class, ['rest_test_views']);
+ protected function setUp($import_test_views = TRUE, $modules = ['rest_test_views']): void {
+ parent::setUp($import_test_views, $modules);
// Create some test content.
for ($i = 1; $i <= 10; $i++) {
diff --git a/core/modules/rest/tests/src/Functional/Views/FieldCounterTest.php b/core/modules/rest/tests/src/Functional/Views/FieldCounterTest.php
index 11bfa01b2193..173dd13bb854 100644
--- a/core/modules/rest/tests/src/Functional/Views/FieldCounterTest.php
+++ b/core/modules/rest/tests/src/Functional/Views/FieldCounterTest.php
@@ -4,7 +4,6 @@
use Drupal\node\Entity\Node;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
use Drupal\views\Views;
/**
@@ -48,10 +47,8 @@ class FieldCounterTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
-
- ViewTestData::createTestViews(static::class, ['rest_test_views']);
+ protected function setUp($import_test_views = TRUE, $modules = ['rest_test_views']): void {
+ parent::setUp($import_test_views, $modules);
// Create some test content.
for ($i = 1; $i <= 10; $i++) {
diff --git a/core/modules/rest/tests/src/Functional/Views/RestExportAuthTest.php b/core/modules/rest/tests/src/Functional/Views/RestExportAuthTest.php
index dfc3595aa6d2..72a09a15052f 100644
--- a/core/modules/rest/tests/src/Functional/Views/RestExportAuthTest.php
+++ b/core/modules/rest/tests/src/Functional/Views/RestExportAuthTest.php
@@ -25,8 +25,8 @@ class RestExportAuthTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalLogin($this->drupalCreateUser(['administer views']));
}
diff --git a/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php b/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
index 0a6cad991c0e..f83369b21383 100644
--- a/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
+++ b/core/modules/rest/tests/src/Functional/Views/StyleSerializerTest.php
@@ -15,7 +15,6 @@
use Drupal\views\Entity\View;
use Drupal\views\Plugin\views\display\DisplayPluginBase;
use Drupal\views\Views;
-use Drupal\views\Tests\ViewTestData;
use Symfony\Component\HttpFoundation\Request;
/**
@@ -71,10 +70,8 @@ class StyleSerializerTest extends ViewTestBase {
*/
protected $renderer;
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
-
- ViewTestData::createTestViews(static::class, ['rest_test_views']);
+ protected function setUp($import_test_views = TRUE, $modules = ['rest_test_views']): void {
+ parent::setUp($import_test_views, $modules);
$this->adminUser = $this->drupalCreateUser([
'administer views',
diff --git a/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php b/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php
index 6ff40ce288e1..e92b723a3818 100644
--- a/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php
+++ b/core/modules/statistics/tests/src/Functional/Views/IntegrationTest.php
@@ -3,7 +3,6 @@
namespace Drupal\Tests\statistics\Functional\Views;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
/**
* Tests basic integration of views data from the statistics module.
@@ -47,10 +46,8 @@ class IntegrationTest extends ViewTestBase {
*/
public static $testViews = ['test_statistics_integration'];
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
-
- ViewTestData::createTestViews(static::class, ['statistics_test_views']);
+ protected function setUp($import_test_views = TRUE, $modules = ['statistics_test_views']): void {
+ parent::setUp($import_test_views, $modules);
// Create a new user for viewing nodes and statistics.
$this->webUser = $this->drupalCreateUser([
diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
index 74b24df599aa..15adc76911f1 100644
--- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyFieldFilterTest.php
@@ -57,8 +57,8 @@ class TaxonomyFieldFilterTest extends ViewTestBase {
*/
public $termNames = [];
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
// Add two new languages.
ConfigurableLanguage::createFromLangcode('fr')->save();
diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
index 51d1398b304e..19513fcdf7a0 100644
--- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyIndexTidUiTest.php
@@ -58,8 +58,8 @@ class TaxonomyIndexTidUiTest extends UITestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
$this->adminUser = $this->drupalCreateUser([
'administer taxonomy',
diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyParentUITest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyParentUITest.php
index 6599e7cbd7c4..09b30e8e349d 100644
--- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyParentUITest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyParentUITest.php
@@ -2,7 +2,6 @@
namespace Drupal\Tests\taxonomy\Functional\Views;
-use Drupal\views\Tests\ViewTestData;
use Drupal\Tests\views_ui\Functional\UITestBase;
/**
@@ -35,10 +34,8 @@ class TaxonomyParentUITest extends UITestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
-
- ViewTestData::createTestViews(static::class, ['taxonomy_test_views']);
+ protected function setUp($import_test_views = TRUE, $modules = ['taxonomy_test_views']): void {
+ parent::setUp($import_test_views, $modules);
}
/**
diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyRelationshipTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyRelationshipTest.php
index d034e57cd21d..3466e7aa82c1 100644
--- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyRelationshipTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyRelationshipTest.php
@@ -35,8 +35,8 @@ class TaxonomyRelationshipTest extends TaxonomyTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
// Make term2 parent of term1.
$this->term1->set('parent', $this->term2->id());
diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermArgumentDepthTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermArgumentDepthTest.php
index 67e413cdc24b..9f7cc5187393 100644
--- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermArgumentDepthTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermArgumentDepthTest.php
@@ -42,8 +42,8 @@ class TaxonomyTermArgumentDepthTest extends TaxonomyTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
// Create a term with markup in the label.
$first = $this->createTerm(['name' => '<em>First</em>']);
diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermFilterDepthTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermFilterDepthTest.php
index 481a4c69d336..60f3f9c22d11 100644
--- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermFilterDepthTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermFilterDepthTest.php
@@ -44,8 +44,8 @@ class TaxonomyTermFilterDepthTest extends TaxonomyTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
// Create a hierarchy 3 deep. Note the parent setup function creates two
// top-level terms w/o children.
diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
index c0a521ca20a1..90911684263c 100644
--- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTermViewTest.php
@@ -45,8 +45,8 @@ class TaxonomyTermViewTest extends TaxonomyTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
// Create an administrative user.
$this->adminUser = $this->drupalCreateUser([
diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTestBase.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTestBase.php
index 083ee9e6c411..ed0235b1acf7 100644
--- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTestBase.php
+++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyTestBase.php
@@ -6,9 +6,9 @@
use Drupal\Core\Language\LanguageInterface;
use Drupal\Tests\field\Traits\EntityReferenceTestTrait;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
use Drupal\taxonomy\Entity\Vocabulary;
use Drupal\taxonomy\Entity\Term;
+use Drupal\views\Tests\ViewTestData;
/**
* Base class for all taxonomy tests.
@@ -55,12 +55,19 @@ abstract class TaxonomyTestBase extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ // Important: taxonomy_test_views module must not be in the $modules to
+ // avoid an issue that particular view is already exists.
+ parent::setUp($import_test_views, $modules);
$this->mockStandardInstall();
+ // This needs to be done again after ::mockStandardInstall() to make
+ // test vocabularies available.
+ // Explicitly add taxonomy_test_views to $modules now, so required views are
+ // being created.
+ $modules[] = 'taxonomy_test_views';
if ($import_test_views) {
- ViewTestData::createTestViews(static::class, ['taxonomy_test_views']);
+ ViewTestData::createTestViews(static::class, $modules);
}
$this->term1 = $this->createTerm();
diff --git a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyVocabularyArgumentTest.php b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyVocabularyArgumentTest.php
index 6415390dc104..b29f95b90007 100644
--- a/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyVocabularyArgumentTest.php
+++ b/core/modules/taxonomy/tests/src/Functional/Views/TaxonomyVocabularyArgumentTest.php
@@ -41,8 +41,8 @@ class TaxonomyVocabularyArgumentTest extends TaxonomyTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
// Add default vocabulary to list of vocabularies.
$this->vocabularies[] = $this->vocabulary;
diff --git a/core/modules/user/tests/src/Functional/AccessRoleUITest.php b/core/modules/user/tests/src/Functional/AccessRoleUITest.php
index 4c743a722ae2..1a89de785276 100644
--- a/core/modules/user/tests/src/Functional/AccessRoleUITest.php
+++ b/core/modules/user/tests/src/Functional/AccessRoleUITest.php
@@ -3,7 +3,6 @@
namespace Drupal\Tests\user\Functional;
use Drupal\Tests\views_ui\Functional\UITestBase;
-use Drupal\views\Tests\ViewTestData;
/**
* Tests views role access plugin UI.
@@ -35,10 +34,8 @@ class AccessRoleUITest extends UITestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
-
- ViewTestData::createTestViews(static::class, ['user_test_views']);
+ protected function setUp($import_test_views = TRUE, $modules = ['user_test_views']): void {
+ parent::setUp($import_test_views, $modules);
}
/**
diff --git a/core/modules/user/tests/src/Functional/UserPermissionsTest.php b/core/modules/user/tests/src/Functional/UserPermissionsTest.php
index c8ad0d3bb01b..236505037145 100644
--- a/core/modules/user/tests/src/Functional/UserPermissionsTest.php
+++ b/core/modules/user/tests/src/Functional/UserPermissionsTest.php
@@ -137,11 +137,11 @@ public function testAdministratorRole() {
\Drupal::entityTypeManager()->getStorage('user_role')->resetCache();
$this->assertTrue(Role::load($this->rid)->isAdmin());
- // Enable aggregator module and ensure the 'administer news feeds'
+ // Enable block module and ensure the 'administer news feeds'
// permission is assigned by default.
- \Drupal::service('module_installer')->install(['aggregator']);
+ \Drupal::service('module_installer')->install(['block']);
- $this->assertTrue($this->adminUser->hasPermission('administer news feeds'), 'The permission was automatically assigned to the administrator role');
+ $this->assertTrue($this->adminUser->hasPermission('administer blocks'), 'The permission was automatically assigned to the administrator role');
// Ensure that selecting '- None -' removes the admin role.
$edit = [];
diff --git a/core/modules/user/tests/src/Functional/Views/AccessRoleTest.php b/core/modules/user/tests/src/Functional/Views/AccessRoleTest.php
index 85991406eb69..e3a7b7e44146 100644
--- a/core/modules/user/tests/src/Functional/Views/AccessRoleTest.php
+++ b/core/modules/user/tests/src/Functional/Views/AccessRoleTest.php
@@ -30,6 +30,13 @@ class AccessRoleTest extends AccessTestBase {
*/
protected $defaultTheme = 'stark';
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp($import_test_views = TRUE, $modules = ['user_test_views']): void {
+ parent::setUp($import_test_views, $modules);
+ }
+
/**
* Tests role access plugin.
*/
diff --git a/core/modules/user/tests/src/Functional/Views/AccessTestBase.php b/core/modules/user/tests/src/Functional/Views/AccessTestBase.php
index 93c6bfb1a7eb..d565bb099b57 100644
--- a/core/modules/user/tests/src/Functional/Views/AccessTestBase.php
+++ b/core/modules/user/tests/src/Functional/Views/AccessTestBase.php
@@ -45,8 +45,8 @@ abstract class AccessTestBase extends UserTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalPlaceBlock('system_breadcrumb_block');
$this->enableViewsTestModule();
diff --git a/core/modules/user/tests/src/Functional/Views/FilterPermissionUiTest.php b/core/modules/user/tests/src/Functional/Views/FilterPermissionUiTest.php
index e0d076972284..9a02687c5265 100644
--- a/core/modules/user/tests/src/Functional/Views/FilterPermissionUiTest.php
+++ b/core/modules/user/tests/src/Functional/Views/FilterPermissionUiTest.php
@@ -3,7 +3,6 @@
namespace Drupal\Tests\user\Functional\Views;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
/**
* Tests the permission field handler ui.
@@ -32,10 +31,9 @@ class FilterPermissionUiTest extends ViewTestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['user_test_views']): void {
+ parent::setUp($import_test_views, $modules);
- ViewTestData::createTestViews(static::class, ['user_test_views']);
$this->enableViewsTestModule();
}
diff --git a/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php b/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php
index dde9328d752b..ab365cde59c5 100644
--- a/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php
+++ b/core/modules/user/tests/src/Functional/Views/HandlerFilterUserNameTest.php
@@ -4,7 +4,6 @@
use Drupal\views\Views;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
/**
* Tests the handler of the user: name filter.
@@ -56,10 +55,8 @@ class HandlerFilterUserNameTest extends ViewTestBase {
'uid' => 'uid',
];
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
-
- ViewTestData::createTestViews(static::class, ['user_test_views']);
+ protected function setUp($import_test_views = TRUE, $modules = ['user_test_views']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
diff --git a/core/modules/user/tests/src/Functional/Views/UserChangedTest.php b/core/modules/user/tests/src/Functional/Views/UserChangedTest.php
index 5813915b3a32..ae9ebdd97286 100644
--- a/core/modules/user/tests/src/Functional/Views/UserChangedTest.php
+++ b/core/modules/user/tests/src/Functional/Views/UserChangedTest.php
@@ -3,7 +3,6 @@
namespace Drupal\Tests\user\Functional\Views;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
/**
* Tests the changed field.
@@ -31,10 +30,8 @@ class UserChangedTest extends ViewTestBase {
*/
public static $testViews = ['test_user_changed'];
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
-
- ViewTestData::createTestViews(static::class, ['user_test_views']);
+ protected function setUp($import_test_views = TRUE, $modules = ['user_test_views']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
}
diff --git a/core/modules/user/tests/src/Functional/Views/UserTestBase.php b/core/modules/user/tests/src/Functional/Views/UserTestBase.php
index efc2a8ab1392..3b3a8a90085b 100644
--- a/core/modules/user/tests/src/Functional/Views/UserTestBase.php
+++ b/core/modules/user/tests/src/Functional/Views/UserTestBase.php
@@ -3,7 +3,6 @@
namespace Drupal\Tests\user\Functional\Views;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
use Drupal\user\Entity\User;
/**
@@ -32,10 +31,8 @@ abstract class UserTestBase extends ViewTestBase {
*/
protected $nodes = [];
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
-
- ViewTestData::createTestViews(static::class, ['user_test_views']);
+ protected function setUp($import_test_views = TRUE, $modules = ['user_test_views']): void {
+ parent::setUp($import_test_views, $modules);
$this->users[] = $this->drupalCreateUser();
$this->users[] = User::load(1);
diff --git a/core/modules/views/tests/src/Functional/DefaultViewsTest.php b/core/modules/views/tests/src/Functional/DefaultViewsTest.php
index d2bae2d52483..8a623e3e35d7 100644
--- a/core/modules/views/tests/src/Functional/DefaultViewsTest.php
+++ b/core/modules/views/tests/src/Functional/DefaultViewsTest.php
@@ -56,8 +56,8 @@ class DefaultViewsTest extends ViewTestBase {
'glossary' => ['all'],
];
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalPlaceBlock('page_title_block');
diff --git a/core/modules/views/tests/src/Functional/Entity/BaseFieldAccessTest.php b/core/modules/views/tests/src/Functional/Entity/BaseFieldAccessTest.php
index 43dfdd1741ea..fcebefd0a6de 100644
--- a/core/modules/views/tests/src/Functional/Entity/BaseFieldAccessTest.php
+++ b/core/modules/views/tests/src/Functional/Entity/BaseFieldAccessTest.php
@@ -4,7 +4,6 @@
use Drupal\entity_test\Entity\EntityTest;
use Drupal\Tests\views\Functional\ViewTestBase;
-use Drupal\views\Tests\ViewTestData;
/**
* Tests views base field access.
@@ -37,10 +36,9 @@ class BaseFieldAccessTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config', 'comment_test_views']): void {
+ parent::setUp($import_test_views, $modules);
- ViewTestData::createTestViews(static::class, ['comment_test_views']);
\Drupal::state()->set('entity_test.views_data', [
'entity_test' => [
'test_text_access' => [
diff --git a/core/modules/views/tests/src/Functional/Entity/FieldEntityTest.php b/core/modules/views/tests/src/Functional/Entity/FieldEntityTest.php
index 09525cd6ca5f..5385121ea42f 100644
--- a/core/modules/views/tests/src/Functional/Entity/FieldEntityTest.php
+++ b/core/modules/views/tests/src/Functional/Entity/FieldEntityTest.php
@@ -41,13 +41,13 @@ class FieldEntityTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp(FALSE);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp(FALSE, $modules);
$this->drupalCreateContentType(['type' => 'page']);
$this->addDefaultCommentField('node', 'page');
- ViewTestData::createTestViews(static::class, ['views_test_config']);
+ ViewTestData::createTestViews(static::class, $modules);
}
/**
diff --git a/core/modules/views/tests/src/Functional/Entity/FieldEntityTranslationTest.php b/core/modules/views/tests/src/Functional/Entity/FieldEntityTranslationTest.php
index c6ef36937125..4b5250452945 100644
--- a/core/modules/views/tests/src/Functional/Entity/FieldEntityTranslationTest.php
+++ b/core/modules/views/tests/src/Functional/Entity/FieldEntityTranslationTest.php
@@ -39,8 +39,8 @@ class FieldEntityTranslationTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$node_type = NodeType::create([
'type' => 'article',
diff --git a/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php b/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php
index f6e063f450da..c62e2fd45ee8 100644
--- a/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php
+++ b/core/modules/views/tests/src/Functional/Entity/FieldRenderedEntityTranslationTest.php
@@ -43,8 +43,8 @@ class FieldRenderedEntityTranslationTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->entityTypeManager = $this->container->get('entity_type.manager');
diff --git a/core/modules/views/tests/src/Functional/Handler/AreaTest.php b/core/modules/views/tests/src/Functional/Handler/AreaTest.php
index 4ab118a48e2e..8c516c76efea 100644
--- a/core/modules/views/tests/src/Functional/Handler/AreaTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/AreaTest.php
@@ -34,8 +34,8 @@ class AreaTest extends ViewTestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
}
diff --git a/core/modules/views/tests/src/Functional/Handler/AreaTitleWebTest.php b/core/modules/views/tests/src/Functional/Handler/AreaTitleWebTest.php
index 1f21a8ecd123..8f00844a47d7 100644
--- a/core/modules/views/tests/src/Functional/Handler/AreaTitleWebTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/AreaTitleWebTest.php
@@ -28,8 +28,8 @@ class AreaTitleWebTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
}
diff --git a/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php b/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php
index 98c552c7fa55..f7987ff19599 100644
--- a/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FieldDropButtonTest.php
@@ -34,8 +34,8 @@ class FieldDropButtonTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$admin_user = $this->drupalCreateUser([
'access content overview',
diff --git a/core/modules/views/tests/src/Functional/Handler/FieldEntityLinkBaseTest.php b/core/modules/views/tests/src/Functional/Handler/FieldEntityLinkBaseTest.php
index cf1504561d98..433f4aee6fd6 100644
--- a/core/modules/views/tests/src/Functional/Handler/FieldEntityLinkBaseTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FieldEntityLinkBaseTest.php
@@ -33,8 +33,8 @@ class FieldEntityLinkBaseTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
diff --git a/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php b/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
index 8741e81e4f81..10307b2b1e5a 100644
--- a/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FieldEntityOperationsTest.php
@@ -33,8 +33,8 @@ class FieldEntityOperationsTest extends ViewTestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
// Create Article content type.
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
diff --git a/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsWebTest.php b/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsWebTest.php
index 1afa59c94600..f57957953fca 100644
--- a/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsWebTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FieldGroupRowsWebTest.php
@@ -64,8 +64,8 @@ class FieldGroupRowsWebTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
// Create content type with unlimited text field.
$this->nodeType = $this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
diff --git a/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php b/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
index 1526897664f2..17c7ee0f3fb1 100644
--- a/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FieldWebTest.php
@@ -48,8 +48,8 @@ class FieldWebTest extends ViewTestBase {
'views_test_data_name' => 'name',
];
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
}
diff --git a/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php b/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
index 486910191788..03774b226660 100644
--- a/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/FilterDateTest.php
@@ -43,8 +43,8 @@ class FilterDateTest extends ViewTestBase {
*/
public $dateFormatter;
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->dateFormatter = $this->container->get('date.formatter');
// Add a date field so we can test datetime handling.
diff --git a/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php b/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php
index 1094ddbba236..52925792a882 100644
--- a/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/HandlerAllTest.php
@@ -25,7 +25,6 @@ class HandlerAllTest extends ViewTestBase {
* @var array
*/
protected static $modules = [
- 'aggregator',
'book',
'block',
'comment',
diff --git a/core/modules/views/tests/src/Functional/Handler/HandlerTest.php b/core/modules/views/tests/src/Functional/Handler/HandlerTest.php
index dde6c344f9ba..9844959396cb 100644
--- a/core/modules/views/tests/src/Functional/Handler/HandlerTest.php
+++ b/core/modules/views/tests/src/Functional/Handler/HandlerTest.php
@@ -39,8 +39,8 @@ class HandlerTest extends ViewTestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalCreateContentType(['type' => 'page']);
$this->addDefaultCommentField('node', 'page');
$this->enableViewsTestModule();
diff --git a/core/modules/views/tests/src/Functional/Plugin/AccessTest.php b/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
index 839c1d324ca3..80630bfc5535 100644
--- a/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/AccessTest.php
@@ -48,8 +48,8 @@ class AccessTest extends ViewTestBase {
*/
protected $normalUser;
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
diff --git a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
index 2ccbb47daeb3..e87372c7ba0c 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ArgumentDefaultTest.php
@@ -42,8 +42,8 @@ class ArgumentDefaultTest extends ViewTestBase {
*/
protected static $modules = ['node', 'views_ui', 'block'];
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
}
diff --git a/core/modules/views/tests/src/Functional/Plugin/CacheTagTest.php b/core/modules/views/tests/src/Functional/Plugin/CacheTagTest.php
index 205da5d4343e..8fb8ab3c42ef 100644
--- a/core/modules/views/tests/src/Functional/Plugin/CacheTagTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/CacheTagTest.php
@@ -76,8 +76,8 @@ class CacheTagTest extends ViewTestBase {
*/
protected $user;
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalCreateContentType(['type' => 'page', 'name' => 'Basic page']);
$this->drupalCreateContentType(['type' => 'article', 'name' => 'Article']);
diff --git a/core/modules/views/tests/src/Functional/Plugin/CacheWebTest.php b/core/modules/views/tests/src/Functional/Plugin/CacheWebTest.php
index 174cac9c614d..5022a7aaaae2 100644
--- a/core/modules/views/tests/src/Functional/Plugin/CacheWebTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/CacheWebTest.php
@@ -39,8 +39,8 @@ class CacheWebTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
}
diff --git a/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php b/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
index c6da4e0af7c0..d71c85509c7c 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersBlockContextTest.php
@@ -57,8 +57,8 @@ class ContextualFiltersBlockContextTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
ViewTestData::createTestViews(static::class, ['block_test_views']);
$this->enableViewsTestModule();
diff --git a/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersStringTest.php b/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersStringTest.php
index 94849beda2af..2cdff6fff0c6 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersStringTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ContextualFiltersStringTest.php
@@ -50,8 +50,8 @@ class ContextualFiltersStringTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
// Create Roles and users.
$this->role1 = $this->drupalCreateRole(['access content'], 'editor', 'Editor');
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php b/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
index c80bd97323e7..6d29f37f613b 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisabledDisplayTest.php
@@ -31,8 +31,8 @@ class DisabledDisplayTest extends ViewTestBase {
*/
protected $defaultTheme = 'classy';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php
index 42a6c6299ddb..3b02dbf76c6e 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayAttachmentTest.php
@@ -32,8 +32,8 @@ class DisplayAttachmentTest extends ViewTestBase {
*/
protected $defaultTheme = 'classy';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
index 3cd787fc10ec..ebacfc5c2794 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayEntityReferenceTest.php
@@ -70,8 +70,8 @@ class DisplayEntityReferenceTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalLogin($this->drupalCreateUser(['administer views']));
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
index 21c3ad29be7a..4665899d97b6 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTest.php
@@ -36,8 +36,8 @@ class DisplayFeedTest extends ViewTestBase {
*/
protected $defaultTheme = 'classy';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php
index ba9998aa80d6..d5ceed177d94 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayFeedTranslationTest.php
@@ -48,8 +48,8 @@ class DisplayFeedTranslationTest extends ViewTestBase {
*/
protected $langcodes;
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
index 6fc75547dee1..c0f43960a853 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayPageWebTest.php
@@ -37,8 +37,8 @@ class DisplayPageWebTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
$this->drupalPlaceBlock('local_tasks_block');
diff --git a/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php b/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
index 5769c697d1fd..fa4637ab909a 100644
--- a/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/DisplayTest.php
@@ -33,8 +33,8 @@ class DisplayTest extends ViewTestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp();
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
diff --git a/core/modules/views/tests/src/Functional/Plugin/ExposedFormCheckboxesTest.php b/core/modules/views/tests/src/Functional/Plugin/ExposedFormCheckboxesTest.php
index fb626b4ba346..e4b1b5417d06 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ExposedFormCheckboxesTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ExposedFormCheckboxesTest.php
@@ -51,8 +51,8 @@ class ExposedFormCheckboxesTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp(FALSE);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp(FALSE, $modules);
// Create a vocabulary and entity reference field so we can test the "is all
// of" filter operator. Must be done ahead of the view import so the
diff --git a/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php b/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
index ea733a5b4a30..935d72b07817 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ExposedFormTest.php
@@ -45,8 +45,8 @@ class ExposedFormTest extends ViewTestBase {
*/
protected $nodes = [];
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
diff --git a/core/modules/views/tests/src/Functional/Plugin/FilterTest.php b/core/modules/views/tests/src/Functional/Plugin/FilterTest.php
index 8283e14f5af7..9a0edeaa2d5d 100644
--- a/core/modules/views/tests/src/Functional/Plugin/FilterTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/FilterTest.php
@@ -34,8 +34,8 @@ class FilterTest extends ViewTestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
diff --git a/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php b/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php
index d41fb12882e1..4396b88f5bde 100644
--- a/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/MenuLinkTest.php
@@ -48,8 +48,8 @@ class MenuLinkTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
diff --git a/core/modules/views/tests/src/Functional/Plugin/MiniPagerTest.php b/core/modules/views/tests/src/Functional/Plugin/MiniPagerTest.php
index 7c6c54c85f6a..05a6aac213c0 100644
--- a/core/modules/views/tests/src/Functional/Plugin/MiniPagerTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/MiniPagerTest.php
@@ -39,8 +39,8 @@ class MiniPagerTest extends ViewTestBase {
*/
protected $nodes;
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalCreateContentType(['type' => 'page']);
// Create a bunch of test nodes.
diff --git a/core/modules/views/tests/src/Functional/Plugin/MonthDatePluginTest.php b/core/modules/views/tests/src/Functional/Plugin/MonthDatePluginTest.php
index 031a34526658..b9281a829e03 100644
--- a/core/modules/views/tests/src/Functional/Plugin/MonthDatePluginTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/MonthDatePluginTest.php
@@ -48,8 +48,8 @@ class MonthDatePluginTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$utc = new \DateTimeZone('UTC');
$format = 'Y-m-d h:i:s';
$this->node1 = $this->drupalCreateNode([
diff --git a/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php b/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php
index 5785730c22d4..d9e4099f0ae9 100644
--- a/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/NumericFormatPluralTest.php
@@ -33,8 +33,8 @@ class NumericFormatPluralTest extends ViewTestBase {
*/
public static $testViews = ['numeric_test'];
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$web_user = $this->drupalCreateUser([
'administer views',
diff --git a/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php b/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php
index 902f985d2ee0..43bf66a4a504 100644
--- a/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/StyleSummaryTest.php
@@ -35,8 +35,8 @@ class StyleSummaryTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
// Create 5 entities per bundle, to allow a summary overview per bundle.
for ($i = 0; $i < 5; $i++) {
diff --git a/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php b/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
index 38c7a08dde5f..08a60a87c337 100644
--- a/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/StyleTableTest.php
@@ -29,8 +29,8 @@ class StyleTableTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
}
diff --git a/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php b/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php
index 9550cfdceb89..cd93f42a40ce 100644
--- a/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php
+++ b/core/modules/views/tests/src/Functional/Plugin/ViewsBulkTest.php
@@ -30,8 +30,8 @@ class ViewsBulkTest extends ViewTestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalCreateContentType(['type' => 'page']);
$this->admin_user = $this->createUser(['bypass node access', 'administer nodes', 'access content overview']);
diff --git a/core/modules/views/tests/src/Functional/RenderCacheWebTest.php b/core/modules/views/tests/src/Functional/RenderCacheWebTest.php
index a14ac2558eb9..2d15924e75d3 100644
--- a/core/modules/views/tests/src/Functional/RenderCacheWebTest.php
+++ b/core/modules/views/tests/src/Functional/RenderCacheWebTest.php
@@ -36,8 +36,8 @@ class RenderCacheWebTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$node_type = $this->drupalCreateContentType(['type' => 'test_type']);
$node = Node::create([
diff --git a/core/modules/views/tests/src/Functional/TaxonomyGlossaryTest.php b/core/modules/views/tests/src/Functional/TaxonomyGlossaryTest.php
index c14349ff2331..f883bb0999a3 100644
--- a/core/modules/views/tests/src/Functional/TaxonomyGlossaryTest.php
+++ b/core/modules/views/tests/src/Functional/TaxonomyGlossaryTest.php
@@ -39,8 +39,8 @@ class TaxonomyGlossaryTest extends ViewTestBase {
*/
protected $taxonomyTerms;
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
diff --git a/core/modules/views/tests/src/Functional/ViewAjaxTest.php b/core/modules/views/tests/src/Functional/ViewAjaxTest.php
index 236cefa63af5..bb525f53fe4c 100644
--- a/core/modules/views/tests/src/Functional/ViewAjaxTest.php
+++ b/core/modules/views/tests/src/Functional/ViewAjaxTest.php
@@ -23,8 +23,8 @@ class ViewAjaxTest extends ViewTestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
}
diff --git a/core/modules/views/tests/src/Functional/ViewElementTest.php b/core/modules/views/tests/src/Functional/ViewElementTest.php
index fa406c8ceeaf..438927ad4e7a 100644
--- a/core/modules/views/tests/src/Functional/ViewElementTest.php
+++ b/core/modules/views/tests/src/Functional/ViewElementTest.php
@@ -26,8 +26,8 @@ class ViewElementTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
}
diff --git a/core/modules/views/tests/src/Functional/ViewTestBase.php b/core/modules/views/tests/src/Functional/ViewTestBase.php
index 30889ef25413..ea33d9b48640 100644
--- a/core/modules/views/tests/src/Functional/ViewTestBase.php
+++ b/core/modules/views/tests/src/Functional/ViewTestBase.php
@@ -29,10 +29,10 @@ abstract class ViewTestBase extends BrowserTestBase {
*/
protected static $modules = ['views', 'views_test_config'];
- protected function setUp($import_test_views = TRUE): void {
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
parent::setUp();
if ($import_test_views) {
- ViewTestData::createTestViews(static::class, ['views_test_config']);
+ ViewTestData::createTestViews(static::class, $modules);
}
}
diff --git a/core/modules/views/tests/src/Functional/ViewTranslationTest.php b/core/modules/views/tests/src/Functional/ViewTranslationTest.php
index 9df3ea7e1d2a..b29df6c6c9a7 100644
--- a/core/modules/views/tests/src/Functional/ViewTranslationTest.php
+++ b/core/modules/views/tests/src/Functional/ViewTranslationTest.php
@@ -31,8 +31,8 @@ class ViewTranslationTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
$this->drupalPlaceBlock('system_breadcrumb_block');
diff --git a/core/modules/views/tests/src/Functional/ViewsEscapingTest.php b/core/modules/views/tests/src/Functional/ViewsEscapingTest.php
index 440292961fbe..a016723d7d94 100644
--- a/core/modules/views/tests/src/Functional/ViewsEscapingTest.php
+++ b/core/modules/views/tests/src/Functional/ViewsEscapingTest.php
@@ -35,8 +35,8 @@ class ViewsEscapingTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp(TRUE);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp(TRUE, $modules);
$this->enableViewsTestModule();
}
diff --git a/core/modules/views/tests/src/Functional/ViewsFormMultipleTest.php b/core/modules/views/tests/src/Functional/ViewsFormMultipleTest.php
index 868de09ac6c6..1c8c9e81ce32 100644
--- a/core/modules/views/tests/src/Functional/ViewsFormMultipleTest.php
+++ b/core/modules/views/tests/src/Functional/ViewsFormMultipleTest.php
@@ -24,8 +24,8 @@ class ViewsFormMultipleTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
}
diff --git a/core/modules/views/tests/src/Functional/ViewsNoResultsBehaviorTest.php b/core/modules/views/tests/src/Functional/ViewsNoResultsBehaviorTest.php
index c6833bb88f39..479cdb233ec3 100644
--- a/core/modules/views/tests/src/Functional/ViewsNoResultsBehaviorTest.php
+++ b/core/modules/views/tests/src/Functional/ViewsNoResultsBehaviorTest.php
@@ -24,8 +24,8 @@ class ViewsNoResultsBehaviorTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp();
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
$user = $this->createUser([], NULL, TRUE);
$this->drupalLogin($user);
diff --git a/core/modules/views/tests/src/Functional/ViewsThemeIntegrationTest.php b/core/modules/views/tests/src/Functional/ViewsThemeIntegrationTest.php
index db99f7a6d275..17dc3f78b898 100644
--- a/core/modules/views/tests/src/Functional/ViewsThemeIntegrationTest.php
+++ b/core/modules/views/tests/src/Functional/ViewsThemeIntegrationTest.php
@@ -38,8 +38,8 @@ class ViewsThemeIntegrationTest extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
}
diff --git a/core/modules/views/tests/src/Functional/Wizard/BasicTest.php b/core/modules/views/tests/src/Functional/Wizard/BasicTest.php
index 6486e6c4e07d..0909299bf6cb 100644
--- a/core/modules/views/tests/src/Functional/Wizard/BasicTest.php
+++ b/core/modules/views/tests/src/Functional/Wizard/BasicTest.php
@@ -18,8 +18,8 @@ class BasicTest extends WizardTestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalPlaceBlock('page_title_block');
}
diff --git a/core/modules/views/tests/src/Functional/Wizard/ItemsPerPageTest.php b/core/modules/views/tests/src/Functional/Wizard/ItemsPerPageTest.php
index 0a17137271da..7bddee93d9e3 100644
--- a/core/modules/views/tests/src/Functional/Wizard/ItemsPerPageTest.php
+++ b/core/modules/views/tests/src/Functional/Wizard/ItemsPerPageTest.php
@@ -15,8 +15,8 @@ class ItemsPerPageTest extends WizardTestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalPlaceBlock('page_title_block');
}
diff --git a/core/modules/views/tests/src/Functional/Wizard/SortingTest.php b/core/modules/views/tests/src/Functional/Wizard/SortingTest.php
index b52b3f73aa6a..51d67a988aed 100644
--- a/core/modules/views/tests/src/Functional/Wizard/SortingTest.php
+++ b/core/modules/views/tests/src/Functional/Wizard/SortingTest.php
@@ -14,8 +14,8 @@ class SortingTest extends WizardTestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalPlaceBlock('page_title_block');
}
diff --git a/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php b/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
index 188d3bcd12a6..7ba92062fc63 100644
--- a/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
+++ b/core/modules/views/tests/src/Functional/Wizard/TaggedWithTest.php
@@ -71,8 +71,8 @@ class TaggedWithTest extends WizardTestBase {
*/
protected $tagField;
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
// Create two content types. One will have an autocomplete tagging field,
// and one won't.
diff --git a/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php b/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php
index 41812b72b3cc..42c3ed03d58b 100644
--- a/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php
+++ b/core/modules/views/tests/src/Functional/Wizard/WizardTestBase.php
@@ -16,8 +16,8 @@ abstract class WizardTestBase extends ViewTestBase {
*/
protected static $modules = ['node', 'views_ui', 'block', 'rest'];
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
// Create and log in a user with administer views permission.
$views_admin = $this->drupalCreateUser([
diff --git a/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php b/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
index 771f644b2a14..09aacc689187 100644
--- a/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DefaultViewsTest.php
@@ -25,8 +25,8 @@ class DefaultViewsTest extends UITestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->placeBlock('page_title_block');
}
diff --git a/core/modules/views_ui/tests/src/Functional/DisplayFeedTest.php b/core/modules/views_ui/tests/src/Functional/DisplayFeedTest.php
index 0005722f2183..d697849cc838 100644
--- a/core/modules/views_ui/tests/src/Functional/DisplayFeedTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DisplayFeedTest.php
@@ -15,14 +15,14 @@ class DisplayFeedTest extends UITestBase {
*
* @var array
*/
- public static $testViews = ['test_display_feed', 'test_style_opml'];
+ public static $testViews = ['test_display_feed'];
/**
* Modules to enable.
*
* @var array
*/
- protected static $modules = ['views_ui', 'aggregator'];
+ protected static $modules = ['views_ui'];
/**
* {@inheritdoc}
@@ -33,7 +33,7 @@ class DisplayFeedTest extends UITestBase {
* Tests feed display admin UI.
*/
public function testFeedUI() {
- // Test both RSS and OPML feeds.
+ // Test the RSS feed.
foreach (self::$testViews as $view_name) {
$this->checkFeedViewUi($view_name);
}
diff --git a/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php b/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
index 384e9a5c9a70..032cb5843f36 100644
--- a/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DisplayPathTest.php
@@ -16,8 +16,8 @@ class DisplayPathTest extends UITestBase {
use AssertPageCacheContextsAndTagsTrait;
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->placeBlock('page_title_block');
}
diff --git a/core/modules/views_ui/tests/src/Functional/DuplicateTest.php b/core/modules/views_ui/tests/src/Functional/DuplicateTest.php
index 6376381f5ddd..c461c839a29e 100644
--- a/core/modules/views_ui/tests/src/Functional/DuplicateTest.php
+++ b/core/modules/views_ui/tests/src/Functional/DuplicateTest.php
@@ -14,8 +14,8 @@ class DuplicateTest extends UITestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->placeBlock('page_title_block');
}
diff --git a/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php b/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php
index 219951d15544..f1f959958ea8 100644
--- a/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php
+++ b/core/modules/views_ui/tests/src/Functional/ExposedFormUITest.php
@@ -44,8 +44,8 @@ class ExposedFormUITest extends UITestBase {
*/
protected $groupFormUiErrors = [];
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalCreateContentType(['type' => 'article']);
$this->drupalCreateContentType(['type' => 'page']);
diff --git a/core/modules/views_ui/tests/src/Functional/FilterUITest.php b/core/modules/views_ui/tests/src/Functional/FilterUITest.php
index 33231e49922a..a4af05d336ae 100644
--- a/core/modules/views_ui/tests/src/Functional/FilterUITest.php
+++ b/core/modules/views_ui/tests/src/Functional/FilterUITest.php
@@ -32,8 +32,8 @@ class FilterUITest extends UITestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalCreateContentType(['type' => 'page']);
}
diff --git a/core/modules/views_ui/tests/src/Functional/HandlerTest.php b/core/modules/views_ui/tests/src/Functional/HandlerTest.php
index e5235989fca6..69f236f9f1f0 100644
--- a/core/modules/views_ui/tests/src/Functional/HandlerTest.php
+++ b/core/modules/views_ui/tests/src/Functional/HandlerTest.php
@@ -35,8 +35,8 @@ class HandlerTest extends UITestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->placeBlock('page_title_block');
ViewTestData::createTestViews(static::class, ['node_test_views']);
diff --git a/core/modules/views_ui/tests/src/Functional/NewViewConfigSchemaTest.php b/core/modules/views_ui/tests/src/Functional/NewViewConfigSchemaTest.php
index 93c521793003..535afb26259c 100644
--- a/core/modules/views_ui/tests/src/Functional/NewViewConfigSchemaTest.php
+++ b/core/modules/views_ui/tests/src/Functional/NewViewConfigSchemaTest.php
@@ -21,7 +21,6 @@ class NewViewConfigSchemaTest extends UITestBase {
'file',
'taxonomy',
'dblog',
- 'aggregator',
];
/**
@@ -45,9 +44,6 @@ public function testNewViews() {
'file_managed',
'taxonomy_term',
'watchdog',
- // Standard derivative classes.
- 'standard:aggregator_feed',
- 'standard:aggregator_item',
];
foreach ($wizards as $wizard_key) {
$edit = [];
diff --git a/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php b/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php
index 968ff49a64af..9c0ed2b23b99 100644
--- a/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php
+++ b/core/modules/views_ui/tests/src/Functional/OverrideDisplaysTest.php
@@ -14,8 +14,8 @@ class OverrideDisplaysTest extends UITestBase {
*/
protected $defaultTheme = 'stark';
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalPlaceBlock('page_title_block');
}
diff --git a/core/modules/views_ui/tests/src/Functional/SettingsTest.php b/core/modules/views_ui/tests/src/Functional/SettingsTest.php
index 7b04e4db5316..8256af296b5c 100644
--- a/core/modules/views_ui/tests/src/Functional/SettingsTest.php
+++ b/core/modules/views_ui/tests/src/Functional/SettingsTest.php
@@ -26,8 +26,8 @@ class SettingsTest extends UITestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalPlaceBlock('local_tasks_block');
}
diff --git a/core/modules/views_ui/tests/src/Functional/TranslatedViewTest.php b/core/modules/views_ui/tests/src/Functional/TranslatedViewTest.php
index 5f4582460973..edc9a6db61a0 100644
--- a/core/modules/views_ui/tests/src/Functional/TranslatedViewTest.php
+++ b/core/modules/views_ui/tests/src/Functional/TranslatedViewTest.php
@@ -42,8 +42,8 @@ class TranslatedViewTest extends UITestBase {
*/
protected $adminUser;
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
$permissions = [
'administer site configuration',
diff --git a/core/modules/views_ui/tests/src/Functional/UITestBase.php b/core/modules/views_ui/tests/src/Functional/UITestBase.php
index c15877fbf9b6..3f5cb0476b97 100644
--- a/core/modules/views_ui/tests/src/Functional/UITestBase.php
+++ b/core/modules/views_ui/tests/src/Functional/UITestBase.php
@@ -33,8 +33,8 @@ abstract class UITestBase extends ViewTestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp($import_test_views, $modules);
$this->enableViewsTestModule();
diff --git a/core/modules/views_ui/tests/src/Functional/UnsavedPreviewTest.php b/core/modules/views_ui/tests/src/Functional/UnsavedPreviewTest.php
index 46589eb9375d..847aa0e9a501 100644
--- a/core/modules/views_ui/tests/src/Functional/UnsavedPreviewTest.php
+++ b/core/modules/views_ui/tests/src/Functional/UnsavedPreviewTest.php
@@ -36,8 +36,8 @@ class UnsavedPreviewTest extends UITestBase {
/**
* Sets up a Drupal site for running functional and integration tests.
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp(FALSE);
+ protected function setUp($import_test_views = TRUE, $modules = ['views_test_config']): void {
+ parent::setUp(FALSE, $modules);
$this->adminUser = $this->drupalCreateUser(['administer views']);
$this->drupalLogin($this->adminUser);
diff --git a/core/modules/views_ui/tests/src/Functional/ViewsListTest.php b/core/modules/views_ui/tests/src/Functional/ViewsListTest.php
index cebbf94f7169..93f80b3e15df 100644
--- a/core/modules/views_ui/tests/src/Functional/ViewsListTest.php
+++ b/core/modules/views_ui/tests/src/Functional/ViewsListTest.php
@@ -34,8 +34,8 @@ class ViewsListTest extends UITestBase {
/**
* {@inheritdoc}
*/
- protected function setUp($import_test_views = TRUE): void {
- parent::setUp($import_test_views);
+ protected function setUp($import_test_views = TRUE, $modules = []): void {
+ parent::setUp($import_test_views, $modules);
$this->drupalPlaceBlock('local_tasks_block');
$this->drupalPlaceBlock('local_actions_block');
diff --git a/core/tests/Drupal/KernelTests/Core/Queue/QueueSerializationTest.php b/core/tests/Drupal/KernelTests/Core/Queue/QueueSerializationTest.php
index 2f70eb6a36f0..c3f4f814b39a 100644
--- a/core/tests/Drupal/KernelTests/Core/Queue/QueueSerializationTest.php
+++ b/core/tests/Drupal/KernelTests/Core/Queue/QueueSerializationTest.php
@@ -18,19 +18,12 @@ class QueueSerializationTest extends KernelTestBase implements FormInterface {
use DependencySerializationTrait;
- /**
- * A queue instance.
- *
- * @var \Drupal\Core\Queue\DatabaseQueue
- */
- protected $queue;
-
/**
* Modules to enable.
*
* @var array
*/
- protected static $modules = ['system', 'user', 'aggregator'];
+ protected static $modules = ['system', 'user'];
/**
* {@inheritdoc}
@@ -79,7 +72,9 @@ protected function setUp(): void {
parent::setUp();
$this->installSchema('system', ['sequences']);
$this->installEntitySchema('user');
- $this->queue = \Drupal::service('queue.database')->get('aggregator_refresh');
+ // We only need a valid \Drupal\Core\Queue\DatabaseQueue object here, not
+ // an actual valid queue.
+ $this->queue = \Drupal::service('queue.database')->get('fake_a_queue');
$test_user = User::create([
'name' => 'foobar',
'mail' => 'foobar@example.com',
diff --git a/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php b/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php
index 8246cdb1d80d..18d250c2d540 100644
--- a/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php
+++ b/core/tests/Drupal/Tests/Core/Render/BubbleableMetadataTest.php
@@ -380,65 +380,6 @@ public function testMergeAttachmentsLibraryMerging() {
$this->assertSame($expected_settings_two, $merged['drupalSettings']['commonTestRealWorldAlmostIdentical']);
}
- /**
- * Tests feed asset merging.
- *
- * @covers ::mergeAttachments
- *
- * @dataProvider providerTestMergeAttachmentsFeedMerging
- */
- public function testMergeAttachmentsFeedMerging($a, $b, $expected) {
- $this->assertSame($expected, BubbleableMetadata::mergeAttachments($a, $b));
- }
-
- /**
- * Data provider for testMergeAttachmentsFeedMerging.
- *
- * @return array
- */
- public function providerTestMergeAttachmentsFeedMerging() {
- $feed_a = [
- 'aggregator/rss',
- 'Feed title',
- ];
-
- $feed_b = [
- 'taxonomy/term/1/feed',
- 'RSS - foo',
- ];
-
- $a = [
- 'feed' => [
- $feed_a,
- ],
- ];
- $b = [
- 'feed' => [
- $feed_b,
- ],
- ];
-
- $expected_a = [
- 'feed' => [
- $feed_a,
- $feed_b,
- ],
- ];
-
- // Merging in the opposite direction yields the opposite library order.
- $expected_b = [
- 'feed' => [
- $feed_b,
- $feed_a,
- ],
- ];
-
- return [
- [$a, $b, $expected_a],
- [$b, $a, $expected_b],
- ];
- }
-
/**
* Tests html_head asset merging.
*
--
GitLab