From b583bb5fcbb0ea609c0895f95ebdb45bb4f2eea0 Mon Sep 17 00:00:00 2001 From: Dmitriy Zaporozhets Date: Mon, 17 Aug 2015 14:55:46 +0200 Subject: [PATCH] Make sure mr approve tests have satellite Signed-off-by: Dmitriy Zaporozhets --- features/project/merge_requests.feature | 3 ++- features/steps/project/merge_requests.rb | 4 ++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/features/project/merge_requests.feature b/features/project/merge_requests.feature index c9f2255727..b132d305a4 100644 --- a/features/project/merge_requests.feature +++ b/features/project/merge_requests.feature @@ -2,6 +2,7 @@ Feature: Project Merge Requests Background: Given I sign in as a user And I own project "Shop" + And project has satellites And project "Shop" have "Bug NS-04" open merge request And project "Shop" have "Feature NS-03" closed merge request And I visit project "Shop" merge requests page @@ -269,7 +270,7 @@ Feature: Project Merge Requests And I select "fix" as source Then I see auto-suggested approver And I can add it to approver list - + Scenario: I should see rebase checkbox Given project "Shop" have "Bug NS-05" open merge request with diffs inside diff --git a/features/steps/project/merge_requests.rb b/features/steps/project/merge_requests.rb index 3d58c3e881..b3f3a7934a 100644 --- a/features/steps/project/merge_requests.rb +++ b/features/steps/project/merge_requests.rb @@ -8,6 +8,10 @@ class Spinach::Features::ProjectMergeRequests < Spinach::FeatureSteps include SharedDiffNote include SharedUser + step 'project has satellites' do + project.ensure_satellite_exists + end + step 'I click link "New Merge Request"' do click_link "New Merge Request" end