Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
heptapod
heptapod
Commits
debe392ba49b
Commit
eecd8971
authored
Mar 24, 2015
by
Stan Hu
Browse files
Fix code unfold not working on Compare commits page
Closes #1274
parent
bf412cd90d26
Changes
4
Hide whitespace changes
Inline
Side-by-side
CHANGELOG
View file @
debe392b
Please view this file on the master branch, on stable branches it's out of date.
v 7.10.0 (unreleased)
- Fix code unfold not working on Compare commits page (Stan Hu)
- Include missing events and fix save functionality in admin service template settings form (Stan Hu)
- Fix "Import projects from" button to show the correct instructions (Stan Hu)
- Fix dots in Wiki slugs causing errors (Stan Hu)
...
...
app/assets/javascripts/dispatcher.js.coffee
View file @
debe392b
...
...
@@ -28,6 +28,8 @@ class Dispatcher
new
Milestone
()
when
'projects:milestones:new'
,
'projects:milestones:edit'
new
ZenMode
()
when
'projects:compare:show'
new
Diff
()
when
'projects:issues:new'
,
'projects:issues:edit'
GitLab
.
GfmAutoComplete
.
setup
()
shortcut_handler
=
new
ShortcutsNavigation
()
...
...
@@ -115,6 +117,8 @@ class Dispatcher
new
Project
()
new
ProjectAvatar
()
switch
path
[
1
]
when
'compare'
shortcut_handler
=
new
ShortcutsNavigation
()
when
'edit'
shortcut_handler
=
new
ShortcutsNavigation
()
new
ProjectNew
()
...
...
features/project/commits/commits.feature
View file @
debe392b
...
...
@@ -21,10 +21,13 @@ Feature: Project Commits
And
I click side-by-side diff button
Then
I see inline diff button
@javascript
Scenario
:
I
compare refs
Given
I visit compare refs page
And
I fill compare fields with refs
Then
I see compared refs
And
I unfold diff
Then
I should see additional file lines
Scenario
:
I
browse commits for a specific path
Given
I visit my project's commits page for a specific path
...
...
features/steps/project/commits/commits.rb
View file @
debe392b
...
...
@@ -38,6 +38,18 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
click_button
"Compare"
end
step
'I unfold diff'
do
@diff
=
first
(
'.js-unfold'
)
@diff
.
click
sleep
2
end
step
'I should see additional file lines'
do
within
@diff
.
parent
do
first
(
'.new_line'
).
text
.
should_not
have_content
"..."
end
end
step
'I see compared refs'
do
page
.
should
have_content
"Compare View"
page
.
should
have_content
"Commits (1)"
...
...
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