Merge pull request #527 from elifesciences/remove-validatingstoragead…

…apter Remove broken test feature for mocking api-sdk calls to get subjects
elifesciences · Oct 22, 2024 · f3d3359 · f3d3359
2 parents 70d2c55 + 542fdc0
commit f3d3359
Show file tree

Hide file tree

Showing 12 changed files with 3 additions and 290 deletions.
diff --git a/composer.json b/composer.json
@@ -42,7 +42,6 @@
         "nyholm/psr7": "^1.1"
     },
     "require-dev": {
-        "csa/guzzle-cache-middleware": "^1.0",
         "mockery/mockery": "^1.0",
         "phpunit/phpunit": "^7.5",
         "squizlabs/php_codesniffer": "^3.5",

diff --git a/composer.lock b/composer.lock
diff --git a/tests/src/Search/HttpClient.php b/tests/src/Search/HttpClient.php
@@ -13,24 +13,11 @@
 
 trait HttpClient
 {
-    /** @var ValidatingStorageAdapter */
-    public $storage;
     public $httpClient;
 
     final protected function getHttpClient() : \eLife\ApiClient\HttpClient
     {
         if (null === $this->httpClient) {
-            $storage = new InMemoryStorageAdapter();
-            $validator = new JsonMessageValidator(
-                new PathBasedSchemaFinder(ComposerLocator::getPath('elife/api').'/dist/model'),
-                new Validator()
-            );
-
-            $this->storage = new ValidatingStorageAdapter($storage, $validator);
-
-            $stack = HandlerStack::create();
-            $stack->push(new MockMiddleware($this->storage, 'replay'));
-
             $this->httpClient = new Guzzle6HttpClient(new Client([
                 'base_uri' => 'http://api.elifesciences.org',
                 'handler' => $stack,

diff --git a/tests/src/Search/HttpMocks.php b/tests/src/Search/HttpMocks.php
diff --git a/tests/src/Search/Indexer/ModelIndexer/BlogArticleIndexerTest.php b/tests/src/Search/Indexer/ModelIndexer/BlogArticleIndexerTest.php
@@ -5,14 +5,12 @@
 use PHPUnit\Framework\TestCase;
 use eLife\ApiSdk\Model\BlogArticle;
 use eLife\Search\Indexer\ModelIndexer\BlogArticleIndexer;
-use tests\eLife\Search\HttpMocks;
 
 final class BlogArticleIndexerTest extends TestCase
 {
     use GetSerializer;
     use CallSerializer;
     use ModelProvider;
-    use HttpMocks;
 
     /**
      * @var BlogArticleIndexer
@@ -38,9 +36,6 @@ protected function getModelDefinitions(): array
      */
     public function testSerializationSmokeTest(BlogArticle $blogArticle)
     {
-        // Mock the HTTP call that's made for subjects.
-        $this->mockSubjects();
-
         // Check A to B
         $serialized = $this->callSerialize($this->indexer, $blogArticle);
         /** @var BlogArticle $deserialized */

diff --git a/tests/src/Search/Indexer/ModelIndexer/CollectionIndexerTest.php b/tests/src/Search/Indexer/ModelIndexer/CollectionIndexerTest.php
@@ -5,14 +5,12 @@
 use PHPUnit\Framework\TestCase;
 use eLife\ApiSdk\Model\Collection;
 use eLife\Search\Indexer\ModelIndexer\CollectionIndexer;
-use tests\eLife\Search\HttpMocks;
 
 final class CollectionIndexerTest extends TestCase
 {
     use GetSerializer;
     use CallSerializer;
     use ModelProvider;
-    use HttpMocks;
 
     /**
      * @var CollectionIndexer
@@ -37,8 +35,6 @@ protected function getModelDefinitions(): array
      */
     public function testSerializationSmokeTest(Collection $collection)
     {
-        // Mock the HTTP call that's made for subjects.
-        $this->mockSubjects();
         // Check A to B
         $serialized = $this->callSerialize($this->indexer, $collection);
         /** @var Collection $deserialized */

diff --git a/tests/src/Search/Indexer/ModelIndexer/InterviewIndexerTest.php b/tests/src/Search/Indexer/ModelIndexer/InterviewIndexerTest.php
@@ -5,14 +5,12 @@
 use PHPUnit\Framework\TestCase;
 use eLife\ApiSdk\Model\Interview;
 use eLife\Search\Indexer\ModelIndexer\InterviewIndexer;
-use tests\eLife\Search\HttpMocks;
 
 final class InterviewIndexerTest extends TestCase
 {
     use GetSerializer;
     use CallSerializer;
     use ModelProvider;
-    use HttpMocks;
 
     /**
      * @var InterviewIndexer
@@ -37,8 +35,6 @@ protected function getModelDefinitions(): array
      */
     public function testSerializationSmokeTest(Interview $interview)
     {
-        // Mock the HTTP call that's made for subjects.
-        $this->mockSubjects();
         // Check A to B
         $serialized = $this->callSerialize($this->indexer, $interview);
         /** @var Interview $deserialized */

diff --git a/tests/src/Search/Indexer/ModelIndexer/LabsPostIndexerTest.php b/tests/src/Search/Indexer/ModelIndexer/LabsPostIndexerTest.php
@@ -5,14 +5,12 @@
 use PHPUnit\Framework\TestCase;
 use eLife\ApiSdk\Model\LabsPost;
 use eLife\Search\Indexer\ModelIndexer\LabsPostIndexer;
-use tests\eLife\Search\HttpMocks;
 
 final class LabsPostIndexerTest extends TestCase
 {
     use GetSerializer;
     use CallSerializer;
     use ModelProvider;
-    use HttpMocks;
 
     /**
      * @var LabsPostIndexer
@@ -37,8 +35,6 @@ protected function getModelDefinitions(): array
      */
     public function testSerializationSmokeTest(LabsPost $labsPost)
     {
-        // Mock the HTTP call that's made for subjects.
-        $this->mockSubjects();
         // Check A to B
         $serialized = $this->callSerialize($this->indexer, $labsPost);
         /** @var LabsPost $deserialized */

diff --git a/tests/src/Search/Indexer/ModelIndexer/PodcastEpisodeIndexerTest.php b/tests/src/Search/Indexer/ModelIndexer/PodcastEpisodeIndexerTest.php
@@ -5,14 +5,12 @@
 use PHPUnit\Framework\TestCase;
 use eLife\ApiSdk\Model\PodcastEpisode;
 use eLife\Search\Indexer\ModelIndexer\PodcastEpisodeIndexer;
-use tests\eLife\Search\HttpMocks;
 
 final class PodcastEpisodeIndexerTest extends TestCase
 {
     use GetSerializer;
     use CallSerializer;
     use ModelProvider;
-    use HttpMocks;
 
     /**
      * @var PodcastEpisodeIndexer
@@ -37,8 +35,6 @@ protected function getModelDefinitions(): array
      */
     public function testSerializationSmokeTest(PodcastEpisode $podcastEpisode)
     {
-        // Mock the HTTP call that's made for subjects.
-        $this->mockSubjects();
         // Check A to B
         $serialized = $this->callSerialize($this->indexer, $podcastEpisode);
         /** @var PodcastEpisode $deserialized */