diff --git a/modules/facets_rest/tests/rest_view/config/install/views.view.search_api_test_views_fulltext.yml b/modules/facets_rest/tests/rest_view/config/install/views.view.search_api_rest_test_view.yml similarity index 100% rename from modules/facets_rest/tests/rest_view/config/install/views.view.search_api_test_views_fulltext.yml rename to modules/facets_rest/tests/rest_view/config/install/views.view.search_api_rest_test_view.yml diff --git a/modules/facets_rest/tests/src/Functional/RestIntegrationTest.php b/modules/facets_rest/tests/src/Functional/RestIntegrationTest.php index 1347ddb6939adc90e98b8cc394c3c3520ae82422..1b4535ebcca3c22a5b8c58f8d9c689d4c02a575a 100644 --- a/modules/facets_rest/tests/src/Functional/RestIntegrationTest.php +++ b/modules/facets_rest/tests/src/Functional/RestIntegrationTest.php @@ -122,49 +122,88 @@ class RestIntegrationTest extends FacetsTestBase { // Verify the facet "Type". $results = [ 'article' => [ - 'url' => $base_url . '/facets-rest?_format=json&f%5B0%5D=type%3Aarticle', + 'url' => [ + $base_url, + '/facets-rest', + '_format=json', + 'f%5B0%5D=type%3Aarticle', + ], 'count' => 2, ], 'item' => [ - 'url' => $base_url . '/facets-rest?_format=json&f%5B0%5D=type%3Aitem', + 'url' => [ + $base_url, + '/facets-rest', + '_format=json', + 'f%5B0%5D=type%3Aitem', + ], 'count' => 3, ], ]; foreach ($json_decoded->facets[1][0]->type as $result) { $value = $result->values->value; - $this->assertEquals($result->url, $results[$value]['url']); $this->assertEquals($result->values->count, $results[$value]['count']); + foreach ($results[$value]['url'] as $url_part) { + $this->assertNotFalse(strpos($result->url, $url_part)); + } } // Verify the facet "Keywords". $results = [ 'banana' => [ - 'url' => $base_url . '/facets-rest?_format=json&f%5B0%5D=keywords%3Abanana', + 'url' => [ + $base_url, + '/facets-rest', + '_format=json', + 'f%5B0%5D=keywords%3Abanana', + ], 'count' => 1, ], 'strawberry' => [ - 'url' => $base_url . '/facets-rest?_format=json&f%5B0%5D=keywords%3Astrawberry', + 'url' => [ + $base_url, + '/facets-rest', + '_format=json', + 'f%5B0%5D=keywords%3Astrawberry', + ], 'count' => 2, ], 'apple' => [ - 'url' => $base_url . '/facets-rest?_format=json&f%5B0%5D=keywords%3Aapple', + 'url' => [ + $base_url, + '/facets-rest', + '_format=json', + 'f%5B0%5D=keywords%3Aapple', + ], 'count' => 2, ], 'orange' => [ - 'url' => $base_url . '/facets-rest?_format=json&f%5B0%5D=keywords%3Aorange', + 'url' => [ + $base_url, + '/facets-rest', + '_format=json', + 'f%5B0%5D=keywords%3Aorange', + ], 'count' => 3, ], 'grape' => [ - 'url' => $base_url . '/facets-rest?_format=json&f%5B0%5D=keywords%3Agrape', + 'url' => [ + $base_url, + '/facets-rest', + '_format=json', + 'f%5B0%5D=keywords%3Agrape', + ], 'count' => 3, ], ]; foreach ($json_decoded->facets[0][0]->keywords as $result) { $value = $result->values->value; - $this->assertEquals($result->url, $results[$value]['url']); $this->assertEquals($result->values->count, $results[$value]['count']); + foreach ($results[$value]['url'] as $url_part) { + $this->assertNotFalse(strpos($result->url, $url_part)); + } } // Filter and verify that the results are correct. @@ -177,45 +216,79 @@ class RestIntegrationTest extends FacetsTestBase { $results = [ 'article' => [ - 'url' => $base_url . '/facets-rest?_format=json&f%5B0%5D=type%3Aitem&f%5B1%5D=type%3Aarticle', + 'url' => [ + $base_url, + '/facets-rest', + '_format=json', + 'f%5B0%5D=type%3Aitem&f%5B1%5D=type%3Aarticle', + ], 'count' => 2, ], 'item' => [ - 'url' => $base_url . '/facets-rest?_format=json&', + 'url' => [$base_url, '/facets-rest', '_format=json'], 'count' => 3, ], 'banana' => [ - 'url' => $base_url . '/facets-rest?_format=json&f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Abanana', + 'url' => [ + $base_url, + '/facets-rest', + '_format=json', + 'f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Abanana', + ], 'count' => 0, ], 'strawberry' => [ - 'url' => $base_url . '/facets-rest?_format=json&f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Astrawberry', + 'url' => [ + $base_url, + '/facets-rest', + '_format=json', + 'f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Astrawberry', + ], 'count' => 0, ], 'apple' => [ - 'url' => $base_url . '/facets-rest?_format=json&f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Aapple', + 'url' => [ + $base_url, + '/facets-rest', + '_format=json', + 'f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Aapple', + ], 'count' => 1, ], 'orange' => [ - 'url' => $base_url . '/facets-rest?_format=json&f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Aorange', + 'url' => [ + $base_url, + '/facets-rest', + '_format=json', + 'f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Aorange', + ], 'count' => 2, ], 'grape' => [ - 'url' => $base_url . '/facets-rest?_format=json&f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Agrape', + 'url' => [ + $base_url, + '/facets-rest', + '_format=json', + 'f%5B0%5D=type%3Aitem&f%5B1%5D=keywords%3Agrape', + ], 'count' => 1, ], ]; foreach ($json_decoded->facets[1][0]->type as $result) { $value = $result->values->value; - $this->assertEquals($results[$value]['url'], $result->url); $this->assertEquals($results[$value]['count'], $result->values->count); + foreach ($results[$value]['url'] as $url_part) { + $this->assertNotFalse(strpos($result->url, $url_part)); + } } foreach ($json_decoded->facets[0][0]->keywords as $result) { $value = $result->values->value; - $this->assertEquals($results[$value]['url'], $result->url); $this->assertEquals($results[$value]['count'], $result->values->count); + foreach ($results[$value]['url'] as $url_part) { + $this->assertNotFalse(strpos($result->url, $url_part)); + } } } diff --git a/tests/facets_search_api_dependency/config/install/views.view.search_api_test_views_fulltext.yml b/tests/facets_search_api_dependency/config/install/views.view.search_api_test_view.yml similarity index 100% rename from tests/facets_search_api_dependency/config/install/views.view.search_api_test_views_fulltext.yml rename to tests/facets_search_api_dependency/config/install/views.view.search_api_test_view.yml diff --git a/tests/src/Kernel/Entity/FacetFacetSourceTest.php b/tests/src/Kernel/Entity/FacetFacetSourceTest.php index 9d6e81e110dd143c08896531a52550e5e120aa50..99aec862ccd0d5b3b5e85f7fbd83f8b3a06564b3 100644 --- a/tests/src/Kernel/Entity/FacetFacetSourceTest.php +++ b/tests/src/Kernel/Entity/FacetFacetSourceTest.php @@ -195,7 +195,7 @@ class FacetFacetSourceTest extends EntityKernelTestBase { /** * Test the data definitions. * - * @covers \Drupal\facets\FacetSource\FacetSourcePluginInterface::getDataDefinition + * @covers \Drupal\facets\Plugin\facets\facet_source\SearchApiDisplay::getDataDefinition */ public function testDataDefinitions() { // Create and configure facet.