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
c757000e
Commit
c757000e
authored
May 12, 2017
by
Annabel Dunstone Gray
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix specs
parent
b29414df
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
features/steps/project/merge_requests.rb
features/steps/project/merge_requests.rb
+1
-1
spec/features/merge_requests/diff_notes_resolve_spec.rb
spec/features/merge_requests/diff_notes_resolve_spec.rb
+1
-1
spec/features/search_spec.rb
spec/features/search_spec.rb
+2
-2
No files found.
features/steps/project/merge_requests.rb
View file @
c757000e
...
@@ -331,7 +331,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
...
@@ -331,7 +331,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps
step
'I click on the Discussion tab'
do
step
'I click on the Discussion tab'
do
page
.
within
'.merge-request-tabs'
do
page
.
within
'.merge-request-tabs'
do
click_link
'Discussion'
find
(
'.notes-tab'
).
trigger
(
'click'
)
end
end
# Waits for load
# Waits for load
...
...
spec/features/merge_requests/diff_notes_resolve_spec.rb
View file @
c757000e
...
@@ -275,7 +275,7 @@ feature 'Diff notes resolve', feature: true, js: true do
...
@@ -275,7 +275,7 @@ feature 'Diff notes resolve', feature: true, js: true do
end
end
page
.
within
'.line-resolve-all-container'
do
page
.
within
'.line-resolve-all-container'
do
page
.
find
(
'.discussion-next-btn'
).
click
page
.
find
(
'.discussion-next-btn'
).
trigger
(
'click'
)
end
end
expect
(
page
.
evaluate_script
(
"$('body').scrollTop()"
)).
to
be
>
0
expect
(
page
.
evaluate_script
(
"$('body').scrollTop()"
)).
to
be
>
0
...
...
spec/features/search_spec.rb
View file @
c757000e
...
@@ -38,7 +38,7 @@ describe "Search", feature: true do
...
@@ -38,7 +38,7 @@ describe "Search", feature: true do
end
end
it
'filters by group projects after filtering by group'
do
it
'filters by group projects after filtering by group'
do
find
(
'.js-search-group-dropdown'
).
click
find
(
'.js-search-group-dropdown'
).
trigger
(
'click'
)
wait_for_ajax
wait_for_ajax
page
.
within
'.search-holder'
do
page
.
within
'.search-holder'
do
...
@@ -48,7 +48,7 @@ describe "Search", feature: true do
...
@@ -48,7 +48,7 @@ describe "Search", feature: true do
expect
(
find
(
'.js-search-group-dropdown'
)).
to
have_content
(
group
.
name
)
expect
(
find
(
'.js-search-group-dropdown'
)).
to
have_content
(
group
.
name
)
page
.
within
(
'.project-filter'
)
do
page
.
within
(
'.project-filter'
)
do
find
(
'.js-search-project-dropdown'
).
click
find
(
'.js-search-project-dropdown'
).
trigger
(
'click'
)
wait_for_ajax
wait_for_ajax
expect
(
page
).
to
have_link
(
group_project
.
name_with_namespace
)
expect
(
page
).
to
have_link
(
group_project
.
name_with_namespace
)
...
...
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