summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarin Jankovski <maxlazio@gmail.com>2014-10-03 18:59:57 +0200
committerMarin Jankovski <maxlazio@gmail.com>2014-10-06 10:44:01 +0200
commit216fb6ee07b80c2cb6cd78fdcb52c898fa2f41ea (patch)
tree67b22508927863eaf909519f28c8948317bcccca
parent20179772140ff0bdc2d61852c0a4f48ee6e4a2d0 (diff)
downloadgitlab-ce-216fb6ee07b80c2cb6cd78fdcb52c898fa2f41ea.tar.gz
Fix slack service speck.
-rw-r--r--spec/models/slack_service_spec.rb13
1 files changed, 4 insertions, 9 deletions
diff --git a/spec/models/slack_service_spec.rb b/spec/models/slack_service_spec.rb
index 4576913b473..5f919d97300 100644
--- a/spec/models/slack_service_spec.rb
+++ b/spec/models/slack_service_spec.rb
@@ -26,9 +26,7 @@ describe SlackService do
subject.active = true
end
- it { should validate_presence_of :room }
- it { should validate_presence_of :subdomain }
- it { should validate_presence_of :token }
+ it { should validate_presence_of :webhook }
end
end
@@ -37,20 +35,17 @@ describe SlackService do
let(:user) { create(:user) }
let(:project) { create(:project) }
let(:sample_data) { GitPushService.new.sample_data(project, user) }
- let(:subdomain) { 'gitlab' }
- let(:token) { 'verySecret' }
+ let(:webhook) { 'https://gitlabhq.slack.com/services/hooks?token=cdIj4r4LfXUOySDUjp0tk3OI' }
let(:api_url) {
- "https://#{subdomain}.slack.com/services/hooks/incoming-webhook?token=#{token}"
+ 'https://gitlabhq.slack.com/services/hooks/incoming-webhook?token=cdIj4r4LfXUOySDUjp0tk3OI'
}
before do
slack.stub(
project: project,
project_id: project.id,
- room: '#gitlab',
service_hook: true,
- subdomain: subdomain,
- token: token
+ webhook: webhook
)
WebMock.stub_request(:post, api_url)