Fix behaviour tests

Author: lruozzi9

config/services.yaml

@@ -45,5 +45,6 @@ services:
         arguments:
             - '@webgriffe.repository.back_in_stock_notification_subscription'
             - '@sylius.repository.product_variant'
+            - '@sylius.context.customer'
         tags:
             - { name: validator.constraint_validator }

e2e-test-server.sh

@@ -0,0 +1,5 @@
+# Make sure to set GOOGLE_CHROME env variable pointing to your Google Chrome binary. For example on macOS:
+# GOOGLE_CHROME="/Applications/Google Chrome.app/Contents/MacOS/Google Chrome" ./e2e-test-server.sh
+
+trap 'kill %1; kill %2' SIGINT
+cd tests/Application && APP_ENV=test symfony server:start --port=8080 --dir=public & "${GOOGLE_CHROME}" --enable-automation --disable-background-networking --no-default-browser-check --no-first-run --disable-popup-blocking --disable-default-apps --allow-insecure-localhost --disable-translate --disable-extensions --no-sandbox --enable-features=Metal --headless --remote-debugging-port=9222 --disable-gpu --window-size=2880,1800 --proxy-server='direct://' --proxy-bypass-list='*' --crash-dumps-dir=/tmp https://127.0.0.1 & tee

features/delete_product_subscription_from_my_account.feature

@@ -8,7 +8,7 @@ Feature: Ability to delete a particular subscription from my account
     And there is a customer "Francis Underwood" identified by an email "francis@underwood.com" and a password "whitehouse"
     And I am logged in as "francis@underwood.com"
 
-  @ui
+  @ui @javascript
   Scenario: Being able to delete a subscription from my account
     When I view product "Knitted cap apple"
     And I subscribe to the alert list for the product "Knitted cap apple"

public/js/back-in-stock-notification.js

@@ -36,7 +36,7 @@ document.addEventListener("DOMContentLoaded", function (event) {
   if (notificationTrigger) {
     notificationTrigger.onclick = function () {
       jQuery('#notification-overlay').modal('show')
-      document.querySelector('#back_in_stock_not input[type="hidden"]').value = getSelectedVariantCode()
+      document.querySelector('input[back-in-stock-notification-plugin-variant-code-input][type="hidden"]').value = getSelectedVariantCode()
     }
   }
 

src/Form/SubscriptionType.php

@@ -29,7 +29,9 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 ],
             ])
             ->add('product_variant_code', HiddenType::class)
-            ->add('submit', SubmitType::class)
+            ->add('submit', SubmitType::class, [
+                'label' => 'webgriffe_bisn.product_page.form_action',
+            ])
         ;
     }
 

src/Validator/SubscriptionUniqueValidator.php

@@ -4,8 +4,10 @@
 
 namespace Webgriffe\SyliusBackInStockNotificationPlugin\Validator;
 
+use Sylius\Component\Core\Model\CustomerInterface;
 use Sylius\Component\Core\Model\ProductVariantInterface;
 use Sylius\Component\Core\Repository\ProductVariantRepositoryInterface;
+use Sylius\Component\Customer\Context\CustomerContextInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 use Symfony\Component\Validator\Exception\UnexpectedTypeException;
@@ -20,6 +22,7 @@ final class SubscriptionUniqueValidator extends ConstraintValidator
     public function __construct(
         private SubscriptionRepositoryInterface $subscriptionRepository,
         private ProductVariantRepositoryInterface $productVariantRepository,
+        private CustomerContextInterface $customerContext,
     ) {
     }
 
@@ -41,7 +44,15 @@ public function validate(mixed $value, Constraint $constraint): void
         }
 
         $productVariantCode = $value['product_variant_code'];
-        $email = $value['email'];
+        if (array_key_exists('email', $value)) {
+            $email = $value['email'];
+        } else {
+            $customer = $this->customerContext->getCustomer();
+            if (!$customer instanceof CustomerInterface) {
+                return;
+            }
+            $email = $customer->getEmail();
+        }
         if (!is_string($productVariantCode) || !is_string($email)) {
             return;
         }

