From 6c0ece59199b5a5c55588f58246a848955c3de0d Mon Sep 17 00:00:00 2001 From: Gabriel Cebrian Date: Wed, 20 Feb 2013 10:30:53 -0800 Subject: [PATCH 1/2] Added uniqueness and presence for user's username --- app/models/user.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/models/user.rb b/app/models/user.rb index 0fab6559..07771d20 100644 --- 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 From 5fcd900f3fd86e0da4045ee1a170827962abc1ab Mon Sep 17 00:00:00 2001 From: Gabriel Cebrian Date: Wed, 20 Feb 2013 10:44:13 -0800 Subject: [PATCH 2/2] Addedd username to factory girl --- spec/factories.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spec/factories.rb b/spec/factories.rb index ea4a147d..8b7294b0 100644 --- 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 \ No newline at end of file