From bba472b20430b91b9d386d1404096429c8c39714 Mon Sep 17 00:00:00 2001
From: mhsdesign <85400359+mhsdesign@users.noreply.github.com>
Date: Fri, 17 May 2024 11:14:37 +0200
Subject: [PATCH] TASK: Adjust composer.json to run tests in sync by default

---
 .composer.json              | 8 --------
 .github/workflows/build.yml | 2 +-
 Readme.rst                  | 7 -------
 composer.json               | 8 --------
 4 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/.composer.json b/.composer.json
index 903520e398f..6f7f5947917 100644
--- a/.composer.json
+++ b/.composer.json
@@ -45,10 +45,6 @@
       "../../flow doctrine:migrate --quiet; ../../flow cr:setup",
       "@test:behat-cli -c Neos.Neos/Tests/Behavior/behat.yml"
     ],
-    "test:behavioral:sync": [
-      "@putenv CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1",
-      "@test:behavioral"
-    ],
     "test:behavioral:stop-on-failure": [
       "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist",
       "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist",
@@ -58,10 +54,6 @@
       "../../flow doctrine:migrate --quiet; ../../flow cr:setup",
       "@test:behat-cli -vvv --stop-on-failure -c Neos.Neos/Tests/Behavior/behat.yml"
     ],
-    "test:behavioral:stop-on-failure:sync": [
-      "@putenv CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1",
-      "@test:behavioral:stop-on-failure"
-    ],
     "test": [
       "@test:unit",
       "@test:functional",
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 9774cd47fe3..74d6e20291e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -249,7 +249,7 @@ jobs:
           # DEBUG MODE: ALTERNATIVELY, comment in the following lines to dump the DB.
           # do not exit the script if the tests break; as we want to upload the database dumps afterwards.
           set +e
-          composer test:behavioral:stop-on-failure:sync
+          composer test:behavioral:stop-on-failure
           retVal=$?
 
           # automatically search for race conditions
diff --git a/Readme.rst b/Readme.rst
index 4e114e2462d..f8200689add 100644
--- a/Readme.rst
+++ b/Readme.rst
@@ -188,13 +188,6 @@ we use the right versions etc).
        cd Packages/Neos
        composer test:behavioral
 
-Running all tests can take a long time, depending on the hardware.
-To speed up the process, Behat tests can be executed in a "synchronous" mode:
-
-   .. code-block:: bash
-
-       composer test:behavioral:sync
-
 Alternatively, if you want to reproduce errors as they happen inside the CI system, but you
 develop on Mac OS, you might want to run the Behat tests in a Docker container (= a linux environment)
 as well. We have seen cases where they behave differently, i.e. where they run without race
diff --git a/composer.json b/composer.json
index b17ad9c3d79..8eb6f5248f6 100644
--- a/composer.json
+++ b/composer.json
@@ -130,10 +130,6 @@
             "../../flow doctrine:migrate --quiet; ../../flow cr:setup",
             "@test:behat-cli -c Neos.Neos/Tests/Behavior/behat.yml"
         ],
-        "test:behavioral:sync": [
-            "@putenv CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1",
-            "@test:behavioral"
-        ],
         "test:behavioral:stop-on-failure": [
             "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentRepository.BehavioralTests/Tests/Behavior/behat.yml.dist",
             "@test:behat-cli -vvv --stop-on-failure -c Neos.ContentGraph.DoctrineDbalAdapter/Tests/Behavior/behat.yml.dist",
@@ -143,10 +139,6 @@
             "../../flow doctrine:migrate --quiet; ../../flow cr:setup",
             "@test:behat-cli -vvv --stop-on-failure -c Neos.Neos/Tests/Behavior/behat.yml"
         ],
-        "test:behavioral:stop-on-failure:sync": [
-            "@putenv CATCHUPTRIGGER_ENABLE_SYNCHRONOUS_OPTION=1",
-            "@test:behavioral:stop-on-failure"
-        ],
         "test": [
             "@test:unit",
             "@test:functional",