Merge pull request github#895 from anna239/master

atmos · atmos · commit 7dd74cb48912 · 2014-07-21T19:40:51.000-07:00
Do not fix issue if it was mentioned in commit with no explicit command
diff --git a/lib/services/you_track.rb b/lib/services/you_track.rb
@@ -76,7 +76,7 @@ def process_commit(commit)
       author ||= find_user_by_email(commit['author']['email'])
       return if author.nil?
 
-      command = 'Fixed' if command.nil?
+      command = 'comment' if command.nil?
       comment_string = "Commit made by '''" + commit['author']['name'] + "''' on ''" + commit['timestamp'] + "''\n" + commit['url'] + "\n\n{quote}" + commit['message'].to_s + '{quote}'
       execute_command(author, issue_id, command, comment_string)
     }
diff --git a/test/youtrack_test.rb b/test/youtrack_test.rb
@@ -57,13 +57,33 @@ def test_push
     @stubs.verify_stubbed_calls
   end
 
+  def test_push_no_command
+    valid_process_stubs
+
+    @stubs.post "/abc/rest/issue/case-2/execute" do |env|
+      assert_equal 'yt.com', env[:url].host
+      assert_equal 'sc', env[:request_headers]['Cookie']
+      assert_equal 'comment', env[:params]['command']
+      assert_equal 'mojombo', env[:params]['runAs']
+      [200, {}, '']
+    end
+
+    hash = payload
+    hash['commits'].first['message'].sub! /Case#1/, '#case-2'
+
+    svc = service(@data, hash)
+    svc.receive_push
+
+    @stubs.verify_stubbed_calls
+  end
+
   def test_branch_match
     valid_process_stubs
 
     @stubs.post "/abc/rest/issue/case-2/execute" do |env|
       assert_equal 'yt.com', env[:url].host
       assert_equal 'sc', env[:request_headers]['Cookie']
-      assert_equal 'Fixed', env[:params]['command']
+      assert_equal 'comment', env[:params]['command']
       assert_equal 'mojombo', env[:params]['runAs']
       [200, {}, '']
     end

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ def process_commit(commit)`
`76`	`76`	`author \|\|= find_user_by_email(commit['author']['email'])`
`77`	`77`	`return if author.nil?`
`78`	`78`
`79`		`- command = 'Fixed' if command.nil?`
	`79`	`+ command = 'comment' if command.nil?`
`80`	`80`	`comment_string = "Commit made by '''" + commit['author']['name'] + "''' on ''" + commit['timestamp'] + "''\n" + commit['url'] + "\n\n{quote}" + commit['message'].to_s + '{quote}'`
`81`	`81`	`execute_command(author, issue_id, command, comment_string)`
`82`	`82`	`}`