summaryrefslogtreecommitdiff
path: root/spec/features
diff options
context:
space:
mode:
authorClement Ho <ClemMakesApps@gmail.com>2017-12-20 16:36:43 -0600
committerClement Ho <ClemMakesApps@gmail.com>2017-12-20 16:36:43 -0600
commit48dfc670d3300d5593ad161be9954c090ca896ee (patch)
tree7124036cd093085598293b1662c51fff62fab238 /spec/features
parent1ed8cf1c50ce2f7e68c5d284c0c81393d2af6788 (diff)
downloadgitlab-ce-48dfc670d3300d5593ad161be9954c090ca896ee.tar.gz
Stub old image diff url
Diffstat (limited to 'spec/features')
-rw-r--r--spec/features/merge_requests/image_diff_notes_spec.rb3
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 42fc42422eb..b53570835cb 100644
--- a/spec/features/merge_requests/image_diff_notes_spec.rb
+++ b/spec/features/merge_requests/image_diff_notes_spec.rb
@@ -13,6 +13,7 @@ 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_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
@@ -192,7 +193,7 @@ feature 'image diff notes', :js do
it 'resizes image in onion skin view mode' do
find('.view-modes-menu .onion-skin').click
- expect(find('.onion-skin-frame')['style']).to match('width: 243px; height: 240px;')
+ expect(find('.onion-skin-frame')['style']).to match('width: 228px; height: 240px;')
end
it 'resets onion skin view mode opacity when toggling between view modes' do