bug #322 Update to Sylius 1.4-BETA (lemuelroberto, Zales0123)

This PR was merged into the 1.3-dev branch. Discussion ---------- It contains changes from #318 Commits ------- 5b5282c Fix doctrine migrations 0603090 Add missing migration and remove unused use statements 2a1bce1 Use SymfonyExtension 2.0 fbc4abd After rebase fixes 40e1547 PR review fixes
Sylius · Jan 22, 2019 · 3b0615c · 3b0615c
2 parents 89bebc6 + 40e1547
commit 3b0615c
Show file tree

Hide file tree

Showing 14 changed files with 154 additions and 222 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
@@ -1,43 +1,54 @@
 imports:
-    - vendor/sylius/sylius/behat.yml.dist
+    - vendor/sylius/sylius/src/Sylius/Behat/Resources/config/suites.yml
 
 default:
-    extensions:
-        FriendsOfBehat\ContextServiceExtension:
-            imports:
-                - "vendor/sylius/sylius/src/Sylius/Behat/Resources/config/services.xml"
+    formatters:
+        pretty:
+            verbose: true
+            paths: false
+            snippets: false
 
-        FriendsOfBehat\SuiteSettingsExtension:
-            paths:
-                - "vendor/sylius/sylius/features"
-                - "features"
+    extensions:
+        Lakion\Behat\MinkDebugExtension:
+            directory: etc/build
+            clean_start: false
+            screenshot: true
 
         Behat\MinkExtension:
             files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/"
+            base_url: "http://localhost:8080/"
+            default_session: symfony
+            javascript_session: chrome
+            sessions:
+                symfony:
+                    symfony: ~
+                chrome:
+                    selenium2:
+                        browser: chrome
+                        capabilities:
+                            browserName: chrome
+                            browser: chrome
+                            version: ""
+                            marionette: null # https://github.com/Behat/MinkExtension/pull/311
+                            chrome:
+                                switches:
+                                    - "start-fullscreen"
+                                    - "start-maximized"
+                                    - "no-sandbox"
+                firefox:
+                    selenium2:
+                        browser: firefox
+            show_auto: false
 
-        FriendsOfBehat\SymfonyExtension:
-            env_file: .env.test
-            kernel:
-                env: test
-                debug: true
-                class: App\Kernel
-                path: src/Kernel.php
-                bootstrap: ~
+        FriendsOfBehat\SymfonyExtension: ~
 
-cached:
-    extensions:
-        FriendsOfBehat\ContextServiceExtension:
-            imports:
-                - "vendor/sylius/sylius/src/Sylius/Behat/Resources/config/services.xml"
+        FriendsOfBehat\VariadicExtension: ~
 
-        Behat\MinkExtension:
-            files_path: "%paths.base%/vendor/sylius/sylius/src/Sylius/Behat/Resources/fixtures/"
+        FriendsOfBehat\SuiteSettingsExtension:
+            paths:
+                - "vendor/sylius/sylius/features"
+                - "features"
 
-        FriendsOfBehat\SymfonyExtension:
-            env_file: .env.test_cached
-            kernel:
-                env: test_cached
-                debug: false
-                class: App\Kernel
-                path: src/Kernel.php
-                bootstrap: ~
+    gherkin:
+        filters:
+            tags: "~@todo && ~@cli" # CLI is excluded as it registers an error handler that mutes fatal errors
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",
         "friends-of-behat/variadic-extension": "^1.1",
         "lakion/mink-debug-extension": "^1.2.3",
         "lchrusciel/api-test-case": "^3.0",

diff --git a/composer.lock b/composer.lock
diff --git a/config/bundles.php b/config/bundles.php
@@ -57,5 +57,6 @@
     Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
     Fidry\AliceDataFixtures\Bridge\Symfony\FidryAliceDataFixturesBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
     Nelmio\Alice\Bridge\Symfony\NelmioAliceBundle::class => ['dev' => true, 'test' => true, 'test_cached' => true],
+    FriendsOfBehat\SymfonyExtension\Bundle\FriendsOfBehatSymfonyExtensionBundle::class => ['test' => true, 'test_cached' => true],
     Sylius\Behat\Application\SyliusTestPlugin\SyliusTestPlugin::class => ['test' => true, 'test_cached' => true],
 ];
diff --git a/config/services_test.yaml b/config/services_test.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../vendor/sylius/sylius/src/Sylius/Behat/Resources/config/services.xml" }
diff --git a/config/services_test_cached.yaml b/config/services_test_cached.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "services_test.yaml" }
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		imports:
		- { resource: "../vendor/sylius/sylius/src/Sylius/Behat/Resources/config/services.xml" }