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
87b81fa6
Commit
87b81fa6
authored
Mar 22, 2017
by
Valery Sizov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix random failing spec
parent
1338fdf4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
...es/merge_requests/merge_immediately_with_pipeline_spec.rb
+3
-1
No files found.
spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb
View file @
87b81fa6
...
@@ -32,9 +32,11 @@ feature 'Merge immediately', :feature, :js do
...
@@ -32,9 +32,11 @@ feature 'Merge immediately', :feature, :js do
page
.
within
'.mr-widget-body'
do
page
.
within
'.mr-widget-body'
do
find
(
'.dropdown-toggle'
).
click
find
(
'.dropdown-toggle'
).
click
Sidekiq
::
Testing
.
fake!
{
click_link
'Merge Immediately'
}
click_link
'Merge Immediately'
expect
(
find
(
'.js-merge-when-pipeline-succeeds-button'
)).
to
have_content
(
'Merge in progress'
)
expect
(
find
(
'.js-merge-when-pipeline-succeeds-button'
)).
to
have_content
(
'Merge in progress'
)
wait_for_ajax
end
end
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