Fix behat

Author: patrick477

features/shop/filtering_products.feature

@@ -19,6 +19,7 @@ Feature: Filtering products
         And 3 of these products have text attribute "color" with "Red" value
         And 5 of these products have text attribute "color" with "Green" value
         And 7 of these products have text attribute "color" with "Blue" value
+        And populate elasticsearch
 
     @ui
     Scenario: Filtering products by name

tests/Behat/Context/Hook/ElasticsearchContext.php renamed to tests/Behat/Context/Setup/ElasticsearchContext.php

@@ -10,7 +10,7 @@
 
 declare(strict_types=1);
 
-namespace Tests\BitBag\SyliusElasticsearchPlugin\Behat\Context\Hook;
+namespace Tests\BitBag\SyliusElasticsearchPlugin\Behat\Context\Setup;
 
 use Behat\Behat\Context\Context;
 use Tests\BitBag\SyliusElasticsearchPlugin\Behat\Service\Populate;
@@ -31,9 +31,9 @@ public function __construct(Populate $populate)
     }
 
     /**
-     * @AfterScenario
+     * @Given populate elasticsearch
      */
-    public function populateIndex(): void
+    public function populateElasticsearch()
     {
         $this->populate->populateIndex();
     }

tests/Behat/Resources/services/contexts.yml

@@ -1,4 +1,3 @@
 imports:
     - { resource: "contexts/setup.yml" }
     - { resource: "contexts/ui.yml" }
-    - { resource: "contexts/hook.yml" }

tests/Behat/Resources/services/contexts/hook.yml

@@ -33,3 +33,10 @@ services:
             - "@__symfony__.doctrine.orm.entity_manager"
         tags:
             - { name: fob.context_service }
+
+    bitbag.sylius_elasticsearch_plugin.behat.context.setup.elasticsearch:
+        class: Tests\BitBag\SyliusElasticsearchPlugin\Behat\Context\Setup\ElasticsearchContext
+        arguments:
+            - "@bitbag.sylius_elasticsearch_plugin.behat.populate"
+        tags:
+            - { name: fob.context_service }

tests/Behat/Resources/services/contexts/setup.yml

@@ -4,8 +4,6 @@ default:
             contexts_services:
                 - sylius.behat.context.hook.doctrine_orm
 
-                - bitbag.sylius_elasticsearch_plugin.behat.context.hook.elasticsearch
-
                 - sylius.behat.context.transform.channel
                 - sylius.behat.context.transform.lexical
                 - sylius.behat.context.transform.locale
@@ -21,6 +19,7 @@ default:
                 - bitbag.sylius_elasticsearch_plugin.behat.context.setup.product
                 - bitbag.sylius_elasticsearch_plugin.behat.context.setup.product_attribute
                 - bitbag.sylius_elasticsearch_plugin.behat.context.setup.product_taxon
+                - bitbag.sylius_elasticsearch_plugin.behat.context.setup.elasticsearch
 
                 - bitbag.sylius_elasticsearch_plugin.behat.context.ui.shop.product
             filters: