From fbd09871ca7003242053fbca10d9c0e96e7a799d Mon Sep 17 00:00:00 2001 From: Bryce Johnson Date: Fri, 13 Jan 2017 16:54:16 -0500 Subject: Remove turbolinks. --- features/steps/project/merge_requests.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'features/steps/project') diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index d2fa8cd39af..480906929b2 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -501,6 +501,7 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'I fill in merge request search with "Fe"' do fill_in 'issuable_search', with: "Fe" + sleep 3 end step 'I click the "Target branch" dropdown' do -- cgit v1.2.3 From aa91f508369a795878b3ee95556302cdb55d9f6c Mon Sep 17 00:00:00 2001 From: Bryce Johnson Date: Thu, 2 Feb 2017 14:53:46 -0500 Subject: Find .merge-request instead of sleep in MR search spec. --- features/steps/project/merge_requests.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'features/steps/project') diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 480906929b2..9f0057cace7 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -501,7 +501,9 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps step 'I fill in merge request search with "Fe"' do fill_in 'issuable_search', with: "Fe" - sleep 3 + page.within '.merge-requests-holder' do + find('.merge-request') + end end step 'I click the "Target branch" dropdown' do -- cgit v1.2.3