diff options
| author | Robert Speicher <robert@gitlab.com> | 2017-12-21 00:07:01 +0000 |
|---|---|---|
| committer | Robert Speicher <robert@gitlab.com> | 2017-12-21 00:07:01 +0000 |
| commit | 5d8d72f18e9329978987fcb046467ceacd13c3ab (patch) | |
| tree | 92645d9d59fc4b2ca4db25a0a24f9c3daf009058 | |
| parent | ecd1b816644080cc5ccab9c2eddaba9676b47b49 (diff) | |
| parent | 48dfc670d3300d5593ad161be9954c090ca896ee (diff) | |
| download | gitlab-ce-5d8d72f18e9329978987fcb046467ceacd13c3ab.tar.gz | |
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
| -rw-r--r-- | spec/features/merge_requests/image_diff_notes_spec.rb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/spec/features/merge_requests/image_diff_notes_spec.rb b/spec/features/merge_requests/image_diff_notes_spec.rb index ddc73437917..b53570835cb 100644 --- a/spec/features/merge_requests/image_diff_notes_spec.rb +++ b/spec/features/merge_requests/image_diff_notes_spec.rb @@ -12,7 +12,8 @@ feature 'image diff notes', :js do # 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. - 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 context 'create commit diff notes' do |