diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-10-17 11:27:39 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2016-10-17 11:27:39 +0000 |
| commit | 5c9a54d65f87ab1f20b2e8836b33ccd25df85d1a (patch) | |
| tree | 14c4d41691bbf02a2c5ae55b1710dafe80207b1a /features/steps/project | |
| parent | d00d3e28716133c87ab2594b2c85dae29c2c0c50 (diff) | |
| parent | 77bbd9857fefde0d2a89acd23463732240585f23 (diff) | |
| download | gitlab-ce-5c9a54d65f87ab1f20b2e8836b33ccd25df85d1a.tar.gz | |
Merge branch 'dz-fix-spinach-mr' into 'master'
Fix randomly crashing spinach test for merge request
For https://gitlab.com/gitlab-org/gitlab-ce/issues/23378
See merge request !6932
Diffstat (limited to 'features/steps/project')
| -rw-r--r-- | features/steps/project/merge_requests.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index de065dffbc2..44346d99f44 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -512,6 +512,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'I should see new target branch changes' do expect(page).to have_content 'Request to merge fix into feature' expect(page).to have_content 'Target branch changed from merge-test to feature' + wait_for_ajax end step 'I click on "Email Patches"' do |