Github Login: allow setting to blank

Previously, creating a user without a github login would result in user.github_login == '' instead of nil. This prevented creating more than one user without a github login because of the unique index on the field.

Github Login: allow setting to blank
Previously, creating a user without a github login would result in user.github_login == '' instead of nil. This prevented creating more than one user without a github login because of the unique index on the field.
Daniel Beardsley
1 parent 34a4b8a1
Showing 3 changed files with 21 additions and 0 deletions Show diff stats
app/models/user.rb
spec/controllers/users_controller_spec.rb
spec/models/user_spec.rb
@@ -52,6 +52,13 @@ class User
     github_account? && Errbit::Config.github_access_scope.include?('repo')
   end
  
+  def github_login=(login)
+    if login.is_a?(String) && login.strip.empty?
+      login = nil
+    end
+    self[:github_login] = login
+  end
+
   protected
  
     def destroy_watchers
@@ -79,6 +79,11 @@ describe UsersController do
           @user.reload.time_zone.should == "Warsaw"
         end
  
+        it "should be able to not set github_login option" do
+          put :update, :id => @user.to_param, :user => {:github_login => " "}
+          @user.reload.github_login.should == nil
+        end
+
         it "should be able to set github_login option" do
           put :update, :id => @user.to_param, :user => {:github_login => "awesome_name"}
           @user.reload.github_login.should == "awesome_name"
@@ -29,6 +29,15 @@ describe User do
       user2.should_not be_valid
       user2.errors[:github_login].should include("is already taken")
     end
+
+    it 'allows blank / null github_login' do
+      user1 = Fabricate(:user, :github_login => ' ')
+      user1.should be_valid
+
+      user2 = Fabricate.build(:user, :github_login => ' ')
+      user2.save
+      user2.should be_valid
+    end
   end
  
   context 'Watchers' do
...	...	@@ -52,6 +52,13 @@ class User
52	52	github_account? && Errbit::Config.github_access_scope.include?('repo')
53	53	end
54	54
	55	+ def github_login=(login)
	56	+ if login.is_a?(String) && login.strip.empty?
	57	+ login = nil
	58	+ end
	59	+ self[:github_login] = login
	60	+ end
	61	+
55	62	protected
56	63
57	64	def destroy_watchers
...	...
...	...	@@ -79,6 +79,11 @@ describe UsersController do
79	79	@user.reload.time_zone.should == "Warsaw"
80	80	end
81	81
	82	+ it "should be able to not set github_login option" do
	83	+ put :update, :id => @user.to_param, :user => {:github_login => " "}
	84	+ @user.reload.github_login.should == nil
	85	+ end
	86	+
82	87	it "should be able to set github_login option" do
83	88	put :update, :id => @user.to_param, :user => {:github_login => "awesome_name"}
84	89	@user.reload.github_login.should == "awesome_name"
...	...
...	...	@@ -29,6 +29,15 @@ describe User do
29	29	user2.should_not be_valid
30	30	user2.errors[:github_login].should include("is already taken")
31	31	end
	32	+
	33	+ it 'allows blank / null github_login' do
	34	+ user1 = Fabricate(:user, :github_login => ' ')
	35	+ user1.should be_valid
	36	+
	37	+ user2 = Fabricate.build(:user, :github_login => ' ')
	38	+ user2.save
	39	+ user2.should be_valid
	40	+ end
32	41	end
33	42
34	43	context 'Watchers' do
...	...