diff options
Diffstat (limited to 'qa/qa/resource/merge_request.rb')
| -rw-r--r-- | qa/qa/resource/merge_request.rb | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/qa/qa/resource/merge_request.rb b/qa/qa/resource/merge_request.rb index 685cccea02d..0a92553690f 100644 --- a/qa/qa/resource/merge_request.rb +++ b/qa/qa/resource/merge_request.rb @@ -78,12 +78,12 @@ module QA end def fabricate! - return fabricate_large_merge_request if Runtime::Scenario.large_setup? + return fabricate_large_merge_request if large_setup? populate_target_and_source_if_required project.visit! - Page::Project::Show.perform(&:new_merge_request) + Flow::MergeRequest.create_new(source_branch: source_branch) Page::MergeRequest::New.perform do |new_page| new_page.fill_title(@title) new_page.choose_template(@template) if @template @@ -100,7 +100,7 @@ module QA end def fabricate_via_api! - return fabricate_large_merge_request if Runtime::Scenario.large_setup? + return fabricate_large_merge_request if large_setup? resource_web_url(api_get) rescue ResourceNotFoundError, NoValueError # rescue if iid not populated @@ -208,6 +208,12 @@ module QA private + def large_setup? + Runtime::Scenario.large_setup? + rescue ArgumentError + false + end + def transform_api_resource(api_resource) raise ResourceNotFoundError if api_resource.blank? |