Revert "Issue #3281209 by hooroomoo: Test filters and searching with strings... (8c19fe4a) · Commits · project / project_browser

src/Controller/ProjectBrowserEndpointController.php

+7 −6

Original line number	Diff line number	Diff line
		@@ -3,6 +3,7 @@
		namespace Drupal\project_browser\Controller;

		use Drupal\Component\Serialization\Json;
		use Drupal\Component\Utility\Xss;
		use Drupal\Core\Cache\CacheableResponseInterface;
		use Drupal\Core\Controller\ControllerBase;
		use Drupal\project_browser\EnabledSourceHandler;
		@@ -116,27 +117,27 @@ class ProjectBrowserEndpointController extends ControllerBase {

		$title = $request->query->get('search');
		if ($title) {
		$query['search'] = $title;
		$query['search'] = Xss::filter($title);
		}

		$categories = $request->query->get('categories');
		if ($categories) {
		$query['categories'] = $categories;
		$query['categories'] = Xss::filter($categories);
		}

		$maintenance_status = $request->query->get('maintenance_status');
		if ($maintenance_status) {
		$query['maintenance_status'] = $maintenance_status;
		$query['maintenance_status'] = Xss::filter($maintenance_status);
		}

		$development_status = $request->query->get('development_status');
		if ($development_status) {
		$query['development_status'] = $development_status;
		$query['development_status'] = Xss::filter($development_status);
		}

		$security_advisory_coverage = $request->query->get('security_advisory_coverage');
		if ($security_advisory_coverage) {
		$query['security_advisory_coverage'] = $security_advisory_coverage;
		$query['security_advisory_coverage'] = Xss::filter($security_advisory_coverage);
		}

		// Cache only exact query, down to the page number.
		@@ -166,7 +167,7 @@ class ProjectBrowserEndpointController extends ControllerBase {
		return new JsonResponse([], Response::HTTP_ACCEPTED);
		}

		$project = $request->query->get('project');
		$project = Xss::filter($request->query->get('project'));
		if ($project) {
		$cache_key = 'project_browser:releases:' . $project;
		if ($releases = $this->cacheBin->get($cache_key)) {

tests/fixtures/projects_fixture.json

+2 −2

Original line number	Diff line number	Diff line
		@@ -1096,7 +1096,7 @@
		}
		},
		{
		"title": "&Un:/written",
		"title": "Unwritten",
		"author": "Natasha Bedingfield",
		"maintenance_status": "19370",
		"development_status": "9994",
		@@ -1139,7 +1139,7 @@
		}
		},
		{
		"title": "$?Vitamin&C;",
		"title": "Vitamin C",
		"author": "Orange Juice",
		"maintenance_status": "19370",
		"development_status": "9994",

tests/src/FunctionalJavascript/ProjectBrowserUiTest.php

+8 −64

Original line number	Diff line number	Diff line
		@@ -124,7 +124,7 @@ class ProjectBrowserUiTest extends WebDriverTestBase {
		'Jazz',
		'Eggman',
		'Tooth Fairy',
		'$?Vitamin&C;',
		'Vitamin C',
		'Cream cheese on a bagel',
		'No Scrubs',
		'Soup',
		@@ -254,12 +254,12 @@ class ProjectBrowserUiTest extends WebDriverTestBase {
		$this->assertEquals('Obsolete', $second_filter_element->getText());
		$this->assertProjectsVisible([
		'Tooth Fairy',
		'$?Vitamin&C;',
		'Vitamin C',
		'Pinky and the Brain',
		'Soup',
		'Quiznos',
		'Ruh roh',
		'&Un:/written',
		'Unwritten',
		]);

		// Click the Unsupported filter.
		@@ -318,8 +318,6 @@ class ProjectBrowserUiTest extends WebDriverTestBase {
		$this->click('.dropdown-content #pb-sort > li:nth-child(2)');
		// Assert that the projects are listed in ascending order of their titles.
		$this->assertProjectsVisible([
		'&Un:/written',
		'$?Vitamin&C;',
		'1 Starts With a Number',
		'9 Starts With a Higher Number',
		'Astronaut Simulator',
		@@ -330,12 +328,16 @@ class ProjectBrowserUiTest extends WebDriverTestBase {
		'Eggman',
		'Fire',
		'Grapefruit',
		'Helvetica',
		'Ice Ice',
		]);

		// Select 'Z-A' sorting order.
		$this->click('.grid--2 .dropdown > button');
		$this->click('.dropdown-content #pb-sort > li:nth-child(3)');
		$this->assertProjectsVisible([
		'Vitamin C',
		'Unwritten',
		'Tooth Fairy',
		'Soup',
		'Ruh roh',
		@@ -346,8 +348,6 @@ class ProjectBrowserUiTest extends WebDriverTestBase {
		'Mad About You',
		'Looper',
		'Kangaroo',
		'Jazz',
		'Ice Ice',
		]);

		// Select 'Project Usage' option.
		@@ -358,7 +358,7 @@ class ProjectBrowserUiTest extends WebDriverTestBase {
		'Jazz',
		'Eggman',
		'Tooth Fairy',
		'$?Vitamin&C;',
		'Vitamin C',
		'Cream cheese on a bagel',
		'Pinky and the Brain',
		'Ice Ice',
		@@ -390,60 +390,4 @@ class ProjectBrowserUiTest extends WebDriverTestBase {
		]);
		}

		/**
		* Tests search with strings that need URI encoding.
		*/
		public function testSearchForSpecialChar(): void {
		$assert_session = $this->assertSession();
		$page = $this->getSession()->getPage();

		// Clear filters.
		$this->drupalGet('admin/modules/browse');
		$page->clickLink('Clear filters');
		$search_field = $page->find('css', '#pb-text');
		// Fill in the search field.
		$search_field->setValue('&');
		$this->assertProjectsVisible([
		'$?Vitamin&C;',
		'&Un:/written',
		]);

		// Fill in the search field.
		$search_field->setValue('');
		$search_field->setValue('n&');
		$this->assertProjectsVisible([
		'$?Vitamin&C;',
		]);

		$search_field->setValue('');
		$search_field->setValue('$');
		$this->assertProjectsVisible([
		'$?Vitamin&C;',
		]);

		$search_field->setValue('');
		$search_field->setValue('?');
		$this->assertProjectsVisible([
		'$?Vitamin&C;',
		]);

		$search_field->setValue('');
		$search_field->setValue('/');
		$this->assertProjectsVisible([
		'&Un:/written',
		]);

		$search_field->setValue('');
		$search_field->setValue(':');
		$this->assertProjectsVisible([
		'&Un:/written',
		]);

		$search_field->setValue('');
		$search_field->setValue(';');
		$this->assertProjectsVisible([
		'$?Vitamin&C;',
		]);
		}

		}