[PimcoreX] UI Tests

.gitignore

@@ -48,6 +48,7 @@ parameters.yml
 var
 .env
 composer.lock
-docker-compose.yml
+docker-compose.yaml
 app/config/local/
 app/config/pimcore/
+.php-version

app/config/config_stan.yml

@@ -1,10 +1,6 @@
 imports:
     - { resource: config.yml }
 
-pimcore:
-    cache:
-        pool_service_id: pimcore.cache.core.pool.array
-
 doctrine:
     dbal:
         connections:

app/config/config_test.yml

@@ -2,11 +2,6 @@ imports:
     - { resource: config.yml }
     - { resource: '../../src/CoreShop/Behat/Resources/config/services.yml' }
 
-# this cache is used during tests when setting up pimcore
-pimcore:
-    cache:
-        pool_service_id: pimcore.cache.core.pool.array
-
 doctrine:
     dbal:
         connections:

bin/chromedriver-bin/notes.txt

@@ -1,18 +1,18 @@
----------ChromeDriver 83.0.4103.39 (2020-05-05)---------
-Supports Chrome version 83
-Resolved issue 1778: Deprecate launchApp from ChromeDriver [Pri-2]
-Resolved issue 2520: InitSession can wait forever when Chrome is unresponsive [Pri-3]
-Resolved issue 3120: Headless mode download from new tab [Pri-2]
-Resolved issue 3234: Confirm semicolon found before substring [Pri-3]
-Resolved issue 3240: ExecuteGetElementRect does not check returned status from GET_SIZE [Pri-2]
-Resolved issue 3331: The get_cookies() method is returning 'expiry' keys of type double, but should be int64 in w3c mode [Pri-2]
-Resolved issue 3332: Retry timeout logged as severe [Pri-2]
-Resolved issue 3339: Chromedriver exited unexpectedly with code null, signal SIGTRAP [Pri-2]
-Resolved issue 3351: Improve Security Considerations message [Pri-2]
-Resolved issue 3352: Support SendKeys for color elements [Pri-2]
-Resolved issue 3353: Wait for Pending Navigation continues after frame context destroyed [Pri-2]
-Resolved issue 3375: Chromedriver v80 hangs on getPageSource on some sites [Pri-1]
-Resolved issue 3383: ChromeDriver 80+ on Windows seems to exit or stall on certain element or click commands [Pri-1]
-Resolved issue 3399: Remove wasThrown check [Pri-3]
-Resolved issue 3421: chromedriver 81. Driver returns Cyrillic text without styles [Pri-2]
-Resolved issue 3422: GetElementText breaks with prototype 1.6.0.3 and chromedriver 81 [Pri-]
+---------ChromeDriver 87.0.4280.88 (2020-12-02)---------
+Supports Chrome version 87
+Resolved issue 2421: Delete old port-forwarding channels on android adb-server
+[Pri-3]
+Resolved issue 3474: Emulated mobile device list needs updating [Pri-3]
+Resolved issue 3507: Implement "get computed role" [Pri-]
+Resolved issue 3508: Implement "get computed label" [Pri-]
+Resolved issue 3584: Rename ChromeDriver command line option --whitelisted-ips
+[Pri-2]
+Resolved issue 3588: Bidi WebSocket connection [Pri-]
+Resolved issue 3594: Navigation completes prematurely if OOPIF loads before main
+page [Pri-2]
+Resolved issue 3598: A command line option for devtools port to be forwarded to
+webview_devtools_remote socket. [Pri-]
+Resolved issue 3608: Chromedriver debuggerAddress does not support ipv6 [Pri-]
+Resolved issue 3641: Page not getting loaded/rendered when browser window is not
+in focus with Chrome Beta v87 and chromedriver v(87/86)
+Resolved issue 3657: Screenshot background browser timed out

composer.json

@@ -84,15 +84,13 @@
     "jms/serializer-bundle": "^3.7",
     "knplabs/knp-menu-bundle": "^3.0.0",
     "sylius/theme-bundle": "^2.1",
-    "payum/offline": "^1.4",
-    "payum/paypal-express-checkout-nvp": "^1.4",
-    "payum/payum-bundle": "^2.2",
-    "payum/sofort": "^1.4",
     "php-http/guzzle6-adapter": "^2.0",
     "pimcore/pimcore": "^10.0.0",
     "rinvex/countries": "^6.0",
     "stof/doctrine-extensions-bundle": "^1.5",
