From 41f79250b2fea336ae13e55a07ed96aa7d36a229 Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 7 Apr 2017 15:58:56 -0500 Subject: Wait for AJAX requests to complete so they don't blow up if they are only handled after DatabaseCleaner has already run --- features/steps/project/merge_requests/acceptance.rb | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'features') diff --git a/features/steps/project/merge_requests/acceptance.rb b/features/steps/project/merge_requests/acceptance.rb index bdc7a616ba9..6d9565df211 100644 --- a/features/steps/project/merge_requests/acceptance.rb +++ b/features/steps/project/merge_requests/acceptance.rb @@ -20,10 +20,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 -- cgit v1.2.1 From 667fa9afa29d60ec38dfb787ea207f2e44a38ee8 Mon Sep 17 00:00:00 2001 From: Annabel Dunstone Gray Date: Fri, 7 Apr 2017 09:35:11 -0500 Subject: Put back usernames in activity and profile feed --- features/steps/shared/project.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'features') 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 -- cgit v1.2.1 From ae65817b92edb396e95faccd3e4bd21b70b4f5df Mon Sep 17 00:00:00 2001 From: Douwe Maan Date: Fri, 7 Apr 2017 16:59:34 -0500 Subject: Actually include WaitForAjax! --- features/steps/project/merge_requests/acceptance.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'features') diff --git a/features/steps/project/merge_requests/acceptance.rb b/features/steps/project/merge_requests/acceptance.rb index 6d9565df211..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) -- cgit v1.2.1