From 8c3ec9426955843c35b928701cf8bbd37c7e531b Mon Sep 17 00:00:00 2001 From: DanielDraganov Date: Fri, 30 Jan 2015 13:49:04 +0200 Subject: [PATCH 1/2] Update one of the test to use an "issues" event. --- test/kanbanize_test.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/kanbanize_test.rb b/test/kanbanize_test.rb index 2610c2e4d..0022895eb 100644 --- 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 From af0ac538ff353b1d1bda7169913eab6e115638bc Mon Sep 17 00:00:00 2001 From: DanielDraganov Date: Fri, 30 Jan 2015 13:51:23 +0200 Subject: [PATCH 2/2] Only push events should use branch filtering logic --- lib/services/kanbanize.rb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/lib/services/kanbanize.rb b/lib/services/kanbanize.rb index 9cc530f19..7354084c3 100644 --- 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",