diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-04-07 20:03:55 -0500 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-04-07 20:03:55 -0500 |
commit | f058b52b50c76de9557b167a1a31a5c9ba446f31 (patch) | |
tree | 047f04c2b0ed83ed71a6b39e64f55c40eded838b /features | |
parent | 130a1e86e215d5d43cd3c53a44589aa5b8c69aab (diff) | |
parent | 7d3f37b0b879af562dc7c499bdbfcb230ed718a4 (diff) | |
download | gitlab-ce-f058b52b50c76de9557b167a1a31a5c9ba446f31.tar.gz |
Merge branch 'master' into new-resolvable-discussion
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/project/merge_requests/acceptance.rb | 9 | ||||
-rw-r--r-- | features/steps/shared/project.rb | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/features/steps/project/merge_requests/acceptance.rb b/features/steps/project/merge_requests/acceptance.rb index bdc7a616ba9..d7167352e02 100644 --- a/features/steps/project/merge_requests/acceptance.rb +++ b/features/steps/project/merge_requests/acceptance.rb @@ -1,6 +1,7 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps include LoginHelpers include GitlabRoutingHelper + include WaitForAjax step 'I am on the Merge Request detail page' do visit merge_request_path(@merge_request) @@ -20,10 +21,18 @@ class Spinach::Features::ProjectMergeRequestsAcceptance < Spinach::FeatureSteps step 'I should see the Remove Source Branch button' do expect(page).to have_link('Remove source branch') + + # Wait for AJAX requests to complete so they don't blow up if they are + # only handled after `DatabaseCleaner` has already run + wait_for_ajax end step 'I should not see the Remove Source Branch button' do expect(page).not_to have_link('Remove source branch') + + # Wait for AJAX requests to complete so they don't blow up if they are + # only handled after `DatabaseCleaner` has already run + wait_for_ajax end step 'There is an open Merge Request' do diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb index 73206c3f30d..15625e045f5 100644 --- a/features/steps/shared/project.rb +++ b/features/steps/shared/project.rb @@ -97,7 +97,7 @@ module SharedProject step 'I should see project "Shop" activity feed' do project = Project.find_by(name: "Shop") - expect(page).to have_content "pushed new branch fix at #{project.name_with_namespace}" + expect(page).to have_content "#{@user.name} pushed new branch fix at #{project.name_with_namespace}" end step 'I should see project settings' do |