kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '41291-spec-failure-on-spec-features-merge_requests-image_diff_notes_spec-rb' into 'master' 

Fix a failure because we stub DiffHelper#diff_file_blob_raw_path instead of #diff_file_blob_raw_url

Closes #41291

See merge request gitlab-org/gitlab-ce!16052
This commit is contained in:
Robert Speicher 2017-12-21 00:07:01 +00:00
parent ecd1b81664 48dfc670d3
commit 5d8d72f18e
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
spec/features/merge_requests/image_diff_notes_spec.rb
View File

@ -12,7 +12,8 @@ feature 'image diff notes', :js do
# Stub helper to return any blob file as image from public app folder. # Stub helper to return any blob file as image from public app folder.
# This is necessary to run this specs since we don't display repo images in capybara. # This is necessary to run this specs since we don't display repo images in capybara.
allow_any_instance_of(DiffHelper).to receive(:diff_file_blob_raw_path).and_return('/apple-touch-icon.png') allow_any_instance_of(DiffHelper).to receive(:diff_file_blob_raw_url).and_return('/apple-touch-icon.png')
allow_any_instance_of(DiffHelper).to receive(:diff_file_old_blob_raw_url).and_return('/favicon.ico')
end end
context 'create commit diff notes' do context 'create commit diff notes' do