Use FriendsOfBehat\SymfonyExtension v2

Shasthojoy · Jan 16, 2019 · 708c5cd · 708c5cd
1 parent 163545e
commit 708c5cd
Show file tree

Hide file tree

Showing 105 changed files with 458 additions and 531 deletions.
diff --git a/behat.yml.dist b/behat.yml.dist
@@ -4,5 +4,51 @@
 # This file is referenced in Sylius-Standard v1.0.0 - v1.3.x
 
 imports:
-    - src/Sylius/Behat/Resources/config/profiles.yml
     - src/Sylius/Behat/Resources/config/suites.yml
+
+default:
+    formatters:
+        pretty:
+            verbose: true
+            paths: false
+            snippets: false
+
+    extensions:
+        Lakion\Behat\MinkDebugExtension:
+            directory: etc/build
+            clean_start: false
+            screenshot: true
+
+        Behat\MinkExtension:
+            files_path: "%paths.base%/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: ~
+
+        FriendsOfBehat\VariadicExtension: ~
+
+    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
@@ -98,11 +98,8 @@
         "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",
-        "friends-of-behat/service-container-extension": "^1.0",
-        "friends-of-behat/symfony-extension": "^1.2.1",
+        "friends-of-behat/page-object-extension": "^0.3",
+        "friends-of-behat/symfony-extension": "^2.0.0-rc.2",
         "friends-of-behat/variadic-extension": "^1.1",
         "hwi/oauth-bundle": "^0.6",
         "lchrusciel/api-test-case": "^3.1.0",
@@ -180,10 +177,10 @@
     },
     "conflict": {
         "symfony/browser-kit": "4.1.8",
-        "symfony/dependency-injection": "4.1.8",
+        "symfony/dependency-injection": "4.1.8 || 4.2.2",
         "symfony/dom-crawler": "4.1.8",
         "symfony/routing": "4.1.8",
-        "symfony/symfony": "3.4.7 || 4.0.7 || 4.1.8",
+        "symfony/symfony": "3.4.7 || 4.0.7 || 4.1.8 || 4.2.2",
         "twig/twig": "2.6.1"
     },
     "suggest": {

diff --git a/config/bundles.php b/config/bundles.php
@@ -68,4 +68,5 @@
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::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],
 ];
