diff options
| author | Rémy Coutable <remy@rymai.me> | 2017-03-22 17:04:37 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2017-03-22 17:04:37 +0000 |
| commit | d70f9c85631ec16523528eabf6f470619bf7969a (patch) | |
| tree | 4cc011334e1df9260f83aed7058b073360d0774a /spec/features | |
| parent | c62314ab6419f2f61b1acb5287de51cf2d459791 (diff) | |
| parent | cf3b0ca4d9525f43d276c55a77ed86a09304bcd4 (diff) | |
| download | gitlab-ce-d70f9c85631ec16523528eabf6f470619bf7969a.tar.gz | |
Merge branch 'fix_some_random_failures' into 'master'
Fix some random failures
See merge request !10142
Diffstat (limited to 'spec/features')
| -rw-r--r-- | spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb index 0ceaf7bc830..79105b1ee46 100644 --- a/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb +++ b/spec/features/merge_requests/merge_immediately_with_pipeline_spec.rb @@ -35,6 +35,8 @@ feature 'Merge immediately', :feature, :js do click_link 'Merge Immediately' expect(find('.js-merge-when-pipeline-succeeds-button')).to have_content('Merge in progress') + + wait_for_ajax end end end |