summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Eisner <david.eisner@oriel.oxon.org>2016-10-05 13:38:08 +0100
committerAirat Shigapov <contact@airatshigapov.com>2016-10-20 15:44:34 +0300
commit32cf2e5f77c24c27782adc37d4635b06dfada060 (patch)
treed66b08807a165af809a39f280b67d9564614ed9d
parentaa2406e0f821e217ed5e0c59a212cecd73227509 (diff)
downloadgitlab-ce-32cf2e5f77c24c27782adc37d4635b06dfada060.tar.gz
Tests for markdown HipChat notifications
-rw-r--r--spec/models/project_services/hipchat_service_spec.rb12
1 files changed, 6 insertions, 6 deletions
diff --git a/spec/models/project_services/hipchat_service_spec.rb b/spec/models/project_services/hipchat_service_spec.rb
index 90066f01f6f..1029b6d2459 100644
--- a/spec/models/project_services/hipchat_service_spec.rb
+++ b/spec/models/project_services/hipchat_service_spec.rb
@@ -135,7 +135,7 @@ describe HipchatService, models: true do
"<a href=\"#{obj_attr[:url]}\">issue ##{obj_attr["iid"]}</a> in " \
"<a href=\"#{project.web_url}\">#{project_name}</a>: " \
"<b>Awesome issue</b>" \
- "<pre><p><strong>please</strong> fix</p>\n</pre>")
+ "<p><strong>please</strong> fix</p>")
end
end
@@ -159,7 +159,7 @@ describe HipchatService, models: true do
"<a href=\"#{obj_attr[:url]}\">merge request !#{obj_attr["iid"]}</a> in " \
"<a href=\"#{project.web_url}\">#{project_name}</a>: " \
"<b>Awesome merge request</b>" \
- "<pre><p><strong>please</strong> fix</p>\n</pre>")
+ "<p><strong>please</strong> fix</p>")
end
end
@@ -190,7 +190,7 @@ describe HipchatService, models: true do
"<a href=\"#{obj_attr[:url]}\">commit #{commit_id}</a> in " \
"<a href=\"#{project.web_url}\">#{project_name}</a>: " \
"#{title}" \
- "<pre><p>a comment on a commit</p>\n</pre>")
+ "<p>a comment on a commit</p>")
end
end
@@ -222,7 +222,7 @@ describe HipchatService, models: true do
"<a href=\"#{obj_attr[:url]}\">merge request !#{merge_id}</a> in " \
"<a href=\"#{project.web_url}\">#{project_name}</a>: " \
"<b>#{title}</b>" \
- "<pre><p>merge request <strong>note</strong></p>\n</pre>")
+ "<p>merge request <strong>note</strong></p>")
end
end
@@ -247,7 +247,7 @@ describe HipchatService, models: true do
"<a href=\"#{obj_attr[:url]}\">issue ##{issue_id}</a> in " \
"<a href=\"#{project.web_url}\">#{project_name}</a>: " \
"<b>#{title}</b>" \
- "<pre><p>issue <strong>note</strong></p>\n</pre>")
+ "<p>issue <strong>note</strong></p>")
end
end
@@ -275,7 +275,7 @@ describe HipchatService, models: true do
"<a href=\"#{obj_attr[:url]}\">snippet ##{snippet_id}</a> in " \
"<a href=\"#{project.web_url}\">#{project_name}</a>: " \
"<b>#{title}</b>" \
- "<pre><p>snippet note</p>\n</pre>")
+ "<p>snippet note</p>")
end
end
end