#2403: Refactor AllowDrupalLogin test trait to not override parent::s…

…etup().
az-digital · May 17, 2023 · 6be2811 · 6be2811
1 parent 3904347
commit 6be2811
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/modules/custom/az_core/tests/src/Functional/QuickstartFunctionalTestBase.php b/modules/custom/az_core/tests/src/Functional/QuickstartFunctionalTestBase.php
@@ -11,4 +11,12 @@
 abstract class QuickstartFunctionalTestBase extends BrowserTestBase {
   use AllowDrupalLoginSetupTrait;
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+    $this->enableDrupalLogin();
+  }
+
 }
diff --git a/.../custom/az_core/tests/src/FunctionalJavascript/QuickstartFunctionalJavascriptTestBase.php b/.../custom/az_core/tests/src/FunctionalJavascript/QuickstartFunctionalJavascriptTestBase.php
@@ -11,4 +11,12 @@
 abstract class QuickstartFunctionalJavascriptTestBase extends WebDriverTestBase {
   use AllowDrupalLoginSetupTrait;
 
+  /**
+   * {@inheritdoc}
+   */
+  protected function setUp(): void {
+    parent::setUp();
+    $this->enableDrupalLogin();
+  }
+
 }
diff --git a/modules/custom/az_core/tests/src/Traits/AllowDrupalLoginSetupTrait.php b/modules/custom/az_core/tests/src/Traits/AllowDrupalLoginSetupTrait.php
@@ -8,11 +8,9 @@
 trait AllowDrupalLoginSetupTrait {
 
   /**
-   * {@inheritdoc}
+   * Change AZ CAS module settings to enable normal Drupal logins.
    */
-  protected function setUp(): void {
-    parent::setUp();
-
+  public function enableDrupalLogin(): void {
     // Turn off az_cas disable_login_form setting.
     $config = $this
       ->config('az_cas.settings');