Bump SF to 7.1 and enable JS tests

mpysiak · Sep 24, 2024 · bb7da01 · bb7da01
1 parent 550954f
commit bb7da01
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -197,14 +197,14 @@ jobs:
                 name: Run non-JS Behat
                 run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" || vendor/bin/behat --strict --no-interaction -vvv -f progress --tags="~@javascript&&~@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" --rerun
 
-#            -   
-#                name: Run Behat (Chromedriver)
-#                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" --rerun || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" --rerun
-#
-#            -   
-#                name: Run Behat (Panther)
-#                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --suite-tags="@ui" || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --suite-tags="@ui" --rerun || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --suite-tags="@ui" --rerun
-#            
+            -   
+                name: Run Behat (Chromedriver)
+                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" --rerun || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@mink:chromedriver&&~@todo&&~@cli" --suite-tags="@ui" --rerun
+
+            -   
+                name: Run Behat (Panther)
+                run: vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --suite-tags="@ui" || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --suite-tags="@ui" --rerun || vendor/bin/behat --colors --strict --no-interaction -vvv -f progress --tags="@javascript&&~@todo&&~@cli" --suite-tags="@ui" --rerun
+
             -
                 name: Upload Behat logs
                 uses: actions/upload-artifact@v4

diff --git a/composer.json b/composer.json
@@ -26,10 +26,10 @@
     ],
     "require": {
         "php": "^8.2",
-        "sylius/sylius": "symfony-7-dev",
-        "symfony/dotenv": "^6.4 || ^7.0",
+        "sylius/sylius": "2.0.x-dev",
+        "symfony/dotenv": "^6.4 || ^7.1",
         "symfony/flex": "^2.4",
-        "symfony/runtime": "^6.4 || ^7.0"
+        "symfony/runtime": "^6.4 || ^7.1"
     },
     "require-dev": {
         "behat/behat": "^3.7",
@@ -58,11 +58,11 @@
         "sylius-labs/coding-standard": "^4.0",
         "sylius-labs/suite-tags-extension": "^0.2",
         "sylius/sylius-rector": "^2.0",
-        "symfony/browser-kit": "^6.4 || ^7.0",
-        "symfony/debug-bundle": "^6.4 || ^7.0",
-        "symfony/http-client": "^6.4 || ^7.0",
-        "symfony/intl": "^6.4 || ^7.0",
-        "symfony/web-profiler-bundle": "^6.4 || ^7.0"
+        "symfony/browser-kit": "^6.4 || ^7.1",
+        "symfony/debug-bundle": "^6.4 || ^7.1",
+        "symfony/http-client": "^6.4 || ^7.1",
+        "symfony/intl": "^6.4 || ^7.1",
+        "symfony/web-profiler-bundle": "^6.4 || ^7.1"
     },
     "config": {
         "preferred-install": {
@@ -84,7 +84,7 @@
         },
         "symfony": {
             "allow-contrib": false,
-            "require": "^7.0",
+            "require": "^7.1",
             "endpoint": [
                 "https://api.github.com/repos/Sylius/SyliusRecipes/contents/index.json?ref=flex/main",
                 "flex://defaults"