diff --git a/config/services_test.yaml b/config/services_test.yaml
@@ -0,0 +1,2 @@
+imports:
+    - { resource: "../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" }
diff --git a/etc/travis/suites/application/script/test-behat-with-cli b/etc/travis/suites/application/script/test-behat-with-cli
@@ -6,9 +6,9 @@ run_behat() {
     local code=0
 
     print_header "Testing (Behat - CLI commands, regular scenarios; @cli && ~@todo)" "Sylius"
-    run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags=\"@cli && ~@todo\"" || code=$?
+    run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress --tags=\"@cli && ~@todo\"" || code=$?
     if [[ ${code} = 1 ]]; then
-        run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags=\"@cli && ~@todo\" --rerun" ; code=$?
+        run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress --tags=\"@cli && ~@todo\" --rerun" ; code=$?
     fi
 
     return ${code}

diff --git a/etc/travis/suites/application/script/test-behat-with-javascript b/etc/travis/suites/application/script/test-behat-with-javascript
@@ -35,9 +35,9 @@ run_behat() {
     local code=0
 
     print_header "Testing (Behat - brand new, javascript scenarios; @javascript && ~@todo && ~@cli)" "Sylius"
-    run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags=\"@javascript && ~@todo && ~@cli\"" || code=$?
+    run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress --tags=\"@javascript && ~@todo && ~@cli\"" || code=$?
     if [[ ${code} = 1 ]]; then
-        run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags=\"@javascript && ~@todo && ~@cli\" --rerun" ; code=$?
+        run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress --tags=\"@javascript && ~@todo && ~@cli\" --rerun" ; code=$?
     fi
 
     return ${code}

diff --git a/etc/travis/suites/application/script/test-behat-without-javascript b/etc/travis/suites/application/script/test-behat-without-javascript
@@ -6,9 +6,9 @@ run_behat() {
     local code=0
 
     print_header "Testing (Behat - brand new, regular scenarios; ~@javascript && ~@todo && ~@cli)" "Sylius"
-    run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags=\"~@javascript && ~@todo && ~@cli\"" || code=$?
+    run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress --tags=\"~@javascript && ~@todo && ~@cli\"" || code=$?
     if [[ ${code} = 1 ]]; then
-        run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress -p cached --tags=\"~@javascript && ~@todo && ~@cli\" --rerun" ; code=$?
+        run_command "vendor/bin/behat --strict --no-interaction -vvv -f progress --tags=\"~@javascript && ~@todo && ~@cli\" --rerun" ; code=$?
     fi
 
     return ${code}

diff --git a/src/Sylius/Behat/Context/Setup/ProductContext.php b/src/Sylius/Behat/Context/Setup/ProductContext.php
@@ -106,8 +106,16 @@ public function __construct(
         ProductVariantResolverInterface $defaultVariantResolver,
         ImageUploaderInterface $imageUploader,
         SlugGeneratorInterface $slugGenerator,
-        array $minkParameters
+        $minkParameters
     ) {
+        if (!is_array($minkParameters) && !$minkParameters instanceof \ArrayAccess) {
+            throw new \InvalidArgumentException(sprintf(
+                '"$minkParameters" passed to "%s" has to be an array or implement "%s".',
+                self::class,
+                \ArrayAccess::class
+            ));
+        }
+
         $this->sharedStorage = $sharedStorage;
         $this->productRepository = $productRepository;
         $this->productFactory = $productFactory;

diff --git a/src/Sylius/Behat/Context/Setup/TaxonomyContext.php b/src/Sylius/Behat/Context/Setup/TaxonomyContext.php
@@ -60,8 +60,16 @@ public function __construct(
         ObjectManager $objectManager,
         ImageUploaderInterface $imageUploader,
         TaxonSlugGeneratorInterface $taxonSlugGenerator,
-        array $minkParameters
+        $minkParameters
     ) {
+        if (!is_array($minkParameters) && !$minkParameters instanceof \ArrayAccess) {
+            throw new \InvalidArgumentException(sprintf(
+                '"$minkParameters" passed to "%s" has to be an array or implement "%s".',
+                self::class,
+                \ArrayAccess::class
+            ));
+        }
+
         $this->taxonRepository = $taxonRepository;
         $this->taxonFactory = $taxonFactory;
         $this->taxonTranslationFactory = $taxonTranslationFactory;

diff --git a/src/Sylius/Behat/Page/Admin/Crud/CreatePage.php b/src/Sylius/Behat/Page/Admin/Crud/CreatePage.php
@@ -23,9 +23,9 @@ class CreatePage extends SymfonyPage implements CreatePageInterface
     /** @var string */
     private $routeName;
 
-    public function __construct(Session $session, array $parameters, RouterInterface $router, string $routeName)
+    public function __construct(Session $session, $minkParameters, RouterInterface $router, string $routeName)
     {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->routeName = $routeName;
     }

diff --git a/src/Sylius/Behat/Page/Admin/Crud/IndexPage.php b/src/Sylius/Behat/Page/Admin/Crud/IndexPage.php
@@ -31,12 +31,12 @@ class IndexPage extends SymfonyPage implements IndexPageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         TableAccessorInterface $tableAccessor,
         string $routeName
     ) {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->tableAccessor = $tableAccessor;
         $this->routeName = $routeName;

diff --git a/src/Sylius/Behat/Page/Admin/Crud/UpdatePage.php b/src/Sylius/Behat/Page/Admin/Crud/UpdatePage.php
@@ -24,9 +24,9 @@ class UpdatePage extends SymfonyPage implements UpdatePageInterface
     /** @var string */
     private $routeName;
 
-    public function __construct(Session $session, array $parameters, RouterInterface $router, string $routeName)
+    public function __construct(Session $session, $minkParameters, RouterInterface $router, string $routeName)
     {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->routeName = $routeName;
     }

diff --git a/src/Sylius/Behat/Page/Admin/DashboardPage.php b/src/Sylius/Behat/Page/Admin/DashboardPage.php
@@ -25,11 +25,11 @@ class DashboardPage extends SymfonyPage implements DashboardPageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         TableAccessorInterface $tableAccessor
     ) {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->tableAccessor = $tableAccessor;
     }

diff --git a/src/Sylius/Behat/Page/Admin/Order/ShowPage.php b/src/Sylius/Behat/Page/Admin/Order/ShowPage.php
@@ -28,11 +28,11 @@ class ShowPage extends SymfonyPage implements ShowPageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         TableAccessorInterface $tableAccessor
     ) {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->tableAccessor = $tableAccessor;
     }

diff --git a/src/Sylius/Behat/Page/Admin/Product/IndexPage.php b/src/Sylius/Behat/Page/Admin/Product/IndexPage.php
@@ -26,13 +26,13 @@ final class IndexPage extends CrudIndexPage implements IndexPageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         TableAccessorInterface $tableAccessor,
         string $routeName,
         ImageExistenceCheckerInterface $imageExistenceChecker
     ) {
-        parent::__construct($session, $parameters, $router, $tableAccessor, $routeName);
+        parent::__construct($session, $minkParameters, $router, $tableAccessor, $routeName);
 
         $this->imageExistenceChecker = $imageExistenceChecker;
     }

diff --git a/src/Sylius/Behat/Page/External/PaypalExpressCheckoutPage.php b/src/Sylius/Behat/Page/External/PaypalExpressCheckoutPage.php
@@ -24,9 +24,9 @@ class PaypalExpressCheckoutPage extends Page implements PaypalExpressCheckoutPag
     /** @var RepositoryInterface */
     private $securityTokenRepository;
 
-    public function __construct(Session $session, array $parameters, RepositoryInterface $securityTokenRepository)
+    public function __construct(Session $session, $minkParameters, RepositoryInterface $securityTokenRepository)
     {
-        parent::__construct($session, $parameters);
+        parent::__construct($session, $minkParameters);
 
         $this->securityTokenRepository = $securityTokenRepository;
     }

diff --git a/src/Sylius/Behat/Page/Shop/Account/Order/IndexPage.php b/src/Sylius/Behat/Page/Shop/Account/Order/IndexPage.php
@@ -26,11 +26,11 @@ class IndexPage extends SymfonyPage implements IndexPageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         TableAccessorInterface $tableAccessor
     ) {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->tableAccessor = $tableAccessor;
     }

diff --git a/src/Sylius/Behat/Page/Shop/Account/Order/ShowPage.php b/src/Sylius/Behat/Page/Shop/Account/Order/ShowPage.php
@@ -25,11 +25,11 @@ class ShowPage extends SymfonyPage implements ShowPageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         TableAccessorInterface $tableAccessor
     ) {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->tableAccessor = $tableAccessor;
     }

