Skip to content
Snippets Groups Projects
Commit 02645063 authored by Eric Smith's avatar Eric Smith
Browse files

Issue #2937191: Revert changes to FacetsUrlGeneratorTest to 2.0.x branch

Any changes to this test are outside the scope of this MR as this does not change url generation behaviour.

It looks like these changes were introduced at some point to fix unrelated test failures, but the test passed on the 2.0.x branch. Lets leave this test alone.
parent fa1b15d7
No related branches found
No related tags found
1 merge request!146Issue #2937191: Render using theme input and select instead of lists with links for checkboxes and dropdown
......@@ -64,16 +64,8 @@ class FacetsUrlGeneratorTest extends FacetsTestBase {
$url = $this->urlGenerator->getUrl(['test_facet' => ['fuzzy']]);
if (version_compare(\Drupal::VERSION, '9.5.9', '>=')) {
// https://www.drupal.org/i/3277784 introduces a change where views now
// includes the "view_id" and "display_id" in the Uri string even if they
// aren't in the path patterns.
$additional_args = '&view_id=search_api_test_view&display_id=page_1';
}
else {
$additional_args = '';
}
$this->assertEquals("route:view.search_api_test_view.page_1;arg_0=entity%3Aentity_test_mulrev_changed&arg_1=entity_test_mulrev_changed&arg_2{$additional_args}?f%5B0%5D=owl%3Afuzzy", $url->toUriString());
$this->assertEquals('route:view.search_api_test_view.page_1;arg_0&arg_1&arg_2&view_id=search_api_test_view&display_id=page_1?f%5B0%5D=owl%3Afuzzy', $url->toUriString());
// Setup search page URL with contextual parameters as current request and
// path.
$path = '/search-api-test-fulltext/entity:entity_test_mulrev_changed/entity_test_mulrev_changed';
......@@ -100,13 +92,7 @@ class FacetsUrlGeneratorTest extends FacetsTestBase {
$facet->save();
$url = $this->urlGenerator->getUrl(['owl' => ['foo']]);
if (version_compare(\Drupal::VERSION, '9.5.9', '>=')) {
$this->assertEquals('route:view.search_api_test_view.page_1;arg_0&arg_1&arg_2&view_id=search_api_test_view&display_id=page_1?f%5B0%5D=donkey%3Afoo', $url->toUriString());
}
else {
$this->assertEquals('route:view.search_api_test_view.page_1;arg_0&arg_1&arg_2?f%5B0%5D=donkey%3Afoo', $url->toUriString());
}
$this->assertEquals('route:view.search_api_test_view.page_1;arg_0&arg_1&arg_2&view_id=search_api_test_view&display_id=page_1?f%5B0%5D=donkey%3Afoo', $url->toUriString());
// This won't work without it being in the request, so we need to do this
// from a block. We first click the link, check that the "orange" facet is
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment