Skip to content

fix(search): Fix SearchComposer.php filtering logic #54120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sorbaugh merged 7 commits into from
Aug 14, 2025
Merged

fix(search): Fix SearchComposer.php filtering logic #54120

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
69c51bb
fix(search): Fix SearchComposer.php filtering logic
printminion-co Jul 28, 2025
75770a0
test(SearchComposerTest): add unit tests for SearchComposer
printminion-co Jul 29, 2025
d08fe6d
test(SearchComposerTest): add test for handling unknown search provider
printminion-co Jul 29, 2025
32d263e
test(SearchComposerTest): add unit test for getProviders with multipl…
printminion-co Jul 29, 2025
9dfc0b1
test(SearchComposerTest): add test for provider icon generation
printminion-co Jul 30, 2025
d0341bb
test(SearchComposerTest): add unit tests for getProviders with allowe…
printminion-co Jul 29, 2025
55f5598
test(SearchComposerTest): add unit test for getProviders with mixed o…
printminion-co Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test(SearchComposerTest): add unit tests for getProviders with allowe… 
…d providers restriction and empty configuration

Signed-off-by: Misha M.-Kupriyanov <[email protected]>
  • Loading branch information
@printminion-co
printminion-co committed Aug 11, 2025
commit d0341bb32304841fe28c66b7ebe885cf0b273c7e
59 changes: 59 additions & 0 deletions tests/lib/Search/SearchComposerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,65 @@ public function testGetProvidersWithMultipleProviders(): void {
]);
}

public function testGetProvidersWithEmptyAllowedProvidersConfiguration(): void {
$providerConfigs = [
'provider1' => ['service' => 'provider1_service', 'appId' => 'app1', 'order' => 10],
'provider2' => ['service' => 'provider2_service', 'appId' => 'app2', 'order' => 5],
];

$mockData = $this->createMockProvidersAndRegistrations($providerConfigs);
$this->setupRegistrationContextWithProviders($mockData['registrations']);
$this->setupAppConfigForAllowedProviders();

$providers = $this->searchComposer->getProviders('/test/route', []);

$this->assertCount(2, $providers);
$this->assertProvidersAreSortedByOrder($providers);
$this->assertEquals('provider2', $providers[0]['id']);
$this->assertEquals('provider1', $providers[1]['id']);
}

public function testGetProvidersWithAllowedProvidersRestriction(): void {
$providerConfigs = [
'provider1' => ['service' => 'provider1_service', 'appId' => 'app1', 'order' => 10],
'provider2' => ['service' => 'provider2_service', 'appId' => 'app2', 'order' => 5],
'provider3' => ['service' => 'provider3_service', 'appId' => 'app3', 'order' => 15],
'provider4' => ['service' => 'provider4_service', 'appId' => 'app4', 'order' => 8],
];

$mockData = $this->createMockProvidersAndRegistrations($providerConfigs);
$this->setupRegistrationContextWithProviders($mockData['registrations']);
$this->setupAppConfigForAllowedProviders(['provider1', 'provider3']);

$providers = $this->searchComposer->getProviders('/test/route', []);

$this->assertProvidersStructureAndSorting($providers, [
['id' => 'provider1', 'name' => 'Provider provider1', 'appId' => 'app1', 'order' => 10, 'inAppSearch' => false],
['id' => 'provider3', 'name' => 'Provider provider3', 'appId' => 'app3', 'order' => 15, 'inAppSearch' => false],
]);

// Verify excluded providers are not present
$providerIds = array_column($providers, 'id');
$this->assertNotContains('provider2', $providerIds);
$this->assertNotContains('provider4', $providerIds);
}

public function testGetProvidersFiltersByAllowedProvidersCompletely(): void {
$providerConfigs = [
'provider1' => ['service' => 'provider1_service', 'appId' => 'app1', 'order' => 10],
'provider2' => ['service' => 'provider2_service', 'appId' => 'app2', 'order' => 5],
];

$mockData = $this->createMockProvidersAndRegistrations($providerConfigs);
$this->setupRegistrationContextWithProviders($mockData['registrations']);
$this->setupAppConfigForAllowedProviders(['provider_not_exists']);

$providers = $this->searchComposer->getProviders('/test/route', []);

$this->assertIsArray($providers);
$this->assertEmpty($providers);
}

public function testProviderIconGeneration(): void {
$providerConfigs = [
'provider1' => ['service' => 'provider1_service', 'appId' => 'app1', 'order' => 10],
Expand Down