Commit 5d8d72f1 authored by Robert Speicher's avatar Robert Speicher

Merge branch...

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
parents ecd1b816 48dfc670
...@@ -12,7 +12,8 @@ feature 'image diff notes', :js do ...@@ -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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment