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

Merge branch 'dz-fix-spinach-mr' into 'master'
5c9a54d6 · Dmitriy Zaporozhets · d00d3e28 · 77bbd985 · 5c9a54d6
Commit 5c9a54d6 authored Oct 17, 2016 by Dmitriy Zaporozhets
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

merge_requests.rb features/steps/project/merge_requests.rb +1 -0

No files found.
--- 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