Give tips to the existing GitHub user if he is known

sigmike · sigmike · commit 9d5e6629da0d · 2014-04-21T13:15:26.000+02:00
diff --git a/app/models/project.rb b/app/models/project.rb
@@ -91,7 +91,10 @@ def tip_commits
 
   def tip_for commit
     email = commit.commit.author.email
-    user = User.find_by email: email
+    if nickname = commit.author.try(:login)
+      user = User.find_by(nickname: nickname)
+    end
+    user ||= User.find_by(email: email)
 
     if (next_tip_amount > 0) &&
         Tip.find_by(commit: commit.sha).nil?
@@ -103,12 +106,12 @@ def tip_for commit
           email: email,
           password: generated_password,
           name: commit.commit.author.name,
-          nickname: (commit.author.login rescue nil)
+          nickname: nickname,
         })
       end
 
-      if commit.author && commit.author.login
-        user.update nickname: commit.author.login
+      if nickname
+        user.update nickname: nickname
       end
 
       if hold_tips
diff --git a/features/commit_from_known_nickname.feature b/features/commit_from_known_nickname.feature
@@ -0,0 +1,16 @@
+Feature: A commit with an identified GitHub nickname should be sent to the right user if he exists
+  Scenario:
+    Given a project "a"
+    And our fee is "0"
+    And a deposit of "500"
+    And an user "yugo"
+    And the email of "yugo" is "yugo1@example.com"
+    And the last known commit is "A"
+    And a new commit "B" with parent "A"
+    And the author of commit "B" is "yugo"
+    And the email of commit "B" is "yugo2@example.com"
+
+    When the new commits are read
+    Then there should be a tip of "5" for commit "B"
+    And the tip for commit "B" is for user "yugo"
+    And there should be no user with email "yugo2@example.com"
diff --git a/features/step_definitions/commit_from_known_nickname.rb b/features/step_definitions/commit_from_known_nickname.rb
@@ -0,0 +1,16 @@
+Given(/^an user "(.*?)"$/) do |arg1|
+  create(:user, nickname: arg1, email: "#{arg1}@example.com")
+end
+
+Given(/^the email of "(.*?)" is "(.*?)"$/) do |arg1, arg2|
+  User.find_by_nickname!(arg1).update(email: arg2)
+end
+
+Then(/^the tip for commit "(.*?)" is for user "(.*?)"$/) do |arg1, arg2|
+  Tip.find_by_commit!(arg1).user.nickname.should eq(arg2)
+end
+
+Then(/^there should be no user with email "(.*?)"$/) do |arg1|
+  User.where(email: arg1).size.should eq(0)
+end
+
diff --git a/features/step_definitions/common.rb b/features/step_definitions/common.rb
@@ -78,6 +78,10 @@ def find_new_commit(id)
   find_new_commit(arg1).deep_merge!(commit: {message: arg2})
 end
 
+Given(/^the email of commit "(.*?)" is "(.*?)"$/) do |arg1, arg2|
+  find_new_commit(arg1).deep_merge!(commit: {author: {email: arg2}})
+end
+
 When(/^the new commits are read$/) do
   @project.reload
   @project.should_receive(:new_commits).and_return(@new_commits.values.map(&:to_ostruct))
