From 1ed8cf1c50ce2f7e68c5d284c0c81393d2af6788 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20Coutable?= Date: Wed, 20 Dec 2017 18:47:45 +0100 Subject: [PATCH 1/2] Fix a failure because we stub DiffHelper#diff_file_blob_raw_path instead of #diff_file_blob_raw_url MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Rémy Coutable --- spec/features/merge_requests/image_diff_notes_spec.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 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..42fc42422eb 100644 --- a/spec/features/merge_requests/image_diff_notes_spec.rb +++ b/spec/features/merge_requests/image_diff_notes_spec.rb @@ -12,7 +12,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_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') end context 'create commit diff notes' do @@ -192,7 +192,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: 228px; height: 240px;') + expect(find('.onion-skin-frame')['style']).to match('width: 243px; height: 240px;') end it 'resets onion skin view mode opacity when toggling between view modes' do From 48dfc670d3300d5593ad161be9954c090ca896ee Mon Sep 17 00:00:00 2001 From: Clement Ho Date: Wed, 20 Dec 2017 16:36:43 -0600 Subject: [PATCH 2/2] Stub old image diff url --- spec/features/merge_requests/image_diff_notes_spec.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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