diff options
author | Stan Hu <stanhu@gmail.com> | 2015-07-01 16:54:32 +0000 |
---|---|---|
committer | Stan Hu <stanhu@gmail.com> | 2015-07-01 16:54:32 +0000 |
commit | 0b4b0457580e9552ae18110305df874058a85baf (patch) | |
tree | e0750f1b6111fd9e155d49618a6f3a960ef637dd /features | |
parent | 459e6d346768d9d8fceaee00bf0870b8e7c4ed9a (diff) | |
parent | 357cd971999b43449d08ea39d0f703d223ba6d4c (diff) | |
download | gitlab-ce-0b4b0457580e9552ae18110305df874058a85baf.tar.gz |
Merge branch 'improve-spinach-test-for-mr-submit' into 'master'
Add an expect call to prevent random Spinach failure
This should help prevent getting the error:
```
Unable to find field "merge_request_title
```
This was happening probably because it takes some time after the "Compare branches" button is hit before the "New merge request" page showed up.
See merge request !882
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/project/forked_merge_requests.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/features/steps/project/forked_merge_requests.rb b/features/steps/project/forked_merge_requests.rb index 78812c52026..58c16d59d05 100644 --- a/features/steps/project/forked_merge_requests.rb +++ b/features/steps/project/forked_merge_requests.rb @@ -42,6 +42,7 @@ class Spinach::Features::ProjectForkedMergeRequests < Spinach::FeatureSteps click_button "Compare branches" + expect(page).to have_content "New merge request" fill_in "merge_request_title", with: "Merge Request On Forked Project" end |