diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-07 20:55:22 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-12-07 20:55:22 +0000 |
| commit | 24ab860554f7801e5d69ce54289565cca810328d (patch) | |
| tree | 0547a134a4cbc6dc293f9fabde32f7d075b342af | |
| parent | 9d03bc6fa31f123e070bab4a58b67dbb008e75e9 (diff) | |
| parent | 74d73bd953c0a083cbf8aaf919a7034067542382 (diff) | |
| download | gitlab-ce-24ab860554f7801e5d69ce54289565cca810328d.tar.gz | |
Merge branch 'fix-random-failing-test' into 'master'
Fix random failing test
Make sure we wait till page reloads after request was merged. Otherwise
we get request running which fails next test
Improvement for !1897
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
See merge request !2004
| -rw-r--r-- | features/project/merge_requests/accept.feature | 6 | ||||
| -rw-r--r-- | features/steps/project/merge_requests/acceptance.rb | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/features/project/merge_requests/accept.feature b/features/project/merge_requests/accept.feature index 3e6e59a3808..9bc2b7c8eca 100644 --- a/features/project/merge_requests/accept.feature +++ b/features/project/merge_requests/accept.feature @@ -8,10 +8,12 @@ Feature: Project Merge Requests Acceptance Given I am on the Merge Request detail page When I click on "Remove source branch" option And I click on Accept Merge Request - Then I should not see the Remove Source Branch button + Then I should see merge request merged + And I should not see the Remove Source Branch button @javascript Scenario: Accepting the Merge Request without removing the source branch Given I am on the Merge Request detail page When I click on Accept Merge Request - Then I should see the Remove Source Branch button + Then I should see merge request merged + And I should see the Remove Source Branch button diff --git a/features/steps/project/merge_requests/acceptance.rb b/features/steps/project/merge_requests/acceptance.rb index 6adecaa8385..383c055c4ef 100644 --- a/features/steps/project/merge_requests/acceptance.rb +++ b/features/steps/project/merge_requests/acceptance.rb @@ -32,4 +32,8 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps step 'I am signed in as a developer of the project' do login_as(@user) end + + step 'I should see merge request merged' do + expect(page).to have_content('The changes were merged into') + end end |