API-599: correct tests

Author: Doodoune

.travis.yml

@@ -18,6 +18,7 @@ before_install:
     - composer self-update --no-interaction
 
 install:
+    - composer require php-http/guzzle6-adapter
     - composer install --prefer-dist --no-interaction
 
 script:

README.md

@@ -139,6 +139,7 @@ rm -rf composer.lock vendor/
 docker-compose run client_56 composer install
 docker-compose run client_56 bin/phpunit -c phpunit.xml.dist
 docker-compose run client_56 bin/phpspec run
+docker-compose run client_56 bin/php-cs-fixer fix --diff --dry-run --config=.php_cs.php
 ```
 
 ## Support

composer.json

@@ -27,16 +27,14 @@
     "php-http/discovery": "^1.0",
     "php-http/message-factory": "^v1.0",
     "php-http/multipart-stream-builder": "^1.0",
-    "php-http/client-implementation": "^1.0",
-    "php-http/guzzle6-adapter": "^1.1"
+    "php-http/client-implementation": "^1.0"
   },
   "require-dev": {
     "friendsofphp/php-cs-fixer": "^v2.3",
     "phpunit/phpunit": "5.7.*",
     "phpspec/phpspec": "3.2.*",
     "symfony/yaml": "^3.3",
-    "donatj/mock-webserver": "^2.0",
-    "php-http/guzzle6-adapter": "^1.1"
+    "donatj/mock-webserver": "^2.0"
   },
   "config": {
     "bin-dir": "bin"

phpunit.xml.dist

@@ -7,7 +7,7 @@
      convertErrorsToExceptions="true"
      convertNoticesToExceptions="true"
      convertWarningsToExceptions="true"
-     processIsolation="false"
+     processIsolation="true"
      stopOnFailure="false"
      syntaxCheck="false">
 

spec/Api/ProductMediaFileApiSpec.php

@@ -133,7 +133,7 @@ function it_creates_a_media_file($resourceClient, ResponseInterface $response)
             ->willReturn($response);
 
         $this->create($fileResource, $product)
-            ->shouldReturn($response);
+            ->shouldReturn('1/e/e/d/1eed10f108bde68b279d6f903f17b4b053e9d89d_akeneo.png');
     }
 
     function it_throws_an_exception_if_the_file_is_unreadable_when_creating_a_media_file()

spec/Search/SearchBuilderSpec.php

@@ -31,13 +31,13 @@ function it_builds_a_search_with_a_single_filter_without_options()
 
     function it_builds_a_search_with_a_single_filter_without_value_nor_option()
     {
-        $this->addFilter('family' , Operator::IS_EMPTY)->shouldReturn($this);
+        $this->addFilter('family' , Operator::EMPTY)->shouldReturn($this);
 
         $this->getFilters()->shouldReturn(
             [
                 'family'=> [
                     [
-                        'operator' => Operator::IS_EMPTY,
+                        'operator' => Operator::EMPTY,
                     ]
                 ]
             ]

src/Api/MediaFileApiInterface.php

@@ -7,7 +7,6 @@
 use Akeneo\Pim\ApiClient\Api\Operation\ListableResourceInterface;
 use Akeneo\Pim\ApiClient\Exception\HttpException;
 use Akeneo\Pim\ApiClient\Exception\RuntimeException;
-use GuzzleHttp\Psr7\Response;
 
 /**
  * API to manage the media files.
@@ -30,7 +29,7 @@ interface MediaFileApiInterface extends
      * @throws HttpException    If the request failed.
      * @throws RuntimeException If the file could not be opened.
      *
-     * @return Response returns the code of created media file
+     * @return string returns the code of created media file
      */
     public function create($mediaFile, array $data);
 }

src/Api/ProductMediaFileApi.php

@@ -99,18 +99,8 @@ public function create($mediaFile, array $productData)
         ];
 
         $response = $this->resourceClient->createMultipartResource(static::MEDIA_FILES_URI, [], $requestParts);
-        $headers = $response->getHeaders();
-
-        if (!isset($headers['Location'][0])) {
-            throw new RuntimeException('The response does not contain the URI of the created media-file.');
-        }
 
-        $matches = [];
-        if (1 !== preg_match(ProductMediaFileApi::MEDIA_FILE_URI_CODE_REGEX, $headers['Location'][0], $matches)) {
-            throw new RuntimeException('Unable to find the code in the URI of the created media-file.');
-        }
-        
-        return $response;
+        return $this->extractCodeFromCreationResponse($response);
     }
 
     /**

src/Search/Operator.php

@@ -27,7 +27,7 @@ final class Operator
     const GREATER_OR_EQUALS_THAN_ON_ALL_LOCALES = 'GREATER OR EQUALS THAN ON ALL LOCALES';
     const LOWER_THAN_ON_ALL_LOCALES = 'LOWER THAN ON ALL LOCALES';
     const LOWER_OR_EQUALS_THAN_ON_ALL_LOCALES = 'LOWER OR EQUALS THAN ON ALL LOCALES';
-    const IS_EMPTY = 'EMPTY';
+    const EMPTY = 'EMPTY';
     const NOT_EMPTY = 'NOT EMPTY';
     const BETWEEN = 'BETWEEN';
     const NOT_BETWEEN = 'NOT BETWEEN';

tests/Api/ApiTestCase.php

@@ -5,8 +5,6 @@
 use Akeneo\Pim\ApiClient\AkeneoPimClientBuilder;
 use Akeneo\Pim\ApiClient\AkeneoPimClientInterface;
 use Akeneo\Pim\ApiClient\Api\AuthenticationApi;
-use Akeneo\Pim\ApiClient\Api\ProductMediaFileApi;
-use Akeneo\Pim\ApiClient\Exception\RuntimeException;
 use donatj\MockWebServer\MockWebServer;
 use donatj\MockWebServer\Response;
 use donatj\MockWebServer\ResponseStack;
@@ -69,43 +67,4 @@ private function getAuthenticatedJson()
             }
 JSON;
     }
-
-    /**
-     * Extracts the code of a media-file from a creation response.
-     *
-     * @param $response
-     *
-     * @throws RuntimeException if unable to extract the code
-     *
-     * @return mixed
-     */
-    protected function extractCodeFromCreationResponse($response)
-    {
-        $headers = $response->getHeaders();
-
-        if (!isset($headers['Location'][0])) {
-            throw new RuntimeException('The response does not contain the URI of the created media-file.');
-        }
-
-        $matches = [];
-        if (1 !== preg_match(ProductMediaFileApi::MEDIA_FILE_URI_CODE_REGEX, $headers['Location'][0], $matches)) {
-            throw new RuntimeException('Unable to find the code in the URI of the created media-file.');
-        }
-
-        return $matches['code'];
-    }
-
-    /**
-     * @param CursorInterface $result
-     * @param array $expected
-     */
-    protected function assertSameResults()
-    {
-        $products = [];
-        foreach ($result as $product) {
-            $products[] = $product->getIdentifier();
-        }
-
-        $this->assertSame($products, $expected);
-    }
 }