diff options
author | Douwe Maan <douwe@gitlab.com> | 2018-03-01 17:40:24 +0000 |
---|---|---|
committer | Douwe Maan <douwe@gitlab.com> | 2018-03-01 17:40:24 +0000 |
commit | 008120f8db90dcf65fdd00343a4d8a22695abed1 (patch) | |
tree | 274e896be3f9b4b33fd922c4860668becbf74a93 /spec/requests/projects/cycle_analytics_events_spec.rb | |
parent | ccb080d94aa765d8391f262e25c5ead0764dc2ff (diff) | |
parent | 522f4b2c6a0a1fe1e93d7bc2f9fe5290fccba4f9 (diff) | |
download | gitlab-ce-008120f8db90dcf65fdd00343a4d8a22695abed1.tar.gz |
Merge branch '41777-include-cycle-time-in-usage-ping' into 'master'
Resolve "Include cycle time in usage ping"
Closes #41777
See merge request gitlab-org/gitlab-ce!16793
Diffstat (limited to 'spec/requests/projects/cycle_analytics_events_spec.rb')
-rw-r--r-- | spec/requests/projects/cycle_analytics_events_spec.rb | 6 |
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 |