summaryrefslogtreecommitdiff
path: root/features/steps
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-17 13:59:59 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2016-10-17 13:59:59 +0300
commit77bbd9857fefde0d2a89acd23463732240585f23 (patch)
treec0afa6df64961442ac54df87c7896ac58db75b85 /features/steps
parent8a5d3ce15d071491cc2177a4f317dc82c02e0d1d (diff)
downloadgitlab-ce-77bbd9857fefde0d2a89acd23463732240585f23.tar.gz
Fix randomly crashing spinach test for merge request
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'features/steps')
-rw-r--r--features/steps/project/merge_requests.rb1
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