Fix all cycle analytics specs.

A number of failures were introduced due to performance
improvements (like pre-calculating metrics).

1 files changed, 13 insertions, 1 deletions

diff --git a/spec/models/cycle_analytics/issue_spec.rb b/spec/models/cycle_analytics/issue_spec.rb
index 06715498d26..8d7d03193f0 100644
--- a/spec/models/cycle_analytics/issue_spec.rb
+++ b/spec/models/cycle_analytics/issue_spec.rb
@@ -3,13 +3,21 @@ require 'spec_helper'
 describe 'CycleAnalytics#issue', models: true do
   let(:project) { create(:project) }
   let(:from_date) { 10.days.ago }
+  let(:user) { create(:user, :admin) }
   subject { CycleAnalytics.new(project, from: from_date) }
 
   generate_cycle_analytics_spec(phase: :issue,
                                 data_fn: -> (context) { { issue: context.build(:issue, project: context.project) } },
                                 start_time_conditions: [["issue created", -> (context, data) { data[:issue].save }]],
                                 end_time_conditions:   [["issue associated with a milestone", -> (context, data) { data[:issue].update(milestone: context.create(:milestone, project: context.project)) if data[:issue].persisted? }],
-                                                        ["list label added to issue", -> (context, data) { data[:issue].update(label_ids: [context.create(:label, lists: [context.create(:list)]).id]) if data[:issue].persisted? }]])
+                                                        ["list label added to issue", -> (context, data) { data[:issue].update(label_ids: [context.create(:label, lists: [context.create(:list)]).id]) if data[:issue].persisted? }]],
+                                post_fn: -> (context, data) do
+                                  if data[:issue].persisted?
+                                    context.create_merge_request_closing_issue(data[:issue].reload)
+                                    context.merge_merge_requests_closing_issue(data[:issue])
+                                    context.deploy_master
+                                  end
+                                end)
 
   context "when a regular label (instead of a list label) is added to the issue" do
     it "returns nil" do
@@ -17,6 +25,10 @@ describe 'CycleAnalytics#issue', models: true do
         regular_label = create(:label)
         issue = create(:issue, project: project)
         issue.update(label_ids: [regular_label.id])
+
+        create_merge_request_closing_issue(issue)
+        merge_merge_requests_closing_issue(issue)
+        deploy_master
       end
 
       expect(subject.issue).to be_nil