Update tests

netgen · Feb 21, 2024 · c819915 · c819915
1 parent 34ed696
commit c819915
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 11 deletions.
diff --git a/phpunit-core-integration-legacy-solr.xml b/phpunit-core-integration-legacy-solr.xml
@@ -21,14 +21,16 @@
         <env name="SYMFONY_DEPRECATIONS_HELPER" value="disabled"/>
         <ini name="error_reporting" value="-1" />
         <env name="DATABASE_URL" value="sqlite://:memory:" />
-        <env name="KERNEL_CLASS" value="Ibexa\Contracts\Core\Test\IbexaTestKernel"/>
+        <env name="KERNEL_CLASS" value="Ibexa\Contracts\Solr\Test\IbexaSolrTestKernel"/>
+        <env name="SEARCH_ENGINE" value="solr"/>
     </php>
     <testsuites>
         <!-- Search service is used all over the place, so we must run entire integration test suite -->
         <testsuite name="integration_repository">
             <directory>tests/lib/Kernel</directory>
             <directory>vendor/ibexa/core/tests/integration/Core</directory>
             <exclude>vendor/ibexa/core/tests/integration/Core/Repository/Filtering</exclude>
+            <!-- Excluding because overridden locally -->
             <exclude>vendor/ibexa/core/tests/integration/Core/Repository/SearchServiceTest.php</exclude>
             <exclude>vendor/ibexa/core/tests/integration/Core/Repository/SearchServiceLocationTest.php</exclude>
         </testsuite>

diff --git a/phpunit-integration-legacy.xml b/phpunit-integration-legacy.xml
@@ -7,6 +7,7 @@
     <php>
         <env name="setupFactory" value="Netgen\IbexaSearchExtra\Tests\Integration\SetupFactory\Legacy" />
         <ini name="error_reporting" value="-1" />
+        <env name="SEARCH_ENGINE" value="legacy"/>
     </php>
     <testsuites>
         <testsuite name="Legacy Search Engine tests">

diff --git a/tests/lib/Integration/Resources/config/event_dispatcher_override.yaml b/tests/lib/Integration/Resources/config/event_dispatcher_override.yaml
@@ -8,3 +8,4 @@ services:
             - ['addSubscriber', ['@Ibexa\Core\Search\Common\EventSubscriber\SectionEventSubscriber']]
             - ['addSubscriber', ['@Ibexa\Core\Search\Common\EventSubscriber\TrashEventSubscriber']]
             - ['addSubscriber', ['@Ibexa\Core\Search\Common\EventSubscriber\UserEventSubscriber']]
+            - ['addSubscriber', ['@Ibexa\Core\Repository\EventSubscriber\NameSchemaSubscriber' ]]
diff --git a/tests/lib/Integration/Resources/config/services.yaml b/tests/lib/Integration/Resources/config/services.yaml
@@ -22,16 +22,6 @@ services:
         tags:
             - { name: kernel.event_subscriber }
 
-    Symfony\Component\EventDispatcher\EventDispatcher:
-        calls:
-            - ['addSubscriber', ['@netgen_test.ibexa_search_extra.solr.event_subscriber.child_updates_parent']]
-            - ['addSubscriber', ['@Ibexa\Core\Search\Common\EventSubscriber\ContentEventSubscriber']]
-            - ['addSubscriber', ['@Ibexa\Core\Search\Common\EventSubscriber\LocationEventSubscriber']]
-            - ['addSubscriber', ['@Ibexa\Core\Search\Common\EventSubscriber\ObjectStateEventSubscriber']]
-            - ['addSubscriber', ['@Ibexa\Core\Search\Common\EventSubscriber\SectionEventSubscriber']]
-            - ['addSubscriber', ['@Ibexa\Core\Search\Common\EventSubscriber\TrashEventSubscriber']]
-            - ['addSubscriber', ['@Ibexa\Core\Search\Common\EventSubscriber\UserEventSubscriber']]
-
     netgen_test.ibexa_search_extra.solr.field_mapper.content:
         class: Netgen\IbexaSearchExtra\Tests\Integration\Implementation\Solr\FieldMapper\TestContentFieldMapper
         arguments: