Merge branch 'fix-exact-matches-of-username-and-email-on-top-of-the-user-search' into 'master'

Fixes the user order being overriden in the autocomplete controller

See merge request !12868

1 files changed, 3 insertions, 3 deletions

diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index c614df8e98a..69f2570eec2 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -763,7 +763,7 @@ describe User, models: true do
       end
 
       it 'returns users with a partially matching name' do
-        expect(described_class.search(user.name[0..2])).to eq([user2, user])
+        expect(described_class.search(user.name[0..2])).to eq([user, user2])
       end
 
       it 'returns users with a matching name regardless of the casing' do
@@ -777,7 +777,7 @@ describe User, models: true do
       end
 
       it 'returns users with a partially matching Email' do
-        expect(described_class.search(user.email[0..2])).to eq([user2, user])
+        expect(described_class.search(user.email[0..2])).to eq([user, user2])
       end
 
       it 'returns users with a matching Email regardless of the casing' do
@@ -791,7 +791,7 @@ describe User, models: true do
       end
 
       it 'returns users with a partially matching username' do
-        expect(described_class.search(user.username[0..2])).to eq([user2, user])
+        expect(described_class.search(user.username[0..2])).to eq([user, user2])
       end
 
       it 'returns users with a matching username regardless of the casing' do