From e5998adc26f66b2b84cbcc28e98f3fc8f89b4696 Mon Sep 17 00:00:00 2001
From: Marin Jankovski <maxlazio@gmail.com>
Date: Mon, 6 Oct 2014 10:42:03 +0200
Subject: [PATCH] Accommodate new webhook url format.

---
 app/models/project_services/slack_service.rb | 12 ++++++-----
 spec/models/slack_service_spec.rb            | 21 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 5 deletions(-)

diff --git a/app/models/project_services/slack_service.rb b/app/models/project_services/slack_service.rb
index 2174919346d..dfa1e9c9820 100644
--- a/app/models/project_services/slack_service.rb
+++ b/app/models/project_services/slack_service.rb
@@ -40,11 +40,13 @@ class SlackService < Service
       project_name: project_name
     ))
 
-    credentials = webhook.match(/(\w*).slack.com.*token=(\w*)/)
-    subdomain =  credentials[1]
-    token = credentials[2]
-    notifier = Slack::Notifier.new(subdomain, token)
-    notifier.ping(message.pretext, attachments: message.attachments)
+    credentials = webhook.match(/(\w*).slack.com.*services\/(.*)/)
+    if credentials.present?
+      subdomain =  credentials[1]
+      token = credentials[2].split("token=").last
+      notifier = Slack::Notifier.new(subdomain, token)
+      notifier.ping(message.pretext, attachments: message.attachments)
+    end
   end
 
   private
diff --git a/spec/models/slack_service_spec.rb b/spec/models/slack_service_spec.rb
index 5f919d97300..3e555193b32 100644
--- a/spec/models/slack_service_spec.rb
+++ b/spec/models/slack_service_spec.rb
@@ -32,10 +32,12 @@ describe SlackService do
 
   describe "Execute" do
     let(:slack) { SlackService.new }
+    let(:slack_service) { SlackService.new }
     let(:user) { create(:user) }
     let(:project) { create(:project) }
     let(:sample_data) { GitPushService.new.sample_data(project, user) }
     let(:webhook) { 'https://gitlabhq.slack.com/services/hooks?token=cdIj4r4LfXUOySDUjp0tk3OI' }
+    let(:new_webhook) { 'https://hooks.gitlabhq.slack.com/services/cdIj4r4LfXUOySDUjp0tk3OI' }
     let(:api_url) {
       'https://gitlabhq.slack.com/services/hooks/incoming-webhook?token=cdIj4r4LfXUOySDUjp0tk3OI'
     }
@@ -56,5 +58,24 @@ describe SlackService do
 
       WebMock.should have_requested(:post, api_url).once
     end
+
+    context 'with new webhook syntax' do
+      before do
+        slack_service.stub(
+          project: project,
+          project_id: project.id,
+          service_hook: true,
+          webhook: new_webhook
+        )
+
+        WebMock.stub_request(:post, api_url)
+      end
+
+      it "should call Slack API" do
+        slack_service.execute(sample_data)
+
+        WebMock.should have_requested(:post, api_url).once
+      end
+    end
   end
 end