Update test logic

modules/facets_searchbox_widget/tests/src/Unit/Plugin/widget/SearchboxCheckboxWidgetTest.php

@@ -31,19 +31,19 @@ class SearchboxCheckboxWidgetTest extends CheckboxWidgetTest {
     $this->assertSame('array', gettype($output));
     $this->assertCount(4, $output['#items']);
 
-    $this->assertEquals(['facet-inactive', 'js-facets-checkbox-links'], $output['#attributes']['class']);
+    $this->assertEquals(['facet-inactive', 'js-facets-checkbox-links', 'js-facets-widget'], $output['#attributes']['class']);
 
     $expected_links = [
-      $this->buildLinkAssertion('Llama', 'llama', $facet, 10),
-      $this->buildLinkAssertion('Badger', 'badger', $facet, 20),
-      $this->buildLinkAssertion('Duck', 'duck', $facet, 15),
-      $this->buildLinkAssertion('Alpaca', 'alpaca', $facet, 9),
+      $this->buildLinkAssertion('Llama (10)', 'llama', $facet, 10),
+      $this->buildLinkAssertion('Badger (20)', 'badger', $facet, 20),
+      $this->buildLinkAssertion('Duck (15)', 'duck', $facet, 15),
+      $this->buildLinkAssertion('Alpaca (9)', 'alpaca', $facet, 9),
     ];
     foreach ($expected_links as $index => $value) {
       $this->assertSame('array', gettype($output['#items'][$index]));
-      $this->assertEquals($value, $output['#items'][$index]['#title']);
-      $this->assertSame('array', gettype($output['#items'][$index]['#title']));
-      $this->assertEquals('link', $output['#items'][$index]['#type']);
+      $this->assertEquals($value['#value'], $output['#items'][$index]['#title']);
+      $this->assertSame('string', gettype($output['#items'][$index]['#title']));
+      $this->assertEquals('checkbox', $output['#items'][$index]['#type']);
       $this->assertEquals(['facet-item'], $output['#items'][$index]['#wrapper_attributes']['class']);
     }
   }

tests/src/Functional/FacetsUrlGeneratorTest.php

@@ -64,7 +64,16 @@ class FacetsUrlGeneratorTest extends FacetsTestBase {
 
     $url = $this->urlGenerator->getUrl(['test_facet' => ['fuzzy']]);
 
-    $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());
+    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());
     // 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';
@@ -91,7 +100,13 @@ class FacetsUrlGeneratorTest extends FacetsTestBase {
     $facet->save();
 
     $url = $this->urlGenerator->getUrl(['owl' => ['foo']]);
-    $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());
+
+    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 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