Fix Behat CI (#2226)

atk4 · Nov 21, 2024 · 5863090 · 5863090
1 parent 1c6f3a4
commit 5863090
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/test-unit.yml b/.github/workflows/test-unit.yml
@@ -381,7 +381,7 @@ jobs:
       - name: "Run tests: SQLite"
         run: |
           php demos/_demo-data/create-db.php
-          vendor/bin/behat -vv --config behat.yml.dist
+          vendor/bin/behat --strict -vv --config behat.yml.dist
 
       - name: "Run tests: MySQL (only for cron)"
         if: (success() || failure()) && github.event_name == 'schedule'
@@ -392,7 +392,7 @@ jobs:
         run: |
           sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
           php demos/_demo-data/create-db.php
-          vendor/bin/behat -vv --config behat.yml.dist
+          vendor/bin/behat --strict -vv --config behat.yml.dist
 
       - name: "Run tests: MariaDB (only for coverage or cron)"
         if: (success() || failure()) && (env.LOG_COVERAGE || github.event_name == 'schedule')
@@ -403,7 +403,7 @@ jobs:
         run: |
           sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
           php demos/_demo-data/create-db.php
-          vendor/bin/behat -vv --config behat.yml.dist
+          vendor/bin/behat --strict -vv --config behat.yml.dist
 
       - name: "Run tests: PostgreSQL (only for cron)"
         if: (success() || failure()) && github.event_name == 'schedule'
@@ -414,7 +414,7 @@ jobs:
         run: |
           sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
           php demos/_demo-data/create-db.php
-          vendor/bin/behat -vv --config behat.yml.dist
+          vendor/bin/behat --strict -vv --config behat.yml.dist
 
       - name: "Run tests: MSSQL (only for cron)"
         if: (success() || failure()) && github.event_name == 'schedule'
@@ -425,7 +425,7 @@ jobs:
         run: |
           sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
           php demos/_demo-data/create-db.php
-          vendor/bin/behat -vv --config behat.yml.dist
+          vendor/bin/behat --strict -vv --config behat.yml.dist
 
       - name: "Run tests: Oracle (only for cron)"
         if: (success() || failure()) && github.event_name == 'schedule'
@@ -437,7 +437,7 @@ jobs:
         run: |
           sed -E "s~(\\\$db = new.+Persistence\\\\Sql)\(.+\);~\\1('$DB_DSN', '$DB_USER', '$DB_PASSWORD');~g" -i demos/db.default.php
           php demos/_demo-data/create-db.php
-          vendor/bin/behat -vv --config behat.yml.dist
+          vendor/bin/behat --strict -vv --config behat.yml.dist
 
       - name: Upload coverage logs 1/2 (only for coverage)
         if: env.LOG_COVERAGE

diff --git a/demos/interactive/scroll-grid-container.php b/demos/interactive/scroll-grid-container.php
@@ -28,7 +28,7 @@
 $c1 = $c->addColumn();
 $g1 = Crud::addTo($c1);
 $m1 = new Country($app->db);
-$g1->setModel($m1);
+$g1->setModel($m1, [$m1->fieldName()->name, $m1->fieldName()->iso]); // fields are filtered to fit into table for Behat, TODO remove filtering after https://github.com/atk4/ui/issues/1988
 $g1->addQuickSearch([Country::hinting()->fieldName()->name, Country::hinting()->fieldName()->iso]);
 
 // demo for additional action buttons in Crud + JsPaginator

diff --git a/src/Behat/Context.php b/src/Behat/Context.php
@@ -763,7 +763,7 @@ public function iScrollToBottom(): void
     }
 
     /**
-     * @Then ~^Toast display should contain text "((?:[^"]|\\")*)"$~
+     * @Then Toast display should contain text :arg1
      */
     public function toastDisplayShouldContainText(string $text): void
     {
@@ -791,7 +791,7 @@ public function noToastShouldBeDisplayed(): void
      * Remove once https://github.com/Behat/MinkExtension/pull/386 and
      * https://github.com/minkphp/Mink/issues/656 are fixed and released.
      *
-     * @Then ~^PATCH MINK the (?i)url(?-i) should match "(?P<pattern>(?:[^"]|\\")*)"$~
+     * @Then ~^PATCH MINK the (?i)url(?-i) should match "((?:[^"]|\\")*)"$~
      */
     public function assertUrlRegExp(string $pattern): void
     {

diff --git a/tests-behat/grid.feature b/tests-behat/grid.feature
@@ -86,7 +86,7 @@ Feature: Grid
     Then I click paginator page "2"
     Then I should see "Bahamas"
     When I click using selector "//tr[td[text()='Bahamas']]//div.ui.button[text()='Say HI']"
-    Then Toast display should contain text "Loaded \"Bahamas\" from ID=16"
+    Then Toast display should contain text 'Loaded "Bahamas" from ID=16'
 
   Scenario: Row remote action - change row CSS
     Given I am on "interactive/scroll-grid-container.php"