summaryrefslogtreecommitdiff
path: root/spec/requests/projects
diff options
context:
space:
mode:
authorTiago Botelho <tiagonbotelho@hotmail.com>2018-02-21 12:13:56 +0000
committerTiago Botelho <tiagonbotelho@hotmail.com>2018-03-01 16:43:26 +0000
commit522f4b2c6a0a1fe1e93d7bc2f9fe5290fccba4f9 (patch)
tree3ab5d0d19952c97c19a713df29d0c2de0feb010e /spec/requests/projects
parent335ee79a73fafdf00fac6e8ffc286ce4bad273ff (diff)
downloadgitlab-ce-522f4b2c6a0a1fe1e93d7bc2f9fe5290fccba4f9.tar.gz
Adapt cycle analytics spec helper and cycle analytics usage data spec41777-include-cycle-time-in-usage-ping
Diffstat (limited to 'spec/requests/projects')
-rw-r--r--spec/requests/projects/cycle_analytics_events_spec.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/spec/requests/projects/cycle_analytics_events_spec.rb b/spec/requests/projects/cycle_analytics_events_spec.rb
index 98f70e2101b..eef860821e5 100644
--- a/spec/requests/projects/cycle_analytics_events_spec.rb
+++ b/spec/requests/projects/cycle_analytics_events_spec.rb
@@ -15,7 +15,7 @@ describe 'cycle analytics events' do
end
end
- deploy_master
+ deploy_master(user, project)
login_as(user)
end
@@ -119,7 +119,7 @@ describe 'cycle analytics events' do
def create_cycle
milestone = create(:milestone, project: project)
issue.update(milestone: milestone)
- mr = create_merge_request_closing_issue(issue, commit_message: "References #{issue.to_reference}")
+ mr = create_merge_request_closing_issue(user, project, issue, commit_message: "References #{issue.to_reference}")
pipeline = create(:ci_empty_pipeline, status: 'created', project: project, ref: mr.source_branch, sha: mr.source_branch_sha, head_pipeline_of: mr)
pipeline.run
@@ -127,7 +127,7 @@ describe 'cycle analytics events' do
create(:ci_build, pipeline: pipeline, status: :success, author: user)
create(:ci_build, pipeline: pipeline, status: :success, author: user)
- merge_merge_requests_closing_issue(issue)
+ merge_merge_requests_closing_issue(user, project, issue)
ProcessCommitWorker.new.perform(project.id, user.id, mr.commits.last.to_hash)
end