Fix other spec failures

9 files changed, 96 insertions, 63 deletions

diff --git a/spec/lib/gitlab/cycle_analytics/code_event_spec.rb b/spec/lib/gitlab/cycle_analytics/code_event_spec.rb
index 43f42d1bde8..0673906e678 100644
--- a/spec/lib/gitlab/cycle_analytics/code_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/code_event_spec.rb
@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'lib/gitlab/cycle_analytics/shared_event_spec'
 
 describe Gitlab::CycleAnalytics::CodeEvent do
+  let(:stage_name) { :code }
+
   it_behaves_like 'default query config' do
     it 'does not have the default order' do
       expect(event.order).not_to eq(event.start_time_attrs)
diff --git a/spec/lib/gitlab/cycle_analytics/events_spec.rb b/spec/lib/gitlab/cycle_analytics/events_spec.rb
index 6062e7af4f5..1258f4ed450 100644
--- a/spec/lib/gitlab/cycle_analytics/events_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/events_spec.rb
@@ -1,12 +1,14 @@
 require 'spec_helper'
 
-describe Gitlab::CycleAnalytics::Events do
+describe 'cycle analytics events' do
   let(:project) { create(:project) }
   let(:from_date) { 10.days.ago }
   let(:user) { create(:user, :admin) }
   let!(:context) { create(:issue, project: project, created_at: 2.days.ago) }
 
-  subject { described_class.new(project: project, options: { from: from_date, current_user: user }) }
+  let(:events) do
+    CycleAnalytics.new(project, options: { from: from_date, current_user: user }).events_for(stage)
+  end
 
   before do
     allow_any_instance_of(Gitlab::ReferenceExtractor).to receive(:issues).and_return([context])
@@ -15,104 +17,112 @@ describe Gitlab::CycleAnalytics::Events do
   end
 
   describe '#issue_events' do
+    let(:stage) { :issue }
+
     it 'has the total time' do
-      expect(subject.issue_events.first[:total_time]).not_to be_empty
+      expect(events.first[:total_time]).not_to be_empty
     end
 
     it 'has a title' do
-      expect(subject.issue_events.first[:title]).to eq(context.title)
+      expect(events.first[:title]).to eq(context.title)
     end
 
     it 'has the URL' do
-      expect(subject.issue_events.first[:url]).not_to be_nil
+      expect(events.first[:url]).not_to be_nil
     end
 
     it 'has an iid' do
-      expect(subject.issue_events.first[:iid]).to eq(context.iid.to_s)
+      expect(events.first[:iid]).to eq(context.iid.to_s)
     end
 
     it 'has a created_at timestamp' do
-      expect(subject.issue_events.first[:created_at]).to end_with('ago')
+      expect(events.first[:created_at]).to end_with('ago')
     end
 
     it "has the author's URL" do
-      expect(subject.issue_events.first[:author][:web_url]).not_to be_nil
+      expect(events.first[:author][:web_url]).not_to be_nil
     end
 
     it "has the author's avatar URL" do
-      expect(subject.issue_events.first[:author][:avatar_url]).not_to be_nil
+      expect(events.first[:author][:avatar_url]).not_to be_nil
     end
 
     it "has the author's name" do
-      expect(subject.issue_events.first[:author][:name]).to eq(context.author.name)
+      expect(events.first[:author][:name]).to eq(context.author.name)
     end
   end
 
   describe '#plan_events' do
+    let(:stage) { :plan }
+
     it 'has a title' do
-      expect(subject.plan_events.first[:title]).not_to be_nil
+      expect(events.first[:title]).not_to be_nil
     end
 
     it 'has a sha short ID' do
-      expect(subject.plan_events.first[:short_sha]).not_to be_nil
+      expect(events.first[:short_sha]).not_to be_nil
     end
 
     it 'has the URL' do
-      expect(subject.plan_events.first[:commit_url]).not_to be_nil
+      expect(events.first[:commit_url]).not_to be_nil
     end
 
     it 'has the total time' do
-      expect(subject.plan_events.first[:total_time]).not_to be_empty
+      expect(events.first[:total_time]).not_to be_empty
     end
 
     it "has the author's URL" do
-      expect(subject.plan_events.first[:author][:web_url]).not_to be_nil
+      expect(events.first[:author][:web_url]).not_to be_nil
     end
 
     it "has the author's avatar URL" do
-      expect(subject.plan_events.first[:author][:avatar_url]).not_to be_nil
+      expect(events.first[:author][:avatar_url]).not_to be_nil
     end
 
     it "has the author's name" do
-      expect(subject.plan_events.first[:author][:name]).not_to be_nil
+      expect(events.first[:author][:name]).not_to be_nil
     end
   end
 
   describe '#code_events' do