templates/productSubscriptionForm.html.twig

@@ -6,19 +6,21 @@
     {{ form_start(form, {
         'attr': {'class': 'ui form form-default', 'id': 'back_in_stock_not'},
         'action': path('webgriffe_back_in_stock_notification_add_subscription')
-    }) }}
+    }|merge(sylius_test_form_attribute('subscribe-to-notifications'))) }}
 
     {{ form_errors(form) }}
 
     {% if form.email is defined %}
         {{ form_row(form.email, {'attr': {'data-test-fill-subscription-form-whit-my-email':''}}) }}
     {% endif %}
 
-    {{ form_row(form.product_variant_code, {'attr': {'data-test-add-email-to-back-in-stock-notification-list':''}}) }}
+    {{ form_row(form.product_variant_code, {'attr': {
+        'back-in-stock-notification-plugin-variant-code-input':''
+    }}) }}
 
-    <button type="submit" class="ui huge primary icon labeled button" {{ sylius_test_html_attribute('subscribe-to-notifications') }}>
-        <i class="bell icon"></i> {{ 'webgriffe_bisn.product_page.form_action'|trans }}
-    </button>
+    {{ form_row(form.submit, {
+        'attr': {'class': 'ui huge primary icon labeled button'},
+    }) }}
 
     {{ form_row(form._token) }}
     {{ form_end(form, {'render_rest': false}) }}

tests/Behat/Element/Product/ShowPage/SubscriptionFormElement.php

@@ -4,19 +4,38 @@
 
 namespace Tests\Webgriffe\SyliusBackInStockNotificationPlugin\Behat\Element\Product\ShowPage;
 
+use Behat\Mink\Session;
 use FriendsOfBehat\PageObjectExtension\Element\Element;
+use Sylius\Behat\Page\Shop\Product\ShowPageInterface;
+use Sylius\Behat\Service\DriverHelper;
+use Sylius\Behat\Service\JQueryHelper;
 
 final class SubscriptionFormElement extends Element implements SubscriptionFormElementInterface
 {
+    /**
+     * @param mixed[]|\ArrayAccess<array-key, mixed> $minkParameters
+     */
+    public function __construct(
+        Session $session,
+        $minkParameters,
+        private ShowPageInterface $productPage,
+    ) {
+        parent::__construct($session, $minkParameters);
+    }
+
     public function submitFormAsAGuest(string $variant, string $email): void
     {
         $this->getElement('add_email')->setValue($email);
-        $this->getElement('submit_form')->click();
+        $this->getElement('submit_form')->submit();
+
+        $this->waitForProductPageRefresh();
     }
 
     public function submitFormAsALoggedCustomer(string $variant): void
     {
-        $this->getElement('submit_form')->click();
+        $this->getElement('submit_form')->submit();
+
+        $this->waitForProductPageRefresh();
     }
 
     public function openOverlayForConfigurableProduct(): void
@@ -32,4 +51,12 @@ protected function getDefinedElements(): array
             'submit_form' => '[data-test-subscribe-to-notifications]',
         ]);
     }
+
+    private function waitForProductPageRefresh(): void
+    {
+        if (DriverHelper::isJavascript($this->getDriver())) {
+            JQueryHelper::waitForAsynchronousActionsToFinish($this->getSession());
+            $this->getDocument()->waitFor(3, fn (): bool => $this->productPage->isOpen());
+        }
+    }
 }

tests/Behat/Resources/services.yaml

@@ -12,6 +12,8 @@ services:
   Tests\Webgriffe\SyliusBackInStockNotificationPlugin\Behat\Element\Product\ShowPage\SubscriptionFormElement:
     parent: 'sylius.behat.element'
     public: false
+    arguments:
+        - '@sylius.behat.page.shop.product.show'
 
   Tests\Webgriffe\SyliusBackInStockNotificationPlugin\Behat\Page\Shop\Account\Subscription\IndexPage:
     parent: 'sylius.behat.symfony_page'