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
0
Merge Requests
0
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
Jérome Perrin
gitlab-ce
Commits
d78c667d
Commit
d78c667d
authored
Oct 14, 2016
by
Stan Hu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix broken Spinach tests caused by changes in !6550
Partial fix to #23378
parent
a453dace
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
7 deletions
+15
-7
features/steps/project/commits/commits.rb
features/steps/project/commits/commits.rb
+14
-6
spec/features/compare_spec.rb
spec/features/compare_spec.rb
+1
-1
No files found.
features/steps/project/commits/commits.rb
View file @
d78c667d
...
@@ -42,15 +42,16 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
...
@@ -42,15 +42,16 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
end
end
step
'I fill compare fields with branches'
do
step
'I fill compare fields with branches'
do
fill_in
'from'
,
with:
'feature'
select_using_dropdown
(
'from'
,
'feature'
)
fill_in
'to'
,
with:
'master'
select_using_dropdown
(
'to'
,
'master'
)
click_button
'Compare'
click_button
'Compare'
end
end
step
'I fill compare fields with refs'
do
step
'I fill compare fields with refs'
do
fill_in
"from"
,
with:
sample_commit
.
parent_id
select_using_dropdown
(
'from'
,
sample_commit
.
parent_id
)
fill_in
"to"
,
with:
sample_commit
.
id
select_using_dropdown
(
'to'
,
sample_commit
.
id
)
click_button
"Compare"
click_button
"Compare"
end
end
...
@@ -97,8 +98,8 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
...
@@ -97,8 +98,8 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
end
end
step
'I fill compare fields with branches'
do
step
'I fill compare fields with branches'
do
fill_in
'from'
,
with:
'master'
select_using_dropdown
(
'from'
,
'master'
)
fill_in
'to'
,
with:
'feature'
select_using_dropdown
(
'to'
,
'feature'
)
click_button
'Compare'
click_button
'Compare'
end
end
...
@@ -182,4 +183,11 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
...
@@ -182,4 +183,11 @@ class Spinach::Features::ProjectCommits < Spinach::FeatureSteps
expect
(
page
).
to
have_content
"More submodules"
expect
(
page
).
to
have_content
"More submodules"
expect
(
page
).
not_to
have_content
"Change some files"
expect
(
page
).
not_to
have_content
"Change some files"
end
end
def
select_using_dropdown
(
dropdown_type
,
selection
)
dropdown
=
find
(
".js-compare-
#{
dropdown_type
}
-dropdown"
)
dropdown
.
find
(
".compare-dropdown-toggle"
).
click
dropdown
.
fill_in
(
"Filter by branch/tag"
,
with:
selection
)
find_link
(
selection
,
visible:
true
).
click
end
end
end
spec/features/compare_spec.rb
View file @
d78c667d
...
@@ -45,6 +45,6 @@ describe "Compare", js: true do
...
@@ -45,6 +45,6 @@ describe "Compare", js: true do
dropdown
=
find
(
".js-compare-
#{
dropdown_type
}
-dropdown"
)
dropdown
=
find
(
".js-compare-
#{
dropdown_type
}
-dropdown"
)
dropdown
.
find
(
".compare-dropdown-toggle"
).
click
dropdown
.
find
(
".compare-dropdown-toggle"
).
click
dropdown
.
fill_in
(
"Filter by branch/tag"
,
with:
selection
)
dropdown
.
fill_in
(
"Filter by branch/tag"
,
with:
selection
)
click_link
selection
find_link
(
selection
,
visible:
true
).
click
end
end
end
end
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