diff --git a/src/Sylius/Behat/Page/Shop/Checkout/AddressPage.php b/src/Sylius/Behat/Page/Shop/Checkout/AddressPage.php
@@ -33,11 +33,11 @@ class AddressPage extends SymfonyPage implements AddressPageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         AddressFactoryInterface $addressFactory
     ) {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->addressFactory = $addressFactory;
     }

diff --git a/src/Sylius/Behat/Page/Shop/Checkout/CompletePage.php b/src/Sylius/Behat/Page/Shop/Checkout/CompletePage.php
@@ -31,11 +31,11 @@ class CompletePage extends SymfonyPage implements CompletePageInterface
 
     public function __construct(
         Session $session,
-        array $parameters,
+        $minkParameters,
         RouterInterface $router,
         TableAccessorInterface $tableAccessor
     ) {
-        parent::__construct($session, $parameters, $router);
+        parent::__construct($session, $minkParameters, $router);
 
         $this->tableAccessor = $tableAccessor;
     }

diff --git a/src/Sylius/Behat/Resources/config/profiles.yml b/src/Sylius/Behat/Resources/config/profiles.yml
diff --git a/src/Sylius/Behat/Resources/config/profiles/cached.yml b/src/Sylius/Behat/Resources/config/profiles/cached.yml
diff --git a/src/Sylius/Behat/Resources/config/profiles/default.yml b/src/Sylius/Behat/Resources/config/profiles/default.yml
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		imports:
		- { resource: "../src/Sylius/Behat/Resources/config/services.xml" }