NGSTACK-843 move RouterStub to tests/lib

netgen · Apr 22, 2024 · ffae211 · ffae211
1 parent b04f3aa
commit ffae211
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 7 deletions.
diff --git a/tests/bundle/DependencyInjection/NetgenIbexaSearchExtraExtensionTest.php b/tests/bundle/DependencyInjection/NetgenIbexaSearchExtraExtensionTest.php
@@ -25,7 +25,7 @@ protected function setUp(): void
             new FileLocator(__DIR__ . '/_fixtures'),
         );
 
-        $loader->load('services.yaml');
+        $loader->load('indexable_field_types.yaml');
 
         $this->setParameter('kernel.bundles', []);
     }

diff --git a/...pendencyInjection/_fixtures/services.yaml → ...tion/_fixtures/indexable_field_types.yaml b/...pendencyInjection/_fixtures/services.yaml → ...tion/_fixtures/indexable_field_types.yaml
@@ -2,6 +2,3 @@ services:
     Ibexa\FieldTypeRichText\FieldType\RichText\SearchField:
         tags:
             - { name: ibexa.field_type.indexable, alias: ezrichtext }
-
-    Ibexa\Bundle\Core\Routing\UrlAliasRouter:
-        class: Netgen\IbexaSearchExtraBundle\Tests\Implementation\RouterStub
diff --git a/tests/bundle/Implementation/RouterStub.php → ...ation/Implementation/Stubs/RouterStub.php b/tests/bundle/Implementation/RouterStub.php → ...ation/Implementation/Stubs/RouterStub.php
@@ -2,7 +2,7 @@
 
 declare(strict_types=1);
 
-namespace Netgen\IbexaSearchExtraBundle\Tests\Implementation;
+namespace Netgen\IbexaSearchExtra\Tests\Integration\Implementation\Stubs;
 
 use Symfony\Component\Routing\RequestContext;
 use Symfony\Component\Routing\RouterInterface;

diff --git a/tests/lib/Integration/Resources/config/services.yaml b/tests/lib/Integration/Resources/config/services.yaml
@@ -86,3 +86,7 @@ services:
                 'Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\Message\Search\User\UpdateUser': ['@Netgen\IbexaSearchExtra\Core\Search\Common\Messenger\MessageHandler\Search\User\UpdateUserHandler']
 
     netgen.ibexa_search_extra.asynchronous_indexing.messenger.bus: '@netgen_test.ibexa_search_extra.asynchronous_indexing.messenger.bus'
+
+    Ibexa\Bundle\Core\Routing\UrlAliasRouter:
+        class: Netgen\IbexaSearchExtra\Tests\Integration\Implementation\Stubs\RouterStub
+
diff --git a/tests/lib/Integration/SetupFactory/RegressionSolr.php b/tests/lib/Integration/SetupFactory/RegressionSolr.php
@@ -29,7 +29,7 @@ protected function externalBuildContainer(ContainerBuilder $containerBuilder): v
 
         $testConfigPath = __DIR__ . '/../Resources/config/';
         $loader = new YamlFileLoader($containerBuilder, new FileLocator($testConfigPath));
-        $loader->load('services.yaml');
+        $loader->load('indexable_field_types.yaml');
 
         // Needs to be added first because other passes depend on it
         $containerBuilder->addCompilerPass(new Compiler\TagSubdocumentCriterionVisitorsPass());

diff --git a/tests/lib/Integration/SetupFactory/Solr.php b/tests/lib/Integration/SetupFactory/Solr.php
@@ -29,7 +29,7 @@ protected function externalBuildContainer(ContainerBuilder $containerBuilder): v
 
         $testConfigPath = __DIR__ . '/../Resources/config/';
         $loader = new YamlFileLoader($containerBuilder, new FileLocator($testConfigPath));
-        $loader->load('services.yaml');
+        $loader->load('indexable_field_types.yaml');
         $loader->load('event_dispatcher_override.yaml');
 
         // Needs to be added first because other passes depend on it