+    let(:stage) { :code }
+
     before do
       create_commit_referencing_issue(context)
     end
 
     it 'has the total time' do
-      expect(subject.code_events.first[:total_time]).not_to be_empty
+      expect(events.first[:total_time]).not_to be_empty
     end
 
     it 'has a title' do
-      expect(subject.code_events.first[:title]).to eq('Awesome merge_request')
+      expect(events.first[:title]).to eq('Awesome merge_request')
     end
 
     it 'has an iid' do
-      expect(subject.code_events.first[:iid]).to eq(context.iid.to_s)
+      expect(events.first[:iid]).to eq(context.iid.to_s)
     end
 
     it 'has a created_at timestamp' do
-      expect(subject.code_events.first[:created_at]).to end_with('ago')
+      expect(events.first[:created_at]).to end_with('ago')
     end
 
     it "has the author's URL" do
-      expect(subject.code_events.first[:author][:web_url]).not_to be_nil
+      expect(events.first[:author][:web_url]).not_to be_nil
     end
 
     it "has the author's avatar URL" do
-      expect(subject.code_events.first[:author][:avatar_url]).not_to be_nil
+      expect(events.first[:author][:avatar_url]).not_to be_nil
     end
 
     it "has the author's name" do
-      expect(subject.code_events.first[:author][:name]).to eq(MergeRequest.first.author.name)
+      expect(events.first[:author][:name]).to eq(MergeRequest.first.author.name)
     end
   end
 
   describe '#test_events' do
