From d6af1882aaa06e9876d92cdd9e862c0f308b33dd Mon Sep 17 00:00:00 2001 From: Francesco Sardara Date: Thu, 21 Dec 2023 14:03:23 +0100 Subject: [PATCH] OEL-2782: Fix tests. --- composer.json | 3 ++- src/ListBuilder.php | 7 +++++++ src/MultiselectFilterFieldPluginManager.php | 8 ++++++++ .../FunctionalJavascript/ListPagePluginFormTestBase.php | 4 ++-- .../FunctionalJavascript/ListPagesPresetFiltersTest.php | 2 +- tests/src/Kernel/ListBuilderTest.php | 6 +++--- tests/src/Kernel/ListFacetsFormTest.php | 6 +++--- 7 files changed, 26 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 12a7dede..35365daf 100644 --- a/composer.json +++ b/composer.json @@ -86,7 +86,8 @@ "dealerdirect/phpcodesniffer-composer-installer": true, "drupal/core-composer-scaffold": true, "phpro/grumphp": true, - "phpstan/extension-installer": true + "phpstan/extension-installer": true, + "php-http/discovery": false }, "github-oauth": { diff --git a/src/ListBuilder.php b/src/ListBuilder.php index 8797c3c6..e2480cc1 100644 --- a/src/ListBuilder.php +++ b/src/ListBuilder.php @@ -54,6 +54,13 @@ class ListBuilder implements ListBuilderInterface { */ protected $entityRepository; + /** + * The facet manager wrapper. + * + * @var \Drupal\oe_list_pages\ListFacetManagerWrapper + */ + protected ListFacetManagerWrapper $facetManager; + /** * The form builder. * diff --git a/src/MultiselectFilterFieldPluginManager.php b/src/MultiselectFilterFieldPluginManager.php index fc9b4baa..b9ce5a11 100755 --- a/src/MultiselectFilterFieldPluginManager.php +++ b/src/MultiselectFilterFieldPluginManager.php @@ -6,6 +6,7 @@ use Drupal\Component\Utility\SortArray; use Drupal\Core\Cache\CacheBackendInterface; +use Drupal\Core\Entity\EntityFieldManagerInterface; use Drupal\Core\Extension\ModuleHandlerInterface; use Drupal\Core\Plugin\DefaultPluginManager; use Drupal\facets\FacetInterface; @@ -18,6 +19,13 @@ class MultiselectFilterFieldPluginManager extends DefaultPluginManager { use FacetManipulationTrait; + /** + * The entity field manager. + * + * @var \Drupal\Core\Entity\EntityFieldManagerInterface + */ + protected EntityFieldManagerInterface $entityFieldManager; + /** * Constructs a new multiselect filter field plugin manager. * diff --git a/tests/src/FunctionalJavascript/ListPagePluginFormTestBase.php b/tests/src/FunctionalJavascript/ListPagePluginFormTestBase.php index 3202d65b..5e64b2e3 100644 --- a/tests/src/FunctionalJavascript/ListPagePluginFormTestBase.php +++ b/tests/src/FunctionalJavascript/ListPagePluginFormTestBase.php @@ -85,7 +85,7 @@ public function assertListPagePresetFilterValidations(string $default_value_name $this->assertDefaultValueForFilters([ [ 'key' => '', - 'value' => t('No default values set'), + 'value' => 'No default values set', ], ]); @@ -390,7 +390,7 @@ public function assertListPagePresetFilters(string $default_value_name_prefix, s $this->assertDefaultValueForFilters([ [ 'key' => '', - 'value' => t('No default values set'), + 'value' => 'No default values set', ], ]); // Set a preset filter for Select two. diff --git a/tests/src/FunctionalJavascript/ListPagesPresetFiltersTest.php b/tests/src/FunctionalJavascript/ListPagesPresetFiltersTest.php index 4229e56b..005bacf5 100755 --- a/tests/src/FunctionalJavascript/ListPagesPresetFiltersTest.php +++ b/tests/src/FunctionalJavascript/ListPagesPresetFiltersTest.php @@ -288,7 +288,7 @@ public function testCustomFieldWithDefaultStatus(): void { $this->assertSession()->assertWaitOnAjaxRequest(); $filter_id = DefaultFilterConfigurationBuilder::generateFilterId($facet->id()); $filter_selector = 'emr_plugins_oe_list_page[wrapper][default_filter_values][wrapper][edit][' . $filter_id . ']'; - $this->getSession()->getPage()->selectFieldOption($filter_selector . '[' . $facet->id() . '][0][list]', 2); + $this->getSession()->getPage()->selectFieldOption($filter_selector . '[' . $facet->id() . '][0][list]', '2'); $this->getSession()->getPage()->pressButton('Set default value'); $this->assertSession()->assertWaitOnAjaxRequest(); $this->getSession()->getPage()->pressButton('Save'); diff --git a/tests/src/Kernel/ListBuilderTest.php b/tests/src/Kernel/ListBuilderTest.php index 71ca76b6..36d819b9 100644 --- a/tests/src/Kernel/ListBuilderTest.php +++ b/tests/src/Kernel/ListBuilderTest.php @@ -17,13 +17,13 @@ class ListBuilderTest extends ListsSourceTestBase { */ public function testFacetCacheTags(): void { $default_list_id = ListSourceFactory::generateFacetSourcePluginId('entity_test_mulrev_changed', 'item'); - $this->facet = $this->createFacet('created', $default_list_id, '', 'oe_list_pages_multiselect', []); - $this->facet->addProcessor([ + $facet = $this->createFacet('created', $default_list_id, '', 'oe_list_pages_multiselect', []); + $facet->addProcessor([ 'processor_id' => 'oe_list_pages_date_status_processor', 'weights' => [], 'settings' => [], ]); - $this->facet->save(); + $facet->save(); $configuration = [ 'entity_type' => 'entity_test_mulrev_changed', diff --git a/tests/src/Kernel/ListFacetsFormTest.php b/tests/src/Kernel/ListFacetsFormTest.php index 7f6206db..901fa205 100644 --- a/tests/src/Kernel/ListFacetsFormTest.php +++ b/tests/src/Kernel/ListFacetsFormTest.php @@ -18,14 +18,14 @@ class ListFacetsFormTest extends ListsSourceTestBase { */ public function testFacetCacheTags(): void { $default_list_id = ListSourceFactory::generateFacetSourcePluginId('entity_test_mulrev_changed', 'item'); - $this->facet = $this->createFacet('created', $default_list_id, '', 'oe_list_pages_multiselect', []); - $this->facet->addProcessor([ + $facet = $this->createFacet('created', $default_list_id, '', 'oe_list_pages_multiselect', []); + $facet->addProcessor([ 'processor_id' => 'oe_list_pages_date_status_processor', 'weights' => [], 'settings' => [], ]); - $this->facet->save(); + $facet->save(); $list = $this->listFactory->get('entity_test_mulrev_changed', 'item');