Merge pull request github#1018 from DanielDraganov/master

kdaigle · kdaigle · commit bafe9674d45c · 2015-02-04T08:40:21.000-05:00
Fix: Kanbanize service fails for :issues and :issue_comment events
diff --git a/lib/services/kanbanize.rb b/lib/services/kanbanize.rb
@@ -29,9 +29,11 @@ def receive_event
     issues_board_id = data['project_issues_board_id'].to_s
 	
     # check the branch restriction is poplulated and branch is not included
-    branch = payload['ref'].split('/').last
-    if branch_restriction.length > 0 && branch_restriction.index(branch) == nil
-      return
+    if event.to_s == 'push'
+    	branch = payload['ref'].split('/').last
+    	if branch_restriction.length > 0 && branch_restriction.index(branch) == nil
+	    return
+    	end
     end
 
     http_post "http://#{domain_name}/index.php/api/kanbanize/git_hub_event",
diff --git a/test/kanbanize_test.rb b/test/kanbanize_test.rb
@@ -46,7 +46,7 @@ def test_push_with_issue_tracking
     @stubs.post url do |env|
       assert_equal 'testdomain.kanbanize.com', env[:url].host
       assert_equal '/index.php/api/kanbanize/git_hub_event', env[:url].request_uri
-      assert_equal %({"ref":"refs/heads/mybranch2"}), env[:body]
+      assert_equal %({"action":"created"}), env[:body]
       assert_equal 'a1b2c3==', env[:request_headers]['apikey']
       assert_equal '', env[:request_headers]['branch-filter']
       assert_equal false, env[:request_headers]['last-commit']
@@ -55,7 +55,7 @@ def test_push_with_issue_tracking
       [200, {}, '']
     end
 	
-    svc = service({'kanbanize_domain_name' => 'testdomain.kanbanize.com', 'kanbanize_api_key' => 'a1b2c3==', 'track_project_issues_in_kanbanize' => '1', 'project_issues_board_id' => '131'}, {'ref' => 'refs/heads/mybranch2'})
+    svc = service(:issues, {'kanbanize_domain_name' => 'testdomain.kanbanize.com', 'kanbanize_api_key' => 'a1b2c3==', 'track_project_issues_in_kanbanize' => '1', 'project_issues_board_id' => '131'}, {'action' => 'created'})
     svc.receive_event
   end
 
