Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-05-08 15:54:23 +0300
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>2017-05-08 15:54:23 +0300
commit11ff9fc6a9837cd5defa0325b5057a5a3d84634c (patch)
tree0eb9d8123e50afd8ed4ddd0fef2c82d2cbf446fd /spec/features/cycle_analytics_spec.rb
parent1d0aa4806fb3d7a793e7bc4eac50032a8e3c53d7 (diff)
parent29519edb55f17d0e7de5dfb289085c894b4d2826 (diff)
Merge branch '28359-skip-process-commit-worker-unless-issues-referenced' into 'master'
Use regex to skip unnecessary reference processing in ProcessCommitWorker Closes #28359 See merge request !10867
Diffstat (limited to 'spec/features/cycle_analytics_spec.rb')
-rw-r--r--spec/features/cycle_analytics_spec.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/spec/features/cycle_analytics_spec.rb b/spec/features/cycle_analytics_spec.rb
index 7c9d522273b..df2714f91ff 100644
--- a/spec/features/cycle_analytics_spec.rb
+++ b/spec/features/cycle_analytics_spec.rb
@@ -6,7 +6,7 @@ feature 'Cycle Analytics', feature: true, js: true do
let(:project) { create(:project, :repository) }
let(:issue) { create(:issue, project: project, created_at: 2.days.ago) }
let(:milestone) { create(:milestone, project: project) }
- let(:mr) { create_merge_request_closing_issue(issue) }
+ let(:mr) { create_merge_request_closing_issue(issue, commit_message: "References #{issue.to_reference}") }
let(:pipeline) { create(:ci_empty_pipeline, status: 'created', project: project, ref: mr.source_branch, sha: mr.source_branch_sha) }
context 'as an allowed user' do
@@ -32,7 +32,6 @@ feature 'Cycle Analytics', feature: true, js: true do
before do
project.team << [user, :master]
- allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([issue])
create_cycle
deploy_master