summaryrefslogtreecommitdiff
path: root/spec/controllers/projects/commits_controller_spec.rb
diff options
context:
space:
mode:
authorJacopo <beschi.jacopo@gmail.com>2018-01-21 12:06:48 +0100
committerJacopo <beschi.jacopo@gmail.com>2018-01-22 15:00:35 +0100
commit4f34206a5b9308efeb0970bfe62434e8fedf15c5 (patch)
tree03720dfd2d09a140e87d4db9807202241d7560d6 /spec/controllers/projects/commits_controller_spec.rb
parent269594bf2277e14d8cd189cdbbeeee7db8ed23d7 (diff)
downloadgitlab-ce-4f34206a5b9308efeb0970bfe62434e8fedf15c5.tar.gz
Allows html in commits atom feed
Html code now works in commits atom feed `title` and `summary`.
Diffstat (limited to 'spec/controllers/projects/commits_controller_spec.rb')
-rw-r--r--spec/controllers/projects/commits_controller_spec.rb8
1 files changed, 7 insertions, 1 deletions
diff --git a/spec/controllers/projects/commits_controller_spec.rb b/spec/controllers/projects/commits_controller_spec.rb
index 73fb90d73ec..55ed276f96b 100644
--- a/spec/controllers/projects/commits_controller_spec.rb
+++ b/spec/controllers/projects/commits_controller_spec.rb
@@ -41,15 +41,21 @@ describe Projects::CommitsController do
context "when the ref name ends in .atom" do
context "when the ref does not exist with the suffix" do
- it "renders as atom" do
+ before do
get(:show,
namespace_id: project.namespace,
project_id: project,
id: "master.atom")
+ end
+ it "renders as atom" do
expect(response).to be_success
expect(response.content_type).to eq('application/atom+xml')
end
+
+ it 'renders summary with type=html' do
+ expect(response.body).to include('<summary type="html">')
+ end
end
context "when the ref exists with the suffix" do