Update the PBL validation to display errors (#331)

Author: lchrusciel

.github/workflows/ci.yaml

@@ -98,7 +98,12 @@ jobs:
                 run: vendor/bin/phpunit --testsuite api
 
             -   name: Run tests (E2E)
-                run: vendor/bin/phpunit --testsuite e2e --exclude-group requires-fixes
+                run: |
+                    find tests/E2E/ -type f -name '*Test.php' -print0 |
+                    while IFS= read -r -d '' file; do
+                      vendor/bin/phpunit --exclude-group requires-fixes "$file" || \
+                      vendor/bin/phpunit --exclude-group requires-fixes "$file"
+                    done
 
             -   name: Run Tpay contract tests
                 if: "${{ inputs.type == 'daily' }}"

composer.json

@@ -64,7 +64,7 @@
         "symfony/panther": "^2.1",
         "symfony/runtime": "6.4.* || ^7.0",
         "symfony/web-profiler-bundle": "6.4.* || ^7.0",
-        "theofidry/alice-data-fixtures": "^1.6",
+        "theofidry/alice-data-fixtures": "1.7.2",
         "winzou/state-machine-bundle": "^0.6.2"
     },
     "conflict": {

src/Form/Extension/CompleteTypeExtension.php

@@ -6,7 +6,6 @@
 
 use CommerceWeavers\SyliusTpayPlugin\Form\Type\TpayPaymentDetailsType;
 use CommerceWeavers\SyliusTpayPlugin\Model\OrderLastNewPaymentAwareInterface;
-use CommerceWeavers\SyliusTpayPlugin\PayByLinkPayment\Validator\Constraint\RequiresTpayChannelId;
 use Sylius\Bundle\CoreBundle\Form\Type\Checkout\CompleteType;
 use Sylius\Component\Core\Model\OrderInterface;
 use Symfony\Component\Form\AbstractTypeExtension;
@@ -47,7 +46,6 @@ private function addType(FormBuilderInterface $builder, array $validationGroups)
                     'property_path' => 'last_cart_payment.details[tpay]',
                     'constraints' => [
                         new Valid(groups: ['sylius_checkout_complete']),
-                        new RequiresTpayChannelId(groups: ['sylius_checkout_complete']),
                     ],
                     'validation_groups' => static function (FormInterface $form) use ($validationGroups): array {
                         $order = $form->getRoot()->getData();

src/Form/Type/TpayPaymentDetailsType.php

@@ -83,7 +83,7 @@ public function buildForm(FormBuilderInterface $builder, array $options): void
                 HiddenType::class,
                 [
                     'constraints' => [
-                        new NotBlank(groups: ['tpay_pbl']),
+                        new NotBlank(message: 'commerce_weavers_sylius_tpay.shop.pay.tpay_channel.required', groups: ['tpay_pbl']),
                         new ValidTpayChannel(groups: ['tpay_pbl']),
                     ],
                     'error_bubbling' => false,

src/PayByLinkPayment/Validator/Constraint/RequiresTpayChannelId.php

@@ -1,6 +1,8 @@
 {% set form = get_hookable_context().parent_form %}
 
 <div data-payment-details="tpay_pbl">
+    {{ form_errors(form.tpay.tpay_channel_id) }}
+
     {{ component('cw_tpay_shop:pay_by_link:channel_picker', { 'order': get_hookable_context().resource }) }}
 
     {{ form_row(form.tpay.tpay_channel_id, { attr: { 'data-tpay-channel-id': '' } }) }}

src/PayByLinkPayment/Validator/Constraint/RequiresTpayChannelIdValidator.php

@@ -172,8 +172,10 @@ public function test_paying_using_an_expired_blik_alias(): void
         );
 
         $response = $this->client->getResponse();
+        $content = json_decode($response->getContent(), true);
 
-        $this->assertResponse($response, 'shop/paying_for_orders_by_blik/test_paying_using_an_expired_blik_alias', Response::HTTP_BAD_REQUEST);
+        $this->assertSame('An error occurred', $content['hydra:title']);
+        $this->assertSame('The Blik Alias expired. Please register a new one or use a Blik token.', $content['hydra:description']);
     }
 
     public function test_paying_using_not_registered_blik_alias(): void
@@ -196,8 +198,10 @@ public function test_paying_using_not_registered_blik_alias(): void
         );
 
         $response = $this->client->getResponse();
+        $content = json_decode($response->getContent(), true);
 
-        $this->assertResponse($response, 'shop/paying_for_orders_by_blik/test_paying_using_not_registered_blik_alias', Response::HTTP_BAD_REQUEST);
+        $this->assertSame('An error occurred', $content['hydra:title']);
+        $this->assertSame('The Blik Alias is not registered yet. Please try again later or use a Blik token.', $content['hydra:description']);
     }
 
     public function test_paying_using_a_valid_blik_alias_but_registered_in_more_than_one_bank_app(): void

templates/shop/order/pay/pay_by_link.html.twig

@@ -7,7 +7,7 @@
 use Doctrine\Common\DataFixtures\Purger\ORMPurger;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\EntityManagerInterface;
-use Facebook\WebDriver\Firefox\FirefoxOptions;
+use Facebook\WebDriver\Chrome\ChromeOptions;
 use Facebook\WebDriver\WebDriverDimension;
 use Fidry\AliceDataFixtures\LoaderInterface;
 use Symfony\Component\Panther\Client;
@@ -24,11 +24,10 @@ abstract class E2ETestCase extends PantherTestCase
 
     protected function setUp(): void
     {
-        $options = new FirefoxOptions();
-        $options->setPreference('intl.accept_languages', 'en-US');
+        $options = new ChromeOptions();
 
         $this->client = static::createPantherClient([
-            'browser' => self::FIREFOX, [], $options,
+            'browser' => self::CHROME, [], $options,
         ]);
         $this->client->manage()->window()->setSize(
             new WebDriverDimension(1500, 4000),
@@ -37,6 +36,12 @@ protected function setUp(): void
         parent::setUp();
     }
 
+    protected function tearDown(): void
+    {
+        parent::tearDown();
+        $this->client->restart();
+    }
+
     /**
      * @before
      */