From f65a1318003b646ac25d4d60f7cc843864ed8e7f Mon Sep 17 00:00:00 2001
From: Fran Garcia-Linares <fjgarlin@gmail.com>
Date: Fri, 27 May 2022 12:36:25 +0200
Subject: [PATCH] Changed placement of special characters.

---
 .../ProjectBrowserSource/MockDrupalDotOrg.php |  4 ---
 tests/fixtures/projects_fixture.json          |  4 +--
 .../ProjectBrowserUiTest.php                  | 33 ++++++++++---------
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/src/Plugin/ProjectBrowserSource/MockDrupalDotOrg.php b/src/Plugin/ProjectBrowserSource/MockDrupalDotOrg.php
index fe33669ef..5b172d13f 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 c267b9f1b..619bfa236 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 f4e00d2a6..69998e06d 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;$?',
     ]);
   }
 
-- 
GitLab