From 3388371b4c18e5496fa2f5a10a72fdfdc1e27189 Mon Sep 17 00:00:00 2001
From: Alex Pott <alex.a.pott@googlemail.com>
Date: Sun, 17 Jul 2022 09:56:02 +0100
Subject: [PATCH] Issue #3088234 by tim.plunkett: Use $defaultTheme for using
views_test_classy_subtheme
---
.../FunctionalJavascript/AdminAjaxTest.php | 62 +++++++++++++++++++
.../src/FunctionalJavascript/DisplayTest.php | 25 --------
2 files changed, 62 insertions(+), 25 deletions(-)
create mode 100644 core/modules/views_ui/tests/src/FunctionalJavascript/AdminAjaxTest.php
diff --git a/core/modules/views_ui/tests/src/FunctionalJavascript/AdminAjaxTest.php b/core/modules/views_ui/tests/src/FunctionalJavascript/AdminAjaxTest.php
new file mode 100644
index 000000000000..680e041c2d4a
--- /dev/null
+++ b/core/modules/views_ui/tests/src/FunctionalJavascript/AdminAjaxTest.php
@@ -0,0 +1,62 @@
+<?php
+
+namespace Drupal\Tests\views_ui\FunctionalJavascript;
+
+use Drupal\FunctionalJavascriptTests\WebDriverTestBase;
+
+/**
+ * Tests the admin UI AJAX interactions.
+ *
+ * @group views_ui
+ */
+class AdminAjaxTest extends WebDriverTestBase {
+
+ /**
+ * {@inheritdoc}
+ */
+ protected static $modules = [
+ 'views_ui',
+ ];
+
+ /**
+ * {@inheritdoc}
+ */
+ protected $defaultTheme = 'views_test_classy_subtheme';
+
+ /**
+ * {@inheritdoc}
+ */
+ protected function setUp(): void {
+ parent::setUp();
+
+ $this->drupalLogin($this->createUser([
+ 'administer views',
+ ]));
+ }
+
+ /**
+ * Confirms that form_alter is triggered after AJAX rebuilds.
+ */
+ public function testAjaxRebuild() {
+ \Drupal::service('theme_installer')->install(['views_test_classy_subtheme']);
+
+ $this->config('system.theme')
+ ->set('default', 'views_test_classy_subtheme')
+ ->save();
+
+ $page = $this->getSession()->getPage();
+ $assert_session = $this->assertSession();
+
+ $this->drupalGet('admin/structure/views/view/user_admin_people');
+ $assert_session->pageTextContains('This is text added to the display tabs at the top');
+ $assert_session->pageTextContains('This is text added to the display edit form');
+ $page->clickLink('User: Name (Username)');
+ $assert_session->waitForElementVisible('css', '.views-ui-dialog');
+ $page->fillField('Label', 'New Title');
+ $page->find('css', '.ui-dialog-buttonset button:contains("Apply")')->press();
+ $assert_session->waitForElementRemoved('css', '.views-ui-dialog');
+ $assert_session->pageTextContains('This is text added to the display tabs at the top');
+ $assert_session->pageTextContains('This is text added to the display edit form');
+ }
+
+}
diff --git a/core/modules/views_ui/tests/src/FunctionalJavascript/DisplayTest.php b/core/modules/views_ui/tests/src/FunctionalJavascript/DisplayTest.php
index 73b6feb49bf0..254468e8996e 100644
--- a/core/modules/views_ui/tests/src/FunctionalJavascript/DisplayTest.php
+++ b/core/modules/views_ui/tests/src/FunctionalJavascript/DisplayTest.php
@@ -155,31 +155,6 @@ protected function toggleContextualTriggerVisibility($selector) {
$this->getSession()->executeScript("jQuery('{$selector} .contextual .trigger').toggleClass('visually-hidden');");
}
- /**
- * Confirms that form_alter is triggered after ajax rebuilds.
- */
- public function testAjaxRebuild() {
- \Drupal::service('theme_installer')->install(['views_test_classy_subtheme']);
-
- $this->config('system.theme')
- ->set('default', 'views_test_classy_subtheme')
- ->save();
-
- $page = $this->getSession()->getPage();
- $assert_session = $this->assertSession();
-
- $this->drupalGet('admin/structure/views/view/content');
- $assert_session->pageTextContains('This is text added to the display tabs at the top');
- $assert_session->pageTextContains('This is text added to the display edit form');
- $page->clickLink('Content: Title (Title)');
- $assert_session->waitForElementVisible('css', '.views-ui-dialog');
- $page->fillField('Label', 'New Title');
- $page->find('css', '.ui-dialog-buttonset button:contains("Apply")')->press();
- $assert_session->waitForElementRemoved('css', '.views-ui-dialog');
- $assert_session->pageTextContains('This is text added to the display tabs at the top');
- $assert_session->pageTextContains('This is text added to the display edit form');
- }
-
/**
* Test if 'add' translations are filtered from multilingual display options.
*/
--
GitLab