big refactor based on MR feedback

9 files changed, 11 insertions, 10 deletions

diff --git a/spec/lib/gitlab/cycle_analytics/code_event_spec.rb b/spec/lib/gitlab/cycle_analytics/code_event_fetcher_spec.rb
index 0673906e678..abfd60d7f6a 100644
--- a/spec/lib/gitlab/cycle_analytics/code_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/code_event_fetcher_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'lib/gitlab/cycle_analytics/shared_event_spec'
 
-describe Gitlab::CycleAnalytics::CodeEvent do
+describe Gitlab::CycleAnalytics::CodeEventFetcher do
   let(:stage_name) { :code }
 
   it_behaves_like 'default query config' do
diff --git a/spec/lib/gitlab/cycle_analytics/issue_event_spec.rb b/spec/lib/gitlab/cycle_analytics/issue_event_fetcher_spec.rb
index 7967d3727db..f4d995d072f 100644
--- a/spec/lib/gitlab/cycle_analytics/issue_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/issue_event_fetcher_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'lib/gitlab/cycle_analytics/shared_event_spec'
 
-describe Gitlab::CycleAnalytics::IssueEvent do
+describe Gitlab::CycleAnalytics::IssueEventFetcher do
   let(:stage_name) { :issue }
 
   it_behaves_like 'default query config' do
diff --git a/spec/lib/gitlab/cycle_analytics/plan_event_spec.rb b/spec/lib/gitlab/cycle_analytics/plan_event_fetcher_spec.rb
index df407e51c64..679779de51e 100644
--- a/spec/lib/gitlab/cycle_analytics/plan_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/plan_event_fetcher_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'lib/gitlab/cycle_analytics/shared_event_spec'
 
-describe Gitlab::CycleAnalytics::PlanEvent do
+describe Gitlab::CycleAnalytics::PlanEventFetcher do
   let(:stage_name) { :plan }
 
   it_behaves_like 'default query config' do
diff --git a/spec/lib/gitlab/cycle_analytics/production_event_spec.rb b/spec/lib/gitlab/cycle_analytics/production_event_fetcher_spec.rb
index 99ed9a0ab5c..a9126b8fa1c 100644
--- a/spec/lib/gitlab/cycle_analytics/production_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/production_event_fetcher_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'lib/gitlab/cycle_analytics/shared_event_spec'
 
-describe Gitlab::CycleAnalytics::ProductionEvent do
+describe Gitlab::CycleAnalytics::ProductionEventFetcher do
   let(:stage_name) { :production }
 
   it_behaves_like 'default query config' do
diff --git a/spec/lib/gitlab/cycle_analytics/review_event_spec.rb b/spec/lib/gitlab/cycle_analytics/review_event_fetcher_spec.rb
index efc40d4ca4a..c3e66dcb861 100644
--- a/spec/lib/gitlab/cycle_analytics/review_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/review_event_fetcher_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'lib/gitlab/cycle_analytics/shared_event_spec'
 
-describe Gitlab::CycleAnalytics::ReviewEvent do
+describe Gitlab::CycleAnalytics::ReviewEventFetcher do
   let(:stage_name) { :review }
 
   it_behaves_like 'default query config' do
diff --git a/spec/lib/gitlab/cycle_analytics/shared_event_spec.rb b/spec/lib/gitlab/cycle_analytics/shared_event_spec.rb
index 5e1c7531fb5..60ec87255c8 100644
--- a/spec/lib/gitlab/cycle_analytics/shared_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/shared_event_spec.rb
@@ -4,10 +4,11 @@ shared_examples 'default query config' do
   let(:fetcher) do
     Gitlab::CycleAnalytics::MetricsFetcher.new(project: create(:empty_project),
                                                from: 1.day.ago,
-                                               branch: nil)
+                                               branch: nil,
+                                               stage: stage_name)
   end
 
-  let(:event) { described_class.new(fetcher: fetcher, options: {}) }
+  let(:event) { described_class.new(fetcher: fetcher, options: {}, stage: stage_name) }
 
   it 'has the start attributes' do
     expect(event.start_time_attrs).not_to be_nil
diff --git a/spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb b/spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb
index cfb5dc12ff1..8cc7875258e 100644
--- a/spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb
@@ -5,7 +5,7 @@ shared_examples 'base stage' do
 
   before do
     allow_any_instance_of(Gitlab::CycleAnalytics::MetricsFetcher).to receive(:median).and_return(1.12)
-    allow_any_instance_of(Gitlab::CycleAnalytics::BaseEvent).to receive(:event_result).and_return({})
+    allow_any_instance_of(Gitlab::CycleAnalytics::BaseEventFetcher).to receive(:event_result).and_return({})
   end
 
   it 'has the median data value' do
diff --git a/spec/lib/gitlab/cycle_analytics/staging_event_spec.rb b/spec/lib/gitlab/cycle_analytics/staging_event_fetcher_spec.rb
index b7ab477067c..8338e17b96d 100644
--- a/spec/lib/gitlab/cycle_analytics/staging_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/staging_event_fetcher_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'lib/gitlab/cycle_analytics/shared_event_spec'
 
-describe Gitlab::CycleAnalytics::StagingEvent do
+describe Gitlab::CycleAnalytics::StagingEventFetcher do
   let(:stage_name) { :staging }
 
   it_behaves_like 'default query config' do
diff --git a/spec/lib/gitlab/cycle_analytics/test_event_spec.rb b/spec/lib/gitlab/cycle_analytics/test_event_fetcher_spec.rb
index a4fc8963e5b..9d4f7667f1d 100644
--- a/spec/lib/gitlab/cycle_analytics/test_event_spec.rb
+++ b/spec/lib/gitlab/cycle_analytics/test_event_fetcher_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'lib/gitlab/cycle_analytics/shared_event_spec'
 
-describe Gitlab::CycleAnalytics::TestEvent do
+describe Gitlab::CycleAnalytics::TestEventFetcher do
   let(:stage_name) { :test }
 
   it_behaves_like 'default query config' do