Merge branch 'rs-why-five-times-surely-twice-is-enough' into 'master'

Reduce the number of loops that Cycle Analytics specs use

See merge request !8871

spec/models/cycle_analytics/code_spec.rb

@@ -27,7 +27,6 @@ describe 'CycleAnalytics#code', feature: true do
 
     context "when a regular merge request (that doesn't close the issue) is created" do
       it "returns nil" do
-        5.times do
         issue = create(:issue, project: project)
 
         create_commit_referencing_issue(issue)
@@ -35,7 +34,6 @@ describe 'CycleAnalytics#code', feature: true do
 
         merge_merge_requests_closing_issue(issue)
         deploy_master
-        end
 
         expect(subject[:code].median).to be_nil
       end
@@ -60,14 +58,12 @@ describe 'CycleAnalytics#code', feature: true do
 
     context "when a regular merge request (that doesn't close the issue) is created" do
       it "returns nil" do
-        5.times do
         issue = create(:issue, project: project)
 
         create_commit_referencing_issue(issue)
         create_merge_request_closing_issue(issue, message: "Closes nothing")
 
         merge_merge_requests_closing_issue(issue)
-        end
 
         expect(subject[:code].median).to be_nil
       end

spec/models/cycle_analytics/issue_spec.rb

@@ -33,14 +33,12 @@ describe 'CycleAnalytics#issue', models: true do
 
   context "when a regular label (instead of a list label) is added to the issue" do
     it "returns nil" do
-      5.times 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)
-      end
 
       expect(subject[:issue].median).to be_nil
     end

spec/models/cycle_analytics/production_spec.rb

@@ -29,11 +29,9 @@ describe 'CycleAnalytics#production', feature: true do
 
   context "when a regular merge request (that doesn't close the issue) is merged and deployed" do
     it "returns nil" do
-      5.times do
       merge_request = create(:merge_request)
       MergeRequests::MergeService.new(project, user).execute(merge_request)
       deploy_master
-      end
 
       expect(subject[:production].median).to be_nil
     end
@@ -41,12 +39,10 @@ describe 'CycleAnalytics#production', feature: true do
 
   context "when the deployment happens to a non-production environment" do
     it "returns nil" do
-      5.times do
       issue = create(:issue, project: project)
       merge_request = create_merge_request_closing_issue(issue)
       MergeRequests::MergeService.new(project, user).execute(merge_request)
       deploy_master(environment: 'staging')
-      end
 
       expect(subject[:production].median).to be_nil
     end

spec/models/cycle_analytics/review_spec.rb

@@ -23,9 +23,7 @@ describe 'CycleAnalytics#review', feature: true do
 
   context "when a regular merge request (that doesn't close the issue) is created and merged" do
     it "returns nil" do
-      5.times do
       MergeRequests::MergeService.new(project, user).execute(create(:merge_request))
-      end
 
       expect(subject[:review].median).to be_nil
     end

spec/models/cycle_analytics/staging_spec.rb

@@ -40,11 +40,9 @@ describe 'CycleAnalytics#staging', feature: true do
 
   context "when a regular merge request (that doesn't close the issue) is merged and deployed" do
     it "returns nil" do
-      5.times do
       merge_request = create(:merge_request)
       MergeRequests::MergeService.new(project, user).execute(merge_request)
       deploy_master
-      end
 
       expect(subject[:staging].median).to be_nil
     end
@@ -52,12 +50,10 @@ describe 'CycleAnalytics#staging', feature: true do
 
   context "when the deployment happens to a non-production environment" do
     it "returns nil" do
-      5.times do
       issue = create(:issue, project: project)
       merge_request = create_merge_request_closing_issue(issue)
       MergeRequests::MergeService.new(project, user).execute(merge_request)
       deploy_master(environment: 'staging')
-      end
 
       expect(subject[:staging].median).to be_nil
     end

spec/models/cycle_analytics/test_spec.rb

@@ -24,7 +24,6 @@ describe 'CycleAnalytics#test', feature: true do
 
   context "when the pipeline is for a regular merge request (that doesn't close an issue)" do
     it "returns nil" do