+    let(:stage) { :test }
+
     let(:merge_request) { MergeRequest.first }
     let!(:pipeline) do
       create(:ci_pipeline,
@@ -130,83 +140,85 @@ describe Gitlab::CycleAnalytics::Events do
     end
 
     it 'has the name' do
-      expect(subject.test_events.first[:name]).not_to be_nil
+      expect(events.first[:name]).not_to be_nil
     end
 
     it 'has the ID' do
-      expect(subject.test_events.first[:id]).not_to be_nil
+      expect(events.first[:id]).not_to be_nil
     end
 
     it 'has the URL' do
-      expect(subject.test_events.first[:url]).not_to be_nil
+      expect(events.first[:url]).not_to be_nil
     end
 
     it 'has the branch name' do
-      expect(subject.test_events.first[:branch]).not_to be_nil
+      expect(events.first[:branch]).not_to be_nil
     end
 
     it 'has the branch URL' do
-      expect(subject.test_events.first[:branch][:url]).not_to be_nil
+      expect(events.first[:branch][:url]).not_to be_nil
     end
 
     it 'has the short SHA' do
-      expect(subject.test_events.first[:short_sha]).not_to be_nil
+      expect(events.first[:short_sha]).not_to be_nil
     end
 
     it 'has the commit URL' do
-      expect(subject.test_events.first[:commit_url]).not_to be_nil
+      expect(events.first[:commit_url]).not_to be_nil
     end
 
     it 'has the date' do
-      expect(subject.test_events.first[:date]).not_to be_nil
+      expect(events.first[:date]).not_to be_nil
     end
 
     it 'has the total time' do
-      expect(subject.test_events.first[:total_time]).not_to be_empty
+      expect(events.first[:total_time]).not_to be_empty
     end
   end
 
   describe '#review_events' do
+    let(:stage) { :review }
     let!(:context) { create(:issue, project: project, created_at: 2.days.ago) }
 
     it 'has the total time' do
-      expect(subject.review_events.first[:total_time]).not_to be_empty
+      expect(events.first[:total_time]).not_to be_empty
     end
 
     it 'has a title' do
-      expect(subject.review_events.first[:title]).to eq('Awesome merge_request')
+      expect(events.first[:title]).to eq('Awesome merge_request')
     end
 
     it 'has an iid' do
-      expect(subject.review_events.first[:iid]).to eq(context.iid.to_s)
+      expect(events.first[:iid]).to eq(context.iid.to_s)
     end
 
     it 'has the URL' do
-      expect(subject.review_events.first[:url]).not_to be_nil
+      expect(events.first[:url]).not_to be_nil
     end
 
     it 'has a state' do
-      expect(subject.review_events.first[:state]).not_to be_nil
+      expect(events.first[:state]).not_to be_nil
     end
 
     it 'has a created_at timestamp' do
-      expect(subject.review_events.first[:created_at]).not_to be_nil
+      expect(events.first[:created_at]).not_to be_nil
     end
 
     it "has the author's URL" do
-      expect(subject.review_events.first[:author][:web_url]).not_to be_nil
+      expect(events.first[:author][:web_url]).not_to be_nil
     end
 
     it "has the author's avatar URL" do
-      expect(subject.review_events.first[:author][:avatar_url]).not_to be_nil
+      expect(events.first[:author][:avatar_url]).not_to be_nil
     end
 
     it "has the author's name" do
-      expect(subject.review_events.first[:author][:name]).to eq(MergeRequest.first.author.name)
+      expect(events.first[:author][:name]).to eq(MergeRequest.first.author.name)
     end
   end
 
   describe '#staging_events' do
+    let(:stage) { :staging }
     let(:merge_request) { MergeRequest.first }
     let!(:pipeline) do
       create(:ci_pipeline,
@@ -227,55 +239,56 @@ describe Gitlab::CycleAnalytics::Events do
     end
 
     it 'has the name' do
-      expect(subject.staging_events.first[:name]).not_to be_nil
+      expect(events.first[:name]).not_to be_nil
     end
 
     it 'has the ID' do
-      expect(subject.staging_events.first[:id]).not_to be_nil
+      expect(events.first[:id]).not_to be_nil
     end
 
     it 'has the URL' do
-      expect(subject.staging_events.first[:url]).not_to be_nil
+      expect(events.first[:url]).not_to be_nil
     end
 
     it 'has the branch name' do
-      expect(subject.staging_events.first[:branch]).not_to be_nil
+      expect(events.first[:branch]).not_to be_nil
     end
 
     it 'has the branch URL' do
-      expect(subject.staging_events.first[:branch][:url]).not_to be_nil
+      expect(events.first[:branch][:url]).not_to be_nil
     end
 
     it 'has the short SHA' do
-      expect(subject.staging_events.first[:short_sha]).not_to be_nil
+      expect(events.first[:short_sha]).not_to be_nil
     end
 
     it 'has the commit URL' do
-      expect(subject.staging_events.first[:commit_url]).not_to be_nil
+      expect(events.first[:commit_url]).not_to be_nil
     end
 
     it 'has the date' do
-      expect(subject.staging_events.first[:date]).not_to be_nil
+      expect(events.first[:date]).not_to be_nil
     end
 
     it 'has the total time' do
-      expect(subject.staging_events.first[:total_time]).not_to be_empty
+      expect(events.first[:total_time]).not_to be_empty
     end
 
     it "has the author's URL" do
-      expect(subject.staging_events.first[:author][:web_url]).not_to be_nil
+      expect(events.first[:author][:web_url]).not_to be_nil
     end
 
     it "has the author's avatar URL" do
-      expect(subject.staging_events.first[:author][:avatar_url]).not_to be_nil
+      expect(events.first[:author][:avatar_url]).not_to be_nil
     end
 
     it "has the author's name" do
-      expect(subject.staging_events.first[:author][:name]).to eq(MergeRequest.first.author.name)
+      expect(events.first[:author][:name]).to eq(MergeRequest.first.author.name)
     end
   end
 
   describe '#production_events' do
+    let(:stage) { :production }
     let!(:context) { create(:issue, project: project, created_at: 2.days.ago) }
 
     before do
@@ -284,35 +297,35 @@ describe Gitlab::CycleAnalytics::Events do
     end
 
     it 'has the total time' do
-      expect(subject.production_events.first[:total_time]).not_to be_empty
+      expect(events.first[:total_time]).not_to be_empty
     end
 
     it 'has a title' do
-      expect(subject.production_events.first[:title]).to eq(context.title)
+      expect(events.first[:title]).to eq(context.title)
     end
 
     it 'has the URL' do
-      expect(subject.production_events.first[:url]).not_to be_nil
+      expect(events.first[:url]).not_to be_nil
     end
 
     it 'has an iid' do
-      expect(subject.production_events.first[:iid]).to eq(context.iid.to_s)
+      expect(events.first[:iid]).to eq(context.iid.to_s)
     end
 
     it 'has a created_at timestamp' do
-      expect(subject.production_events.first[:created_at]).to end_with('ago')
+      expect(events.first[:created_at]).to end_with('ago')
     end
 
     it "has the author's URL" do
-      expect(subject.production_events.first[:author][:web_url]).not_to be_nil
+      expect(events.first[:author][:web_url]).not_to be_nil
     end
 
     it "has the author's avatar URL" do
-      expect(subject.production_events.first[:author][:avatar_url]).not_to be_nil
+      expect(events.first[:author][:avatar_url]).not_to be_nil
     end
 
     it "has the author's name" do
-      expect(subject.production_events.first[:author][:name]).to eq(context.author.name)
+      expect(events.first[:author][:name]).to eq(context.author.name)
     end
   end
 
diff --git a/spec/lib/gitlab/cycle_analytics/issue_event_spec.rb b/spec/lib/gitlab/cycle_analytics/issue_event_spec.rb
index 1c5c308da7d..7967d3727db 100644
--- a/spec/lib/gitlab/cycle_analytics/issue_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/issue_event_spec.rb
@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'lib/gitlab/cycle_analytics/shared_event_spec'
 
 describe Gitlab::CycleAnalytics::IssueEvent do
+  let(:stage_name) { :issue }
+
   it_behaves_like 'default query config' do
     it 'has the default order' do
       expect(event.order).to eq(event.start_time_attrs)
diff --git a/spec/lib/gitlab/cycle_analytics/plan_event_spec.rb b/spec/lib/gitlab/cycle_analytics/plan_event_spec.rb
index 4a5604115ec..5c4b8b343bd 100644
--- a/spec/lib/gitlab/cycle_analytics/plan_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/plan_event_spec.rb
@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'lib/gitlab/cycle_analytics/shared_event_spec'
 
 describe Gitlab::CycleAnalytics::PlanEvent do
+  let(:stage_name) { :plan }
+
   it_behaves_like 'default query config' do
     it 'has the default order' do
       expect(event.order).to eq(event.start_time_attrs)
diff --git a/spec/lib/gitlab/cycle_analytics/production_event_spec.rb b/spec/lib/gitlab/cycle_analytics/production_event_spec.rb
index ac17e3b4287..99ed9a0ab5c 100644
--- a/spec/lib/gitlab/cycle_analytics/production_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/production_event_spec.rb
@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'lib/gitlab/cycle_analytics/shared_event_spec'
 
 describe Gitlab::CycleAnalytics::ProductionEvent do
+  let(:stage_name) { :production }
+
   it_behaves_like 'default query config' do
     it 'has the default order' do
       expect(event.order).to eq(event.start_time_attrs)
diff --git a/spec/lib/gitlab/cycle_analytics/review_event_spec.rb b/spec/lib/gitlab/cycle_analytics/review_event_spec.rb
index 1ff53aa0227..efc40d4ca4a 100644
--- a/spec/lib/gitlab/cycle_analytics/review_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/review_event_spec.rb
@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'lib/gitlab/cycle_analytics/shared_event_spec'
 
 describe Gitlab::CycleAnalytics::ReviewEvent do
+  let(:stage_name) { :review }
+
   it_behaves_like 'default query config' do
     it 'has the default order' do
       expect(event.order).to eq(event.start_time_attrs)
diff --git a/spec/lib/gitlab/cycle_analytics/shared_event_spec.rb b/spec/lib/gitlab/cycle_analytics/shared_event_spec.rb
index 7019e4c3351..0b0ea662b74 100644
--- a/spec/lib/gitlab/cycle_analytics/shared_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/shared_event_spec.rb
@@ -1,7 +1,13 @@
 require 'spec_helper'
 
 shared_examples 'default query config' do
-  let(:event) { described_class.new(project: double, options: {}) }
+  let(:fetcher) do
+    Gitlab::CycleAnalytics::MetricsFetcher.new(project: create(:empty_project),
+                                               from: 1.day.ago,
+                                               branch: nil)
+  end
+
+  let(:event) { described_class.new(fetcher: fetcher, stage: stage_name, options: {}) }
 
   it 'has the start attributes' do
     expect(event.start_time_attrs).not_to be_nil
diff --git a/spec/lib/gitlab/cycle_analytics/staging_event_spec.rb b/spec/lib/gitlab/cycle_analytics/staging_event_spec.rb
index 4862d4765f2..b7ab477067c 100644
--- a/spec/lib/gitlab/cycle_analytics/staging_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/staging_event_spec.rb
@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'lib/gitlab/cycle_analytics/shared_event_spec'
 
 describe Gitlab::CycleAnalytics::StagingEvent do
+  let(:stage_name) { :staging }
+
   it_behaves_like 'default query config' do
     it 'does not have the default order' do
       expect(event.order).not_to eq(event.start_time_attrs)
diff --git a/spec/lib/gitlab/cycle_analytics/test_event_spec.rb b/spec/lib/gitlab/cycle_analytics/test_event_spec.rb
index e249db69fc6..a4fc8963e5b 100644
--- a/spec/lib/gitlab/cycle_analytics/test_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/test_event_spec.rb
@@ -2,6 +2,8 @@ require 'spec_helper'
 require 'lib/gitlab/cycle_analytics/shared_event_spec'
 
 describe Gitlab::CycleAnalytics::TestEvent do
+  let(:stage_name) { :test }
+
   it_behaves_like 'default query config' do
     it 'does not have the default order' do
       expect(event.order).not_to eq(event.start_time_attrs)