Use SymfonyExtension 2.0

Sylius · Jan 22, 2019 · 0368f6b · 0368f6b
1 parent 9706601
commit 0368f6b
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 228 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -88,10 +88,10 @@ jobs:
                 - bin/console sylius:fixtures:load --no-interaction --env=test_cached --no-debug -vvv
 
                 - echo "Testing (Behat, without javascript scenarios; ~@javascript && ~@todo && ~@cli)" "Sylius"
-                - vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags="~@javascript && ~@todo && ~@cli"
+                - vendor/bin/behat --strict --no-interaction -vvv -f progress --tags="~@javascript && ~@todo && ~@cli"
 
                 - echo "Testing (Behat, only javascript scenarios; @javascript && ~@todo && ~@cli)" "Sylius"
-                - vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags="@javascript && ~@todo && ~@cli" || vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags="@javascript && ~@todo && ~@cli" --rerun
+                - vendor/bin/behat --strict --no-interaction -vvv -f progress --tags="@javascript && ~@todo && ~@cli" || vendor/bin/behat --strict --no-interaction -vvv -f progress --tags="@javascript && ~@todo && ~@cli" --rerun
 
             after_failure:
                 - vendor/lakion/mink-debug-extension/travis/tools/upload-textfiles "${SYLIUS_BUILD_DIR}/*.log"

diff --git a/behat.yml.dist b/behat.yml.dist
@@ -3,41 +3,9 @@ imports:
 
 default:
     extensions:
-        FriendsOfBehat\ContextServiceExtension:
-            imports:
-                - "vendor/sylius/sylius/src/Sylius/Behat/Resources/config/services.xml"
-
+        Behat\MinkExtension:
+            files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/"
         FriendsOfBehat\SuiteSettingsExtension:
             paths:
                 - "vendor/sylius/sylius/features"
                 - "features"
-
-        Behat\MinkExtension:
-            files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/"
-
-        FriendsOfBehat\SymfonyExtension:
-            env_file: .env.test
-            kernel:
-                env: test
-                debug: true
-                class: App\Kernel
-                path: src/Kernel.php
-                bootstrap: ~
-
-cached:
-    extensions:
-        FriendsOfBehat\ContextServiceExtension:
-            imports:
-                - "vendor/sylius/sylius/src/Sylius/Behat/Resources/config/services.xml"
-
-        Behat\MinkExtension:
-            files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/"
-
-        FriendsOfBehat\SymfonyExtension:
-            env_file: .env.test_cached
-            kernel:
-                env: test_cached
-                debug: false
-                class: App\Kernel
-                path: src/Kernel.php
-                bootstrap: ~
diff --git a/composer.json b/composer.json
@@ -27,12 +27,9 @@
         "behat/mink-browserkit-driver": "^1.3",
         "behat/mink-extension": "^2.2",
         "behat/mink-selenium2-driver": "^1.3",
-        "friends-of-behat/context-service-extension": "^1.2",
-        "friends-of-behat/cross-container-extension": "^1.1",
-        "friends-of-behat/page-object-extension": "^0.2.1",
-        "friends-of-behat/service-container-extension": "^1.0",
+        "friends-of-behat/page-object-extension": "^0.3",
         "friends-of-behat/suite-settings-extension": "^1.0",
-        "friends-of-behat/symfony-extension": "^1.2.1",
+        "friends-of-behat/symfony-extension": "^2.0.0-rc.2",
         "friends-of-behat/variadic-extension": "^1.1",
         "lakion/mink-debug-extension": "^1.2.3",
         "lchrusciel/api-test-case": "^3.0",