diff --git a/src/Plugin/ProjectBrowserSource/MockDrupalDotOrg.php b/src/Plugin/ProjectBrowserSource/MockDrupalDotOrg.php index fe33669efc7270a0b615c70998e36e3eb079005b..5b172d13f65e486dccc3e494263485e9778943c8 100644 --- a/src/Plugin/ProjectBrowserSource/MockDrupalDotOrg.php +++ b/src/Plugin/ProjectBrowserSource/MockDrupalDotOrg.php @@ -278,10 +278,6 @@ class MockDrupalDotOrg extends PluginBase implements ProjectBrowserSourceInterfa elseif ($sort == 'best_match') { $sort = 'project_usage_total'; } - elseif ($sort == 'title') { - $db_query->addExpression("REGEXP_REPLACE(title, '[^a-zA-Z0-9 ]+', '')", 'title_filtered'); - $sort = 'title_filtered'; - } $db_query->orderBy($sort, $direction); } } diff --git a/tests/fixtures/projects_fixture.json b/tests/fixtures/projects_fixture.json index c267b9f1bea0f6585768ee0099833f0a5fa0c430..619bfa2369c92938a466228ef35d59815903f74f 100644 --- a/tests/fixtures/projects_fixture.json +++ b/tests/fixtures/projects_fixture.json @@ -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", diff --git a/tests/src/FunctionalJavascript/ProjectBrowserUiTest.php b/tests/src/FunctionalJavascript/ProjectBrowserUiTest.php index f4e00d2a6ddf422ee74131a3cbcf81f95d6843b9..69998e06d89e41c03c49338235751618ba10a4d6 100644 --- a/tests/src/FunctionalJavascript/ProjectBrowserUiTest.php +++ b/tests/src/FunctionalJavascript/ProjectBrowserUiTest.php @@ -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([ - '$?Vitamin&C;', - '&Un:/written', '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', @@ -404,45 +404,46 @@ class ProjectBrowserUiTest extends WebDriverTestBase { // Fill in the search field. $search_field->setValue('&'); $this->assertProjectsVisible([ - '$?Vitamin&C;', - '&Un:/written', + 'Vitamin&C;$?', + 'Unwritten&:/', ]); // Fill in the search field. $search_field->setValue(''); $search_field->setValue('n&'); $this->assertProjectsVisible([ - '$?Vitamin&C;', + 'Vitamin&C;$?', + 'Unwritten&:/', ]); $search_field->setValue(''); $search_field->setValue('$'); $this->assertProjectsVisible([ - '$?Vitamin&C;', + 'Vitamin&C;$?', ]); $search_field->setValue(''); $search_field->setValue('?'); $this->assertProjectsVisible([ - '$?Vitamin&C;', + 'Vitamin&C;$?', ]); $search_field->setValue(''); $search_field->setValue('/'); $this->assertProjectsVisible([ - '&Un:/written', + 'Unwritten&:/', ]); $search_field->setValue(''); $search_field->setValue(':'); $this->assertProjectsVisible([ - '&Un:/written', + 'Unwritten&:/', ]); $search_field->setValue(''); $search_field->setValue(';'); $this->assertProjectsVisible([ - '$?Vitamin&C;', + 'Vitamin&C;$?', ]); }