diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2017-08-21 14:34:21 +0000 |
---|---|---|
committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-08-21 09:51:38 -0500 |
commit | 6f8b9a16f508935ad23c42402440bb269e12e071 (patch) | |
tree | 6c9ee2c49a06a774aa00bedfce1100821f33b75e /spec | |
parent | 237d26b9d6ca4c4d60010dc8b2db29cdfb8b4e42 (diff) | |
download | gitlab-ce-6f8b9a16f508935ad23c42402440bb269e12e071.tar.gz |
Merge branch 'sh-fix-atom-feeds' into 'master'
Fix 500 errors in Atom feeds due to push events
Closes #36705
See merge request !13695
Diffstat (limited to 'spec')
-rw-r--r-- | spec/features/atom/users_spec.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/spec/features/atom/users_spec.rb b/spec/features/atom/users_spec.rb index 79069bbca8e..9ce687afb31 100644 --- a/spec/features/atom/users_spec.rb +++ b/spec/features/atom/users_spec.rb @@ -41,6 +41,8 @@ describe "User Feed" do target_project: project, description: "Here is the fix: ![an image](image.png)") end + let(:push_event) { create(:push_event, project: project, author: user) } + let!(:push_event_payload) { create(:push_event_payload, event: push_event) } before do project.team << [user, :master] @@ -70,6 +72,10 @@ describe "User Feed" do it 'has XHTML summaries in merge request descriptions' do expect(body).to match /Here is the fix: <a[^>]*><img[^>]*\/><\/a>/ end + + it 'has push event commit ID' do + expect(body).to have_content(Commit.truncate_sha(push_event.commit_id)) + end end end |