-      5.times do
       issue = create(:issue, project: project)
       merge_request = create_merge_request_closing_issue(issue)
       pipeline = create(:ci_pipeline, ref: "refs/heads/#{merge_request.source_branch}", sha: merge_request.diff_head_sha)
@@ -33,7 +32,6 @@ describe 'CycleAnalytics#test', feature: true do
       pipeline.succeed!
 
       merge_merge_requests_closing_issue(issue)
-      end
 
       expect(subject[:test].median).to be_nil
     end
@@ -41,12 +39,10 @@ describe 'CycleAnalytics#test', feature: true do
 
   context "when the pipeline is not for a merge request" do
     it "returns nil" do
-      5.times do
       pipeline = create(:ci_pipeline, ref: "refs/heads/master", sha: project.repository.commit('master').sha)
 
       pipeline.run!
       pipeline.succeed!
-      end
 
       expect(subject[:test].median).to be_nil
     end
@@ -54,7 +50,6 @@ describe 'CycleAnalytics#test', feature: true do
 
   context "when the pipeline is dropped (failed)" do
     it "returns nil" do
-      5.times do
       issue = create(:issue, project: project)
       merge_request = create_merge_request_closing_issue(issue)
       pipeline = create(:ci_pipeline, ref: "refs/heads/#{merge_request.source_branch}", sha: merge_request.diff_head_sha)
@@ -63,7 +58,6 @@ describe 'CycleAnalytics#test', feature: true do
       pipeline.drop!
 
       merge_merge_requests_closing_issue(issue)
-      end
 
       expect(subject[:test].median).to be_nil
     end
@@ -71,7 +65,6 @@ describe 'CycleAnalytics#test', feature: true do
 
   context "when the pipeline is cancelled" do
     it "returns nil" do
-      5.times do
       issue = create(:issue, project: project)
       merge_request = create_merge_request_closing_issue(issue)
       pipeline = create(:ci_pipeline, ref: "refs/heads/#{merge_request.source_branch}", sha: merge_request.diff_head_sha)
@@ -80,7 +73,6 @@ describe 'CycleAnalytics#test', feature: true do
       pipeline.cancel!
 
       merge_merge_requests_closing_issue(issue)
-      end
 
       expect(subject[:test].median).to be_nil
     end

spec/support/cycle_analytics_helpers/test_generation.rb

@@ -63,7 +63,6 @@ module CycleAnalyticsHelpers
                 # test case.
                 allow(self).to receive(:project) { other_project }
 
-                5.times do
                 data = data_fn[self]
                 start_time = Time.now
                 end_time = rand(1..10).days.from_now
@@ -77,7 +76,6 @@ module CycleAnalyticsHelpers
                 end
 
                 Timecop.freeze(end_time + 1.day) { post_fn[self, data] } if post_fn
-                end
 
                 # Turn off the stub before checking assertions
                 allow(self).to receive(:project).and_call_original
@@ -114,7 +112,6 @@ module CycleAnalyticsHelpers
         context "start condition NOT PRESENT: #{start_time_conditions.map(&:first).to_sentence}" do
           context "end condition: #{end_time_conditions.map(&:first).to_sentence}" do
             it "returns nil" do
-              5.times do
               data = data_fn[self]
               end_time = rand(1..10).days.from_now
 
@@ -123,7 +120,6 @@ module CycleAnalyticsHelpers
               end
 
               Timecop.freeze(end_time + 1.day) { post_fn[self, data] } if post_fn
-              end
 
               expect(subject[phase].median).to be_nil
             end
@@ -133,7 +129,6 @@ module CycleAnalyticsHelpers
         context "start condition: #{start_time_conditions.map(&:first).to_sentence}" do
           context "end condition NOT PRESENT: #{end_time_conditions.map(&:first).to_sentence}" do
             it "returns nil" do
-              5.times do
               data = data_fn[self]
               start_time = Time.now
 
@@ -142,7 +137,6 @@ module CycleAnalyticsHelpers
               end
 
               post_fn[self, data] if post_fn
-              end
 
               expect(subject[phase].median).to be_nil
             end