fix stan, improve test

atk4 · Oct 19, 2022 · d56cc05 · d56cc05
1 parent 89beeb7
commit d56cc05
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/demos/interactive/modal.php b/demos/interactive/modal.php
@@ -168,7 +168,7 @@
 $stepModal->addButtonAction($action);
 
 // Set modal functionality. Will changes content according to page being displayed.
-$stepModal->set(function (View $p) use ($stepModal, $session, $prevAction, $nextAction) {
+$stepModal->set(function (View $p) use ($session, $prevAction, $nextAction) {
     $page = $session->recall('page', 1);
     $success = $session->recall('success', false);
     if (isset($_GET['move'])) {

diff --git a/src/Behat/Context.php b/src/Behat/Context.php
@@ -402,7 +402,8 @@ public function iClickCloseModal(): void
      */
     public function iHideJsModal(): void
     {
-        $this->getSession()->executeScript('$(".modal.active.front").modal("hide")');
+        $modal = $this->findElement(null, '.modal.visible.active.front');
+        $this->getSession()->executeScript('$(arguments[0]).modal("hide")', [$modal]);
     }
 
     // }}}

diff --git a/tests-behat/form.feature b/tests-behat/form.feature
@@ -41,6 +41,10 @@ Feature: Form
     When I press Modal button "Save"
     Then Modal is open with text "Atk4\Core\Exception: Test exception II."
     Then I hide js modal
+    Then I hide js modal
     When I press button "Modal Test"
     When I press Modal button "Save"
     Then Modal is open with text "Atk4\Core\Exception: Test exception II."
+    Then I hide js modal
+    When I press Modal button "Save"
+    Then Modal is open with text "Atk4\Core\Exception: Test exception II."