BigW Consortium Gitlab

Skip to content

G
gitlab-ce
Unverified Commit fa88f2c0 by Dmitriy Zaporozhets
Options

Use real branches from test repo

Signed-off-by: 's avatarDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
parent abd2bc00
Showing with 4 additions and 4 deletions
features/steps/dashboard/merge_requests.rb
......@@ -66,7 +66,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
def authored_merge_request
@authored_merge_request ||= create :merge_request,
source_branch: 'simple_merge_request',
source_branch: 'markdown',
author: current_user,
target_project: project,
source_project: project
......@@ -74,14 +74,14 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
def other_merge_request
@other_merge_request ||= create :merge_request,
source_branch: '2_3_notes_fix',
source_branch: 'fix',
target_project: project,
source_project: project
end
def authored_merge_request_from_fork
@authored_merge_request_from_fork ||= create :merge_request,
source_branch: 'basic_page',
source_branch: 'feature_conflict',
author: current_user,
target_project: public_project,
source_project: forked_project
......@@ -89,7 +89,7 @@ class Spinach::Features::DashboardMergeRequests < Spinach::FeatureSteps
def assigned_merge_request_from_fork
@assigned_merge_request_from_fork ||= create :merge_request,
source_branch: 'basic_page_fix',
source_branch: 'markdown',
assignee: current_user,
target_project: public_project,
source_project: forked_project
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment