Merge branch 'rs-issue-201' into 'master'

Prevent duplicate "username has already been taken" validation message

Closes #201 - two-year-old bug, woo! :boom: :tada:

See merge request !2279

2 files changed, 5 insertions, 2 deletions

diff --git a/app/models/user.rb b/app/models/user.rb
index df87f3b79bd..20f907e4347 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -352,10 +352,13 @@ class User < ActiveRecord::Base
   end
 
   def namespace_uniq
+    # Return early if username already failed the first uniqueness validation
+    return if self.errors[:username].include?('has already been taken')
+
     namespace_name = self.username
     existing_namespace = Namespace.by_path(namespace_name)
     if existing_namespace && existing_namespace != self.namespace
-      self.errors.add :username, "already exists"
+      self.errors.add(:username, 'has already been taken')
     end
   end
 
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 2f184bbaf92..a16161e673e 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -106,7 +106,7 @@ describe User, models: true do
       end
 
       it 'validates uniqueness' do
-        expect(subject).to validate_uniqueness_of(:username)
+        expect(subject).to validate_uniqueness_of(:username).case_insensitive
       end
     end