1 files changed, 35 insertions, 3 deletions
diff --git a/spec/support/helpers/cycle_analytics_helpers.rb b/spec/support/helpers/cycle_analytics_helpers.rb
index 9e62eef14de..5510284b30d 100644
--- a/spec/support/helpers/cycle_analytics_helpers.rb
+++ b/spec/support/helpers/cycle_analytics_helpers.rb
@@ -3,6 +3,38 @@
 module CycleAnalyticsHelpers
   include GitHelpers
 
+  def toggle_value_stream_dropdown
+    page.find('[data-testid="dropdown-value-streams"]').click
+  end
+
+  def add_custom_stage_to_form
+    page.find_button(s_('CreateValueStreamForm|Add another stage')).click
+
+    index = page.all('[data-testid="value-stream-stage-fields"]').length
+    last_stage = page.all('[data-testid="value-stream-stage-fields"]').last
+
+    within last_stage do
+      find('[name*="custom-stage-name-"]').fill_in with: "Cool custom stage - name #{index}"
+      select_dropdown_option_by_value "custom-stage-start-event-", :merge_request_created
+      select_dropdown_option_by_value "custom-stage-end-event-", :merge_request_merged
+    end
+  end
+
+  def save_value_stream(custom_value_stream_name)
+    fill_in 'create-value-stream-name', with: custom_value_stream_name
+
+    page.find_button(s_('CreateValueStreamForm|Create Value Stream')).click
+    wait_for_requests
+  end
+
+  def create_custom_value_stream(custom_value_stream_name)
+    toggle_value_stream_dropdown
+    page.find_button(_('Create new Value Stream')).click
+
+    add_custom_stage_to_form
+    save_value_stream(custom_value_stream_name)
+  end
+
   def wait_for_stages_to_load(selector = '.js-path-navigation')
     expect(page).to have_selector selector
     wait_for_requests
@@ -93,17 +125,17 @@ module CycleAnalyticsHelpers
       target_branch: 'master'
     }
 
-    mr = MergeRequests::CreateService.new(project, user, opts).execute
+    mr = MergeRequests::CreateService.new(project: project, current_user: user, params: opts).execute
     NewMergeRequestWorker.new.perform(mr, user)
     mr
   end
 
   def merge_merge_requests_closing_issue(user, project, issue)
     merge_requests = Issues::ReferencedMergeRequestsService
-                       .new(project, user)
+                       .new(project: project, current_user: user)
                        .closed_by_merge_requests(issue)
 
-    merge_requests.each { |merge_request| MergeRequests::MergeService.new(project, user, sha: merge_request.diff_head_sha).execute(merge_request) }
+    merge_requests.each { |merge_request| MergeRequests::MergeService.new(project: project, current_user: user, params: { sha: merge_request.diff_head_sha }).execute(merge_request) }
   end
 
   def deploy_master(user, project, environment: 'production')