-    "webmozart/assert": "^1.2"
+    "webmozart/assert": "^1.2",
+    "payum/payum": "dev-master",
+    "payum/payum-bundle": "dev-master"
   },
   "require-dev": {
     "behat/behat": "^3.3",
@@ -105,9 +103,10 @@
     "symplify/easy-coding-standard": "^9.0.0",
     "behat/mink": "^1.8",
     "friends-of-behat/mink-extension": "^2.4",
-    "coreshop/behat-panther-extension": "^1.0",
     "lakion/mink-debug-extension": "^2.0",
-    "friends-of-behat/mink-debug-extension": "^2.0"
+    "friends-of-behat/mink-debug-extension": "^2.0",
+    "phpunit/phpunit": "^9.5",
+    "robertfausk/behat-panther-extension": "^1.0"
   },
   "conflict": {
     "dpfaffenbauer/process-manager": "<2.4",

src/CoreShop/Behat/Context/Setup/StoreContext.php

@@ -159,9 +159,9 @@ private function createStore($name, CurrencyInterface $currency = null, CountryI
             $country->setAddressFormat('
                 {{ company }}
                 {{ salutation }} {{ firstname }} {{ lastname }}
-                {{ street }};
-                {{ postCode }};
-                {{ country.name }};
+                {{ street }}
+                {{ postcode }}
+                {{ country.name }}
             ');
 
             $this->entityManager->persist($country);

src/CoreShop/Behat/Resources/config/profiles/ui.yml

@@ -28,7 +28,7 @@ ui:
 #                            external_converted_uri: "http://localhost:9080/app_test.php"
             show_auto: false
 
-        CoreShop\Behat\PantherExtension: ~
+        Robertfausk\Behat\PantherExtension: ~
 
     gherkin:
         filters:

src/CoreShop/Behat/Resources/config/profiles/ui_precision.yml

@@ -28,7 +28,7 @@ ui_precision:
 #                            external_converted_uri: "http://localhost:9080/app_test_precision.php"
             show_auto: false
 
-        CoreShop\Behat\PantherExtension: ~
+        Robertfausk\Behat\PantherExtension: ~
 
     gherkin:
         filters:

src/CoreShop/Behat/Resources/config/suites.yml

@@ -1,22 +1,4 @@
 imports:
-    - suites/domain/product.yml
-    - suites/domain/currency.yml
-    - suites/domain/taxation.yml
-    - suites/domain/cart.yml
-    - suites/domain/category.yml
-    - suites/domain/shipping.yml
-    - suites/domain/country.yml
-    - suites/domain/index.yml
-    - suites/domain/index_condition.yml
-    - suites/domain/pimcore.yml
-    - suites/domain/order.yml
-    - suites/domain/seo.yml
-    - suites/domain/cli.yml
-    - suites/domain/filter.yml
-    - suites/domain/tracking.yml
-    - suites/domain/theme.yml
-    - suites/domain/product_quantity_price_rules.yml
-    - suites/domain/menu.yml
-    - suites/domain/version.yml
-    - suites/domain/recycle_bin.yml
-    - suites/domain/optimistic_entity_lock.yml
+    - suites/domain.yml
+    - suites/ui.yml
+    - suites/ui_pimcore.yml

src/CoreShop/Behat/Resources/config/suites/domain.yml

@@ -19,3 +19,4 @@ imports:
     - domain/menu.yml
     - domain/version.yml
     - domain/recycle_bin.yml
+    - domain/optimistic_entity_lock.yml

src/CoreShop/Behat/Service/CookieSetter.php

@@ -15,6 +15,7 @@
 namespace CoreShop\Behat\Service;
 
 use Behat\Mink\Driver\PantherDriver;
+use Behat\Mink\Exception\DriverException;
 use Behat\Mink\Session;
 use Symfony\Component\BrowserKit\Cookie;
 
@@ -61,7 +62,12 @@ private function shouldMinkSessionBePrepared(Session $session): bool
     {
         $driver = $session->getDriver();
 
-        if ($driver instanceof PantherDriver && $driver->getClient() === null) {
+        try {
+            if ($driver instanceof PantherDriver && $driver->getClient() === null) {
+                return true;
+            }
+        }
+        catch (DriverException $e) {
             return true;
         }
 

src/CoreShop/Bundle/CoreBundle/Doctrine/ORM/ProductStoreValuesRepository.php

@@ -30,7 +30,6 @@ public function findForProduct(ProductInterface $product): array
             ->andWhere('o.product = :product')
             ->setParameter('product', $product->getId())
             ->getQuery()
-            ->useResultCache(false)
             ->useQueryCache(true)
             ->getResult();
     }
@@ -46,7 +45,6 @@ public function findForProductAndStore(ProductInterface $product, StoreInterface
             ->setParameter('product', $product->getId())
             ->setParameter('store', $store)
             ->getQuery()
-            ->useResultCache(false)
             ->useQueryCache(true)
             ->getOneOrNullResult();
     }

src/CoreShop/Bundle/CoreBundle/Test/Service/NotificationRuleListener.php

@@ -20,24 +20,14 @@
 
 final class NotificationRuleListener implements NotificationRuleListenerInterface
 {
-    /**
-     * @var string
-     */
     private $cacheDir;
-
-    /**
-     * @var array
-     */
     private $firedEvents = [];
 
     public function __construct(string $cacheDir)
     {
         $this->cacheDir = $cacheDir;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function hasBeenFired($type)
     {
         $finder = new Finder();
@@ -46,9 +36,6 @@ public function hasBeenFired($type)
         return $finder->count() > 0;
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function clear()
     {
         if (!is_dir($this->cacheDir)) {
@@ -65,9 +52,6 @@ public function clear()
         }
     }
 
-    /**
-     * {@inheritdoc}
-     */
     public function applyNewFired(GenericEvent $type)
     {
         $data = [
@@ -76,7 +60,7 @@ public function applyNewFired(GenericEvent $type)
         ];
 
         if (!is_dir($this->cacheDir)) {
-            mkdir($this->cacheDir);
+            mkdir($this->cacheDir, 0777, true);
         }
 
         file_put_contents(sprintf('%s/%s.%s.notification', $this->cacheDir, uniqid(), $type->getSubject()), serialize($data));

src/CoreShop/Bundle/FrontendBundle/Controller/CartController.php

@@ -49,7 +49,7 @@ class CartController extends FrontendController
      */
     public function widgetAction(Request $request)
     {
-        return $this->renderTemplate($this->templateConfigurator->findTemplate('Cart/_widget.html'), [
+        return $this->render($this->templateConfigurator->findTemplate('Cart/_widget.html'), [
             'cart' => $this->getCart(),
         ]);
     }
@@ -75,7 +75,7 @@ public function summaryAction(Request $request)
                 if (!$voucherCode instanceof CartPriceRuleVoucherCodeInterface) {
                     $this->addFlash('error', $this->get('translator')->trans('coreshop.ui.error.voucher.not_found'));
 
-                    return $this->renderTemplate($this->templateConfigurator->findTemplate('Cart/summary.html'), [
+                    return $this->render($this->templateConfigurator->findTemplate('Cart/summary.html'), [
                         'cart' => $this->getCart(),
                         'form' => $form->createView(),
                     ]);
@@ -101,7 +101,7 @@ public function summaryAction(Request $request)
             }
         }
 
-        return $this->renderTemplate($this->templateConfigurator->findTemplate('Cart/summary.html'), [
+        return $this->render($this->templateConfigurator->findTemplate('Cart/summary.html'), [
             'cart' => $cart,
             'form' => $form->createView(),
         ]);
@@ -150,7 +150,7 @@ public function shipmentCalculationAction(Request $request)
             });
         }
 
-        return $this->renderTemplate($this->templateConfigurator->findTemplate('Cart/ShipmentCalculator/_widget.html'), [
+        return $this->render($this->templateConfigurator->findTemplate('Cart/ShipmentCalculator/_widget.html'), [
             'cart' => $cart,
             'form' => $form->createView(),
             'availableCarriers' => $availableCarriers,
@@ -235,7 +235,7 @@ public function addItemAction(Request $request)
             ]);
         }
 
-        return $this->renderTemplate(
+        return $this->render(
             $request->get('template', $this->templateConfigurator->findTemplate('Product/_addToCart.html')),
             [
                 'form' => $form->createView(),

src/CoreShop/Bundle/FrontendBundle/Controller/CategoryController.php

@@ -68,7 +68,7 @@ public function menuAction(Request $request)
     {
         $categories = $this->getRepository()->findForStore($this->getContext()->getStore());
 
-        return $this->renderTemplate($this->templateConfigurator->findTemplate('Category/_menu.html'), [
+        return $this->render($this->templateConfigurator->findTemplate('Category/_menu.html'), [
             'categories' => $categories,
         ]);
     }
@@ -89,7 +89,7 @@ public function menuLeftAction(Request $request)
             $activeSubCategories = $this->getRepository()->findChildCategoriesForStore($activeCategory, $this->getContext()->getStore());
         }
 
-        return $this->renderTemplate($this->templateConfigurator->findTemplate('Category/_menu-left.html'), [
+        return $this->render($this->templateConfigurator->findTemplate('Category/_menu-left.html'), [
             'categories' => $firstLevelCategories,
             'activeCategory' => $activeCategory,
             'activeSubCategories' => $activeSubCategories,
@@ -222,7 +222,7 @@ public function indexAction(Request $request)
 
         $this->get(SEOPresentationInterface::class)->updateSeoMetadata($category);
 
-        return $this->renderTemplate($this->templateConfigurator->findTemplate('Category/index.html'), $viewParameters);
+        return $this->render($this->templateConfigurator->findTemplate('Category/index.html'), $viewParameters);
     }
 
     /**

src/CoreShop/Bundle/FrontendBundle/Controller/CheckoutController.php

@@ -92,7 +92,7 @@ public function processAction(Request $request)
 
         $event = new CheckoutEvent($this->getCart(), ['step' => $step, 'step_identifier', $stepIdentifier]);
 
-        $this->get('event_dispatcher')->dispatch(CheckoutEvents::CHECKOUT_STEP_PRE, $event);
+        $this->get('event_dispatcher')->dispatch($event, CheckoutEvents::CHECKOUT_STEP_PRE);
 
         if ($event->isStopped()) {
             $this->addEventFlash($event->getMessageType(), $event->getMessage(), $event->getMessageParameters());
@@ -144,7 +144,7 @@ public function processAction(Request $request)
 
         $event = new CheckoutEvent($this->getCart(), ['step' => $step, 'step_identifier', $stepIdentifier, 'step_params' => $dataForStep]);
 
-        $this->get('event_dispatcher')->dispatch(CheckoutEvents::CHECKOUT_STEP_POST, $event);
+        $this->get('event_dispatcher')->dispatch($event, CheckoutEvents::CHECKOUT_STEP_POST);
 
         if ($event->isStopped()) {
             $this->addEventFlash($event->getMessageType(), $event->getMessage(), $event->getMessageParameters());
@@ -171,7 +171,7 @@ protected function renderResponseForCheckoutStep(Request $request, CheckoutStepI
     {
         $template = $this->templateConfigurator->findTemplate(sprintf('Checkout/steps/%s.html', $stepIdentifier));
 
-        return $this->renderTemplate($template, $dataForStep);
+        return $this->render($template, $dataForStep);
     }
 
     /**
@@ -216,7 +216,7 @@ public function doCheckoutAction(Request $request)
 
         $event = new CheckoutEvent($this->getCart());
 
-        $this->get('event_dispatcher')->dispatch(CheckoutEvents::CHECKOUT_DO_PRE, $event);
+        $this->get('event_dispatcher')->dispatch($event, CheckoutEvents::CHECKOUT_DO_PRE);
 
         if ($event->isStopped()) {
             $this->addEventFlash($event->getMessageType(), $event->getMessage(), $event->getMessageParameters());
@@ -253,14 +253,14 @@ public function doCheckoutAction(Request $request)
 
             $request->getSession()->set('coreshop_order_id', $order->getId());
 
-            $this->get('event_dispatcher')->dispatch(CheckoutEvents::CHECKOUT_DO_POST, new CheckoutEvent($this->getCart(), ['order' => $order]));
+            $this->get('event_dispatcher')->dispatch(new CheckoutEvent($this->getCart(), ['order' => $order]), CheckoutEvents::CHECKOUT_DO_POST);
 
             $response = $this->redirectToRoute('coreshop_checkout_confirmation');
         }
 
         $event = new CheckoutEvent($this->getCart(), ['order' => $order]);
 
-        $this->get('event_dispatcher')->dispatch(CheckoutEvents::CHECKOUT_DO_POST, $event);
+        $this->get('event_dispatcher')->dispatch($event, CheckoutEvents::CHECKOUT_DO_POST);
 
         if ($event->isStopped()) {
             $this->addEventFlash($event->getMessageType(), $event->getMessage(), $event->getMessageParameters());
@@ -302,7 +302,7 @@ public function errorAction(Request $request)
         $payments = $this->get('coreshop.repository.payment')->findForPayable($order);
         $lastPayment = is_array($payments) ? $payments[count($payments) - 1] : null;
 
-        return $this->renderTemplate($this->templateConfigurator->findTemplate('Checkout/error.html'), [
+        return $this->render($this->templateConfigurator->findTemplate('Checkout/error.html'), [
             'order' => $order,
             'payments' => $payments,
             'lastPayment' => $lastPayment,
@@ -334,7 +334,7 @@ public function thankYouAction(Request $request)
             $this->get('security.token_storage')->setToken(null);
         }
 
-        return $this->renderTemplate($this->templateConfigurator->findTemplate('Checkout/thank-you.html'), [
+        return $this->render($this->templateConfigurator->findTemplate('Checkout/thank-you.html'), [
             'order' => $order,
         ]);
     }