Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
51bfab03
Commit
51bfab03
authored
Dec 20, 2017
by
Clement Ho
Committed by
Rémy Coutable
Dec 21, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stub old image diff url
parent
2e94e47a
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
spec/features/merge_requests/image_diff_notes_spec.rb
spec/features/merge_requests/image_diff_notes_spec.rb
+2
-1
No files found.
spec/features/merge_requests/image_diff_notes_spec.rb
View file @
51bfab03
...
@@ -13,6 +13,7 @@ feature 'image diff notes', :js do
...
@@ -13,6 +13,7 @@ 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_url
).
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
...
@@ -192,7 +193,7 @@ feature 'image diff notes', :js do
...
@@ -192,7 +193,7 @@ feature 'image diff notes', :js do
it
'resizes image in onion skin view mode'
do
it
'resizes image in onion skin view mode'
do
find
(
'.view-modes-menu .onion-skin'
).
click
find
(
'.view-modes-menu .onion-skin'
).
click
expect
(
find
(
'.onion-skin-frame'
)[
'style'
]).
to
match
(
'width: 2
43
px; height: 240px;'
)
expect
(
find
(
'.onion-skin-frame'
)[
'style'
]).
to
match
(
'width: 2
28
px; height: 240px;'
)
end
end
it
'resets onion skin view mode opacity when toggling between view modes'
do
it
'resets onion skin view mode opacity when toggling between view modes'
do
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment