diff options
| author | James Edwards-Jones <jamedjo@gmail.com> | 2017-02-06 18:12:27 +0300 |
|---|---|---|
| committer | James Edwards-Jones <jamedjo@gmail.com> | 2017-02-06 18:12:27 +0300 |
| commit | b988faaf85c8e68d501f242b980e5e79a00e2b15 (patch) | |
| tree | faffbfe623bfcbfe1c09bddac00b2cc879baff63 /features | |
| parent | 5af4cae544c8526de63e639bd6c7db730526add3 (diff) | |
| parent | 53db7d1d75e1d14cb20278bd0c1a75ce24a6626d (diff) | |
Merge branch 'master' into 'jej-pages-to-ce'
# Conflicts:
# db/schema.rb
Diffstat (limited to 'features')
| -rw-r--r-- | features/steps/project/merge_requests.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index d2fa8cd39af..9f0057cace7 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -501,6 +501,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'I fill in merge request search with "Fe"' do fill_in 'issuable_search', with: "Fe" + page.within '.merge-requests-holder' do + find('.merge-request') + end end step 'I click the "Target branch" dropdown' do |