Merge pull request #96 from gabceb/master

Uniqueness and presence added to user's username
kandanapp · Feb 20, 2013 · b961af3 · b961af3
2 parents 1b1ec67 + 5fcd900
commit b961af3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/app/models/user.rb b/app/models/user.rb
@@ -3,6 +3,8 @@ class User < ActiveRecord::Base
   has_many :activities
   before_save :ensure_authentication_token
   before_save :ensure_gravatar_hash
+
+  validates :username, :presence => true, :uniqueness => true
 
 
   # Kandan.devise_modules is defined in config/initializers/kandan.rb

diff --git a/spec/factories.rb b/spec/factories.rb
@@ -11,6 +11,10 @@
     "#{rand(11111111...99999999)}"
   end
 
+  sequence :username do |n|
+    "user#{n}"
+  end
+
   factory :channel do |f|
     f.name "Test channel"
   end
@@ -21,5 +25,6 @@
     f.password { FactoryGirl.generate(:password)}
     f.email  { FactoryGirl.generate(:email) }
     f.ido_id { FactoryGirl.generate(:ido_id) }
+    f.username { FactoryGirl.generate(:username) }
   end
 end