diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-01-22 18:13:22 +0300 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-01-22 18:13:22 +0300 |
commit | 676b2043f7fb5fc80a7faf13eda42ea490fa9fc9 (patch) | |
tree | 6520909fd0e6bc112f978be5c4959f1c012e26a5 /spec/controllers/projects | |
parent | f816b3e9f2a77c2afd93999ba0ca202fc8e191d0 (diff) | |
parent | 4f34206a5b9308efeb0970bfe62434e8fedf15c5 (diff) |
Merge branch '41208-commit-atom-feeds-double-escaped' into 'master'
Resolve "Commits atom feed is double-escaped"
Closes #41208
See merge request gitlab-org/gitlab-ce!16603
Diffstat (limited to 'spec/controllers/projects')
-rw-r--r-- | spec/controllers/projects/commits_controller_spec.rb | 8 |
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 |