summaryrefslogtreecommitdiff
path: root/spec/models
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2015-02-20 16:05:40 +0100
committerDouwe Maan <douwe@gitlab.com>2015-03-03 11:14:32 +0100
commitd86c0cda24a76c9330b5fed59e857ce9e4150b9b (patch)
tree9fd4c7f8cf8c2df5c4ee1ead0993a7b9446c2d46 /spec/models
parent19f04cf989a75f425af09a8551957dae42b1ff31 (diff)
downloadgitlab-ce-d86c0cda24a76c9330b5fed59e857ce9e4150b9b.tar.gz
Fix specs.
Diffstat (limited to 'spec/models')
-rw-r--r--spec/models/project_services/slack_service/issue_message_spec.rb (renamed from spec/models/project_services/slack_messages/slack_issue_message_spec.rb)4
-rw-r--r--spec/models/project_services/slack_service/merge_message_spec.rb (renamed from spec/models/project_services/slack_messages/slack_merge_message_spec.rb)4
-rw-r--r--spec/models/project_services/slack_service/push_message_spec.rb (renamed from spec/models/project_services/slack_messages/slack_push_message_spec.rb)8
3 files changed, 8 insertions, 8 deletions
diff --git a/spec/models/project_services/slack_messages/slack_issue_message_spec.rb b/spec/models/project_services/slack_service/issue_message_spec.rb
index 49a8eea0a58..a23a7cc068e 100644
--- a/spec/models/project_services/slack_messages/slack_issue_message_spec.rb
+++ b/spec/models/project_services/slack_service/issue_message_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
-describe SlackMessages::SlackIssueMessage do
- subject { SlackMessages::SlackIssueMessage.new(args) }
+describe SlackService::IssueMessage do
+ subject { SlackService::IssueMessage.new(args) }
let(:args) {
{
diff --git a/spec/models/project_services/slack_messages/slack_merge_message_spec.rb b/spec/models/project_services/slack_service/merge_message_spec.rb
index ef76c3312ea..25d03cd8736 100644
--- a/spec/models/project_services/slack_messages/slack_merge_message_spec.rb
+++ b/spec/models/project_services/slack_service/merge_message_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
-describe SlackMessages::SlackMergeMessage do
- subject { SlackMessages::SlackMergeMessage.new(args) }
+describe SlackService::MergeMessage do
+ subject { SlackService::MergeMessage.new(args) }
let(:args) {
{
diff --git a/spec/models/project_services/slack_messages/slack_push_message_spec.rb b/spec/models/project_services/slack_service/push_message_spec.rb
index f11614d6921..ef0e7a6ee30 100644
--- a/spec/models/project_services/slack_messages/slack_push_message_spec.rb
+++ b/spec/models/project_services/slack_service/push_message_spec.rb
@@ -1,7 +1,7 @@
require 'spec_helper'
-describe SlackMessages::SlackPushMessage do
- subject { SlackMessages::SlackPushMessage.new(args) }
+describe SlackService::PushMessage do
+ subject { SlackService::PushMessage.new(args) }
let(:args) {
{
@@ -31,8 +31,8 @@ describe SlackMessages::SlackPushMessage do
)
expect(subject.attachments).to eq([
{
- text: "<url1|abcdefghi>: message1 - author1\n"\
- "<url2|123456789>: message2 - author2",
+ text: "<url1|abcdefgh>: message1 - author1\n"\
+ "<url2|12345678>: message2 - author2",
color: color,
}
])