Merge pull request #2822 from dpfaffenbauer/behat-tests

dpfaffenbauer · web-flow · commit dc8ecc5c7510 · 2025-04-14T21:31:21.000+02:00
[Behat] fix tests
diff --git a/.github/workflows/behat_ui.yml b/.github/workflows/behat_ui.yml
@@ -36,7 +36,7 @@ jobs:
       PIMCORE_INSTALL_MYSQL_DATABASE: "coreshop_test"
       PIMCORE_INSTALL_MYSQL_PORT: "3306"
       PANTHER_EXTERNAL_BASE_URI: "http://localhost:9080/index_test.php"
-      PANTHER_CHROME_ARGUMENTS: "--disable-dev-shm-usage"
+      PANTHER_CHROME_ARGUMENTS: "--disable-dev-shm-usage --guest"
       PANTHER_DEVTOOLS: "0"
       PIMCORE_KERNEL_CLASS: 'Kernel'
       PIMCORE_WRITE_TARGET_STATICROUTES: 'settings-store'
@@ -127,7 +127,7 @@ jobs:
       run: symfony server:start --port=9080 --dir=public --daemon --no-tls
 
     - name: Run Behat
-      run: vendor/bin/behat --strict --no-interaction -vvv --config behat.yml.dist -p ui
+      run: vendor/bin/behat --strict --no-interaction -vvv -f progress --config behat.yml.dist -p ui
 
     - name: Upload Logs
       uses: actions/upload-artifact@v4
diff --git a/composer.json b/composer.json
@@ -123,7 +123,7 @@
     "phpstan/phpstan-symfony": "^1.3.2",
     "phpstan/phpstan-webmozart-assert": "^1.2.4",
     "phpunit/phpunit": "^9.5",
-    "robertfausk/behat-panther-extension": "^1.0",
+    "robertfausk/behat-panther-extension": "^1.2",
     "symfony/panther": "^2.1",
     "symplify/easy-coding-standard": "^11.1",
     "vimeo/psalm": "^4.10"
diff --git a/etc/_scripts/behat b/etc/_scripts/behat
diff --git a/etc/_setup/install b/etc/_setup/install
diff --git a/etc/suites/application b/etc/suites/application
diff --git a/src/CoreShop/Behat/Element/Frontend/Account/RegisterElement.php b/src/CoreShop/Behat/Element/Frontend/Account/RegisterElement.php
@@ -19,6 +19,7 @@
 namespace CoreShop\Behat\Element\Frontend\Account;
 
 use Behat\Mink\Exception\ElementNotFoundException;
+use CoreShop\Behat\Service\DriverHelper;
 use FriendsOfBehat\PageObjectExtension\Element\Element;
 
 final class RegisterElement extends Element implements RegisterElementInterface
@@ -44,6 +45,8 @@ public function checkValidationMessageFor(string $element, string $message): boo
     public function register(): void
     {
         $this->getElement('create_account_button')->press();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function getEmail(): string
diff --git a/src/CoreShop/Behat/Page/Frontend/AbstractFrontendPage.php b/src/CoreShop/Behat/Page/Frontend/AbstractFrontendPage.php
@@ -18,7 +18,7 @@
 
 namespace CoreShop\Behat\Page\Frontend;
 
-use FriendsOfBehat\PageObjectExtension\Page\SymfonyPage;
+use CoreShop\Behat\Page\SymfonyPage;
 
 abstract class AbstractFrontendPage extends SymfonyPage implements FrontendPageInterface
 {
diff --git a/src/CoreShop/Behat/Page/Frontend/Account/ChangePasswordPage.php b/src/CoreShop/Behat/Page/Frontend/Account/ChangePasswordPage.php
@@ -20,6 +20,7 @@
 
 use Behat\Mink\Exception\ElementNotFoundException;
 use CoreShop\Behat\Page\Frontend\AbstractFrontendPage;
+use CoreShop\Behat\Service\DriverHelper;
 
 class ChangePasswordPage extends AbstractFrontendPage implements ChangePasswordPageInterface
 {
@@ -57,6 +58,8 @@ public function specifyConfirmationPassword(string $password): void
     public function save(): void
     {
         $this->getElement('save_changes')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     protected function getDefinedElements(): array
diff --git a/src/CoreShop/Behat/Page/Frontend/Account/ChangeProfilePage.php b/src/CoreShop/Behat/Page/Frontend/Account/ChangeProfilePage.php
@@ -20,6 +20,7 @@
 
 use Behat\Mink\Exception\ElementNotFoundException;
 use CoreShop\Behat\Page\Frontend\AbstractFrontendPage;
+use CoreShop\Behat\Service\DriverHelper;
 
 class ChangeProfilePage extends AbstractFrontendPage implements ChangeProfilePageInterface
 {
@@ -62,6 +63,8 @@ public function specifyConfirmationEmail(?string $email = null): void
     public function save(): void
     {
         $this->getElement('save_changes')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     protected function getDefinedElements(): array
diff --git a/src/CoreShop/Behat/Page/Frontend/Account/LoginPage.php b/src/CoreShop/Behat/Page/Frontend/Account/LoginPage.php
@@ -19,6 +19,7 @@
 namespace CoreShop\Behat\Page\Frontend\Account;
 
 use CoreShop\Behat\Page\Frontend\AbstractFrontendPage;
+use CoreShop\Behat\Service\DriverHelper;
 
 class LoginPage extends AbstractFrontendPage implements LoginPageInterface
 {
@@ -35,6 +36,8 @@ public function hasValidationErrorWith(string $message): bool
     public function logIn(): void
     {
         $this->getElement('login_button')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function specifyPassword(string $password): void
diff --git a/src/CoreShop/Behat/Page/Frontend/Account/RequestPasswordResetPage.php b/src/CoreShop/Behat/Page/Frontend/Account/RequestPasswordResetPage.php
@@ -20,6 +20,7 @@
 
 use Behat\Mink\Exception\ElementNotFoundException;
 use CoreShop\Behat\Page\Frontend\AbstractFrontendPage;
+use CoreShop\Behat\Service\DriverHelper;
 
 class RequestPasswordResetPage extends AbstractFrontendPage implements RequestPasswordResetPageInterface
 {
@@ -45,6 +46,8 @@ public function checkValidationMessageFor(string $element, string $message): boo
     public function reset(): void
     {
         $this->getElement('reset_button')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function specifyEmail(?string $email): void
diff --git a/src/CoreShop/Behat/Page/Frontend/CartPage.php b/src/CoreShop/Behat/Page/Frontend/CartPage.php
@@ -19,6 +19,7 @@
 namespace CoreShop\Behat\Page\Frontend;
 
 use Behat\Mink\Exception\ElementNotFoundException;
+use CoreShop\Behat\Service\DriverHelper;
 use CoreShop\Component\Product\Model\ProductUnitDefinitionInterface;
 
 class CartPage extends AbstractFrontendPage implements CartPageInterface
@@ -93,17 +94,23 @@ public function changeQuantity(string $productName, string $quantity): void
     {
         $this->getElement('item_quantity_input', ['%name%' => $productName])->setValue($quantity);
         $this->getElement('update_cart_button')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function removeProduct(string $productName): void
     {
         $this->getElement('delete_button', ['%name%' => $productName])->press();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function applyVoucherCode(string $voucherCode): void
     {
         $this->getElement('voucher_code')->setValue($voucherCode);
         $this->getElement('apply_voucher_button')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function getTotal(): string
diff --git a/src/CoreShop/Behat/Page/Frontend/Checkout/AddressPage.php b/src/CoreShop/Behat/Page/Frontend/Checkout/AddressPage.php
@@ -19,6 +19,7 @@
 namespace CoreShop\Behat\Page\Frontend\Checkout;
 
 use CoreShop\Behat\Page\Frontend\AbstractFrontendPage;
+use CoreShop\Behat\Service\DriverHelper;
 use CoreShop\Component\Address\Model\AddressInterface;
 
 class AddressPage extends AbstractFrontendPage implements AddressPageInterface
@@ -31,6 +32,8 @@ public function getRouteName(): string
     public function chooseDifferentShippingAddress(): void
     {
         $this->getElement('use_invoice_as_shipping')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function useShippingAddress(AddressInterface $shippingAddress): void
@@ -51,6 +54,8 @@ public function shippingAddressVisible(): bool
     public function submitStep(): void
     {
         $this->getElement('submit_address_step')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     protected function getAdditionalParameters(): array
diff --git a/src/CoreShop/Behat/Page/Frontend/Checkout/CustomerPage.php b/src/CoreShop/Behat/Page/Frontend/Checkout/CustomerPage.php
@@ -19,6 +19,7 @@
 namespace CoreShop\Behat\Page\Frontend\Checkout;
 
 use CoreShop\Behat\Page\Frontend\AbstractFrontendPage;
+use CoreShop\Behat\Service\DriverHelper;
 
 class CustomerPage extends AbstractFrontendPage implements CustomerPageInterface
 {
@@ -117,6 +118,8 @@ public function acceptTermsOfService(): void
     public function submitGuestCheckout(): void
     {
         $this->getElement('guest_submit')->press();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     protected function getDefinedElements(): array
diff --git a/src/CoreShop/Behat/Page/Frontend/Checkout/PaymentPage.php b/src/CoreShop/Behat/Page/Frontend/Checkout/PaymentPage.php
@@ -19,6 +19,7 @@
 namespace CoreShop\Behat\Page\Frontend\Checkout;
 
 use CoreShop\Behat\Page\Frontend\AbstractFrontendPage;
+use CoreShop\Behat\Service\DriverHelper;
 use CoreShop\Component\Core\Model\PaymentProviderInterface;
 
 class PaymentPage extends AbstractFrontendPage implements PaymentPageInterface
@@ -36,6 +37,8 @@ public function selectPaymentProvider(PaymentProviderInterface $paymentProvider)
     public function submitStep(): void
     {
         $this->getElement('submit_payment_step')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     protected function getAdditionalParameters(): array
diff --git a/src/CoreShop/Behat/Page/Frontend/Checkout/ShippingPage.php b/src/CoreShop/Behat/Page/Frontend/Checkout/ShippingPage.php
@@ -19,6 +19,7 @@
 namespace CoreShop\Behat\Page\Frontend\Checkout;
 
 use CoreShop\Behat\Page\Frontend\AbstractFrontendPage;
+use CoreShop\Behat\Service\DriverHelper;
 
 class ShippingPage extends AbstractFrontendPage implements ShippingPageInterface
 {
@@ -30,6 +31,8 @@ public function getRouteName(): string
     public function submitStep(): void
     {
         $this->getElement('submit_shipping_step')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function getCarriers(): array
diff --git a/src/CoreShop/Behat/Page/Frontend/Checkout/SummaryPage.php b/src/CoreShop/Behat/Page/Frontend/Checkout/SummaryPage.php
@@ -19,6 +19,7 @@
 namespace CoreShop\Behat\Page\Frontend\Checkout;
 
 use CoreShop\Behat\Page\Frontend\AbstractFrontendPage;
+use CoreShop\Behat\Service\DriverHelper;
 
 class SummaryPage extends AbstractFrontendPage implements SummaryPageInterface
 {
@@ -30,6 +31,8 @@ public function getRouteName(): string
     public function submitOrder(): void
     {
         $this->getElement('submit_order')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function acceptTermsOfService(): void
@@ -45,6 +48,8 @@ public function declineTermsOfService(): void
     public function submitQuote(): void
     {
         $this->getElement('submit_quote')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     protected function getAdditionalParameters(): array
diff --git a/src/CoreShop/Behat/Page/Frontend/HomePage.php b/src/CoreShop/Behat/Page/Frontend/HomePage.php
@@ -19,6 +19,7 @@
 namespace CoreShop\Behat\Page\Frontend;
 
 use Behat\Mink\Element\NodeElement;
+use CoreShop\Behat\Service\DriverHelper;
 
 class HomePage extends AbstractFrontendPage implements HomePageInterface
 {
@@ -35,6 +36,8 @@ public function getContent(): string
     public function logOut(): void
     {
         $this->getElement('logout_button')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function hasLogoutButton(): bool
@@ -57,6 +60,8 @@ public function switchCurrency(string $currencyCode): void
         $this->getElement('currency_selector')->click();
 
         $this->getElement('currency_selector_code', ['%code%' => $currencyCode])->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function getActiveLocale(): string
diff --git a/src/CoreShop/Behat/Page/Frontend/ProductPage.php b/src/CoreShop/Behat/Page/Frontend/ProductPage.php
@@ -19,6 +19,7 @@
 namespace CoreShop\Behat\Page\Frontend;
 
 use Behat\Mink\Element\NodeElement;
+use CoreShop\Behat\Service\DriverHelper;
 use CoreShop\Component\Product\Model\ProductUnitDefinitionInterface;
 use CoreShop\Component\Product\Model\ProductUnitInterface;
 use CoreShop\Component\Variant\Model\AttributeInterface;
@@ -90,35 +91,47 @@ public function getQuantityPriceRulesForUnit(ProductUnitInterface $unit): array
     public function addToCart(): void
     {
         $this->getElement('add_to_cart')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function addToWishlist(): void
     {
         $this->getElement('add_to_wishlist')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function addToCartWithQuantity(string $quantity): void
     {
         $this->getElement('quantity')->setValue($quantity);
         $this->getElement('add_to_cart')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function addToCartInUnit(ProductUnitDefinitionInterface $unit): void
     {
         $this->getElement('unit')->setValue($unit->getId());
         $this->getElement('add_to_cart')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function addToCartInUnitWithQuantity(ProductUnitDefinitionInterface $unit, string $quantity): void
     {
         $this->getElement('unit')->setValue($unit->getId());
         $this->getElement('quantity')->setValue($quantity);
         $this->getElement('add_to_cart')->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function clickAttribute(AttributeInterface $attribute): void
     {
         $this->getElement('attribute-label', ['%id%' => $attribute->getId()])->click();
+
+        DriverHelper::waitForPageToLoad($this->getSession());
     }
 
     public function isAttributeSelected(AttributeInterface $attribute): bool
diff --git a/src/CoreShop/Behat/Page/Frontend/WishlistPage.php b/src/CoreShop/Behat/Page/Frontend/WishlistPage.php
diff --git a/src/CoreShop/Behat/Page/Pimcore/AbstractPimcorePage.php b/src/CoreShop/Behat/Page/Pimcore/AbstractPimcorePage.php
diff --git a/src/CoreShop/Behat/Page/SymfonyPage.php b/src/CoreShop/Behat/Page/SymfonyPage.php
diff --git a/src/CoreShop/Behat/Page/SymfonyPageInterface.php b/src/CoreShop/Behat/Page/SymfonyPageInterface.php
diff --git a/src/CoreShop/Behat/Service/DriverHelper.php b/src/CoreShop/Behat/Service/DriverHelper.php

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@`
`19`	`19`	`namespace CoreShop\Behat\Element\Frontend\Account;`
`20`	`20`
`21`	`21`	`use Behat\Mink\Exception\ElementNotFoundException;`
	`22`	`+use CoreShop\Behat\Service\DriverHelper;`
`22`	`23`	`use FriendsOfBehat\PageObjectExtension\Element\Element;`
`23`	`24`
`24`	`25`	`final class RegisterElement extends Element implements RegisterElementInterface`
`@@ -44,6 +45,8 @@ public function checkValidationMessageFor(string $element, string $message): boo`
`44`	`45`	`public function register(): void`
`45`	`46`	`{`
`46`	`47`	`$this->getElement('create_account_button')->press();`
	`48`	`+`
	`49`	`+ DriverHelper::waitForPageToLoad($this->getSession());`
`47`	`50`	`}`
`48`	`51`
`49`	`52`	`public function getEmail(): string`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@`
`18`	`18`
`19`	`19`	`namespace CoreShop\Behat\Page\Frontend;`
`20`	`20`
`21`		`-use FriendsOfBehat\PageObjectExtension\Page\SymfonyPage;`
	`21`	`+use CoreShop\Behat\Page\SymfonyPage;`
`22`	`22`
`23`	`23`	`abstract class AbstractFrontendPage extends SymfonyPage implements FrontendPageInterface`
`24`	`24`	`{`
Original file line number	Diff line number	Diff line change
`@@ -20,6 +20,7 @@`
`20`	`20`
`21`	`21`	`use Behat\Mink\Exception\ElementNotFoundException;`
`22`	`22`	`use CoreShop\Behat\Page\Frontend\AbstractFrontendPage;`
	`23`	`+use CoreShop\Behat\Service\DriverHelper;`
`23`	`24`
`24`	`25`	`class ChangePasswordPage extends AbstractFrontendPage implements ChangePasswordPageInterface`
`25`	`26`	`{`
`@@ -57,6 +58,8 @@ public function specifyConfirmationPassword(string $password): void`
`57`	`58`	`public function save(): void`
`58`	`59`	`{`
`59`	`60`	`$this->getElement('save_changes')->click();`
	`61`	`+`
	`62`	`+ DriverHelper::waitForPageToLoad($this->getSession());`
`60`	`63`	`}`
`61`	`64`
`62`	`65`	`protected function getDefinedElements(): array`