Fix tests after add new SearchFilter

Sylius · Mar 5, 2020 · f39f7ce · f39f7ce
1 parent 70a53de
commit f39f7ce
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 25 deletions.
diff --git a/features/currency/managing_exchange_rates/filtering_exchange_rates_by_currency.feature b/features/currency/managing_exchange_rates/filtering_exchange_rates_by_currency.feature
@@ -16,6 +16,6 @@ Feature: Filtering exchange rates by a currency
         When I browse exchange rates of the store
         And I choose "Euro" as a currency filter
         And I filter
-        Then I should see 2 filtered exchange rates on the list
+        Then I should see 2 exchange rates on the list
         And I should see an exchange rate between "Euro" and "British Pound" on the list
         And I should also see an exchange rate between "Polish Zloty" and "Euro" on the list
diff --git a/src/Sylius/Behat/Client/ApiClientInterface.php b/src/Sylius/Behat/Client/ApiClientInterface.php
@@ -25,6 +25,13 @@ public function buildCreateRequest(string $resource): void;
 
     public function buildUpdateRequest(string $resource, string $id): void;
 
+    public function buildFilter(
+        string $resource,
+        ?string $fieldType = null,
+        ?string $fieldValue = null,
+        ?string $previewFilters = null
+    ): string;
+
     public function addRequestData(string $key, string $value): void;
 
     public function addCompoundRequestData(array $data): void;
@@ -37,7 +44,7 @@ public function update(): void;
 
     public function delete(string $resource, string $id): void;
 
-    public function filter(string $resource, string $fieldType, string $fieldValue): void;
+    public function filter(string $filters): void;
 
     public function countCollectionItems(): int;
 

diff --git a/src/Sylius/Behat/Client/ApiPlatformClient.php b/src/Sylius/Behat/Client/ApiPlatformClient.php
@@ -60,6 +60,19 @@ public function buildUpdateRequest(string $resource, string $id): void
         $this->request['body'] = json_decode($this->client->getResponse()->getContent(), true);
     }
 
+    public function buildFilter(
+        string $resource,
+        ?string $fieldType = null,
+        ?string $fieldValue = null,
+        ?string $previewFilters = null
+    ): string {
+        if ($previewFilters === null) {
+            return sprintf('/new-api/%s?%s=%s', $resource, $fieldType, $fieldValue);
+        }
+
+        return sprintf('%s&%s=%s', $previewFilters, $fieldType, $fieldValue);
+    }
+
     public function addRequestData(string $key, string $value): void
     {
         $this->request['body'][$key] = $value;
@@ -94,15 +107,11 @@ public function delete(string $resource, string $id): void
         $this->request('DELETE', sprintf('/new-api/%s/%s', $resource, $id), []);
     }
 
-    public function filter(string $resource, string $fieldType, string $fieldValue): void
+    public function filter(string $filters): void
     {
         $this->client->request(
-            'GET', sprintf(
-                '/new-api/%s?%s=%s',
-                $resource,
-                $fieldType,
-                $fieldValue
-            ),
+            'GET',
+            $filters,
             [],
             [],
             ['HTTP_ACCEPT' => 'application/ld+json']

diff --git a/src/Sylius/Behat/Context/Api/Admin/ManagingExchangeRatesContext.php b/src/Sylius/Behat/Context/Api/Admin/ManagingExchangeRatesContext.php
@@ -141,29 +141,18 @@ public function iDeleteTheExchangeRateBetweenAnd(CurrencyInterface $sourceCurren
      */
     public function iChooseCurrencyAsACurrencyFilter(CurrencyInterface $currency): void
     {
-        $exchangeRates = [];
-        $this->client->filter('exchange_rates', 'sourceCurrency.code', $currency->getCode());
-        $exchangeRates = array_merge($exchangeRates, $this->client->getCollection());
-        $this->client->filter('exchange_rates', 'targetCurrency.code', $currency->getCode());
-        $exchangeRates = array_merge($exchangeRates, $this->client->getCollection());
+        $filters = $this->client->buildFilter('exchange_rates', 'sourceCurrency.code', $currency->getCode());
+        $filters = $this->client->buildFilter('exchange_rates', 'targetCurrency.code', $currency->getCode(), $filters);
 
-        $this->sharedStorage->set('filtered_exchange_rates', $exchangeRates);
+        $this->sharedStorage->set('filters', $filters);
     }
 
     /**
      * @When I filter
      */
     public function iFilter(): void
     {
-        //Intentionally left blank to fulfill context expectation
-    }
-
-    /**
-     * @Then I should see :count filtered exchange rates on the list
-     */
-    public function iShouldSeeFilteredExchangeRatesOnTheList(int $count = 0): void
-    {
-        Assert::same(count($this->sharedStorage->get('filtered_exchange_rates')), $count);
+        $this->client->filter($this->sharedStorage->get('filters'));
     }
 
     /**

diff --git a/src/Sylius/Behat/Context/Ui/Admin/ManagingExchangeRatesContext.php b/src/Sylius/Behat/Context/Ui/Admin/ManagingExchangeRatesContext.php
@@ -168,7 +168,6 @@ public function iDeleteThem(): void
 
     /**
      * @Then I should see :count exchange rates on the list
-     * @Then I should see :count filtered exchange rates on the list
      */
     public function iShouldSeeExchangeRatesOnTheList($count = 0)
     {