diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index a6d15b56c39cea9ef675c5bd03af8c1f9db6fb23..9a28c51e6ed843f3ad08bc0f065581258581e2fc 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -50,6 +50,7 @@ variables: OPT_IN_TEST_PREVIOUS_MINOR: 1 OPT_IN_TEST_NEXT_MINOR: 1 _PHPUNIT_CONCURRENT: "1" + _PHPUNIT_EXTRA: --verbose _CSPELL_WORDS: 'Datasource, datasource' diff --git a/modules/jsonapi_search_api_facets/tests/src/Functional/IndexFacetsTest.php b/modules/jsonapi_search_api_facets/tests/src/Functional/IndexFacetsTest.php index db1ba9f57f981db2e3229b83ff4b9efdcd883a5a..35a8b6b9dc975d513f4d57b20ea64030d5abbbe6 100644 --- a/modules/jsonapi_search_api_facets/tests/src/Functional/IndexFacetsTest.php +++ b/modules/jsonapi_search_api_facets/tests/src/Functional/IndexFacetsTest.php @@ -69,6 +69,7 @@ final class IndexFacetsTest extends BrowserTestBase { FacetSource::create([ 'id' => 'jsonapi_search_api_facets__database_search_index', 'name' => 'jsonapi_search_api_facets:database_search_index', + 'filter_key' => 'filter', ])->save(); } @@ -133,13 +134,13 @@ final class IndexFacetsTest extends BrowserTestBase { sort($expected_filters[$filter_name]['condition']['value']); } } - foreach ($filter_params['f'] as $filter_name => $expected_filter) { + foreach ($filter_params['filter'] as $filter_name => $expected_filter) { if (is_array($expected_filter)) { - sort($filter_params['f'][$filter_name]['condition']['value']); + sort($filter_params['filter'][$filter_name]['condition']['value']); } } - $this->assertEquals(['f' => $expected_filters], $filter_params, var_export($filter_params, TRUE)); + $this->assertEquals(['filter' => $expected_filters], $filter_params, var_export($filter_params, TRUE)); } /** @@ -172,7 +173,7 @@ final class IndexFacetsTest extends BrowserTestBase { $this->assertEquals($show_numbers, isset($first_term['values']['count']), var_export($facet, TRUE)); } - $url->setOption('query', ['f' => $facet_query]); + $url->setOption('query', ['filter' => $facet_query]); $data = $this->doRequest($url); $this->assertCount($expected_filtered_count, $data['data'], var_export($data, TRUE)); @@ -236,7 +237,7 @@ final class IndexFacetsTest extends BrowserTestBase { $this->createFacet('category', 'Category', 'category', 'or', FALSE); $url = Url::fromRoute('jsonapi_search_api.index_database_search_index', [], [ 'query' => [ - 'f' => [ + 'filter' => [ 'name' => 'does not exist', ], ], @@ -276,7 +277,7 @@ final class IndexFacetsTest extends BrowserTestBase { ]; $url = Url::fromRoute('jsonapi_search_api.index_database_search_index', [], [ 'query' => [ - 'f' => $filter, + 'filter' => $filter, ], ]); $data = $this->doRequest($url); @@ -285,7 +286,7 @@ final class IndexFacetsTest extends BrowserTestBase { $first_term = reset($keywords_facet['terms']); $first_term_url_query = []; parse_str(parse_url($first_term['url'], PHP_URL_QUERY), $first_term_url_query); - $this->assertEquals($filter, $first_term_url_query['f']); + $this->assertEquals($filter, $first_term_url_query['filter']); } /**