From 3f681f4cefb5eda594acaab2eaf1be18ebd9066c Mon Sep 17 00:00:00 2001 From: James Lopez Date: Mon, 5 Dec 2016 09:47:10 +0100 Subject: fix specs, refactor missing bits from events stuff --- spec/lib/gitlab/cycle_analytics/code_event_fetcher_spec.rb | 4 ++-- spec/lib/gitlab/cycle_analytics/issue_event_fetcher_spec.rb | 6 +----- spec/lib/gitlab/cycle_analytics/plan_event_fetcher_spec.rb | 4 ---- spec/lib/gitlab/cycle_analytics/production_event_fetcher_spec.rb | 6 +----- spec/lib/gitlab/cycle_analytics/review_event_fetcher_spec.rb | 6 +----- spec/lib/gitlab/cycle_analytics/shared_event_spec.rb | 8 -------- spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb | 8 ++++++++ spec/lib/gitlab/cycle_analytics/staging_event_fetcher_spec.rb | 4 ++-- spec/lib/gitlab/cycle_analytics/test_event_fetcher_spec.rb | 4 ++-- 9 files changed, 17 insertions(+), 33 deletions(-) (limited to 'spec/lib/gitlab/cycle_analytics') diff --git a/spec/lib/gitlab/cycle_analytics/code_event_fetcher_spec.rb b/spec/lib/gitlab/cycle_analytics/code_event_fetcher_spec.rb index abfd60d7f6a..0267e8c2f69 100644 --- a/spec/lib/gitlab/cycle_analytics/code_event_fetcher_spec.rb +++ b/spec/lib/gitlab/cycle_analytics/code_event_fetcher_spec.rb @@ -5,8 +5,8 @@ describe Gitlab::CycleAnalytics::CodeEventFetcher 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) + it 'has a default order' do + expect(event.order).not_to be_nil end end end diff --git a/spec/lib/gitlab/cycle_analytics/issue_event_fetcher_spec.rb b/spec/lib/gitlab/cycle_analytics/issue_event_fetcher_spec.rb index f4d995d072f..fd9fa2fee49 100644 --- a/spec/lib/gitlab/cycle_analytics/issue_event_fetcher_spec.rb +++ b/spec/lib/gitlab/cycle_analytics/issue_event_fetcher_spec.rb @@ -4,9 +4,5 @@ require 'lib/gitlab/cycle_analytics/shared_event_spec' describe Gitlab::CycleAnalytics::IssueEventFetcher 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) - end - end + it_behaves_like 'default query config' end diff --git a/spec/lib/gitlab/cycle_analytics/plan_event_fetcher_spec.rb b/spec/lib/gitlab/cycle_analytics/plan_event_fetcher_spec.rb index 679779de51e..1c3c1728fc6 100644 --- a/spec/lib/gitlab/cycle_analytics/plan_event_fetcher_spec.rb +++ b/spec/lib/gitlab/cycle_analytics/plan_event_fetcher_spec.rb @@ -5,10 +5,6 @@ describe Gitlab::CycleAnalytics::PlanEventFetcher 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) - end - context 'no commits' do it 'does not blow up if there are no commits' do allow_any_instance_of(Gitlab::CycleAnalytics::MetricsFetcher).to receive(:events).and_return([{}]) diff --git a/spec/lib/gitlab/cycle_analytics/production_event_fetcher_spec.rb b/spec/lib/gitlab/cycle_analytics/production_event_fetcher_spec.rb index a9126b8fa1c..74001181305 100644 --- a/spec/lib/gitlab/cycle_analytics/production_event_fetcher_spec.rb +++ b/spec/lib/gitlab/cycle_analytics/production_event_fetcher_spec.rb @@ -4,9 +4,5 @@ require 'lib/gitlab/cycle_analytics/shared_event_spec' describe Gitlab::CycleAnalytics::ProductionEventFetcher 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) - end - end + it_behaves_like 'default query config' end diff --git a/spec/lib/gitlab/cycle_analytics/review_event_fetcher_spec.rb b/spec/lib/gitlab/cycle_analytics/review_event_fetcher_spec.rb index c3e66dcb861..4f67c95ed4c 100644 --- a/spec/lib/gitlab/cycle_analytics/review_event_fetcher_spec.rb +++ b/spec/lib/gitlab/cycle_analytics/review_event_fetcher_spec.rb @@ -4,9 +4,5 @@ require 'lib/gitlab/cycle_analytics/shared_event_spec' describe Gitlab::CycleAnalytics::ReviewEventFetcher 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) - end - end + it_behaves_like 'default query config' end diff --git a/spec/lib/gitlab/cycle_analytics/shared_event_spec.rb b/spec/lib/gitlab/cycle_analytics/shared_event_spec.rb index 60ec87255c8..725f9a558f5 100644 --- a/spec/lib/gitlab/cycle_analytics/shared_event_spec.rb +++ b/spec/lib/gitlab/cycle_analytics/shared_event_spec.rb @@ -10,18 +10,10 @@ shared_examples 'default query config' do 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 - end - it 'has the stage attribute' do expect(event.stage).not_to be_nil end - it 'has the end attributes' do - expect(event.end_time_attrs).not_to be_nil - end - it 'has the projection attributes' do expect(event.projections).not_to be_nil end diff --git a/spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb b/spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb index 8cc7875258e..c88e3e22f5c 100644 --- a/spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb +++ b/spec/lib/gitlab/cycle_analytics/shared_stage_spec.rb @@ -8,6 +8,14 @@ shared_examples 'base stage' do allow_any_instance_of(Gitlab::CycleAnalytics::BaseEventFetcher).to receive(:event_result).and_return({}) end + it 'has the start attributes' do + expect(stage.start_time_attrs).not_to be_nil + end + + it 'has the end attributes' do + expect(stage.end_time_attrs).not_to be_nil + end + it 'has the median data value' do expect(stage.median_data[:value]).not_to be_nil end diff --git a/spec/lib/gitlab/cycle_analytics/staging_event_fetcher_spec.rb b/spec/lib/gitlab/cycle_analytics/staging_event_fetcher_spec.rb index 8338e17b96d..bbc82496340 100644 --- a/spec/lib/gitlab/cycle_analytics/staging_event_fetcher_spec.rb +++ b/spec/lib/gitlab/cycle_analytics/staging_event_fetcher_spec.rb @@ -5,8 +5,8 @@ describe Gitlab::CycleAnalytics::StagingEventFetcher 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) + it 'has a default order' do + expect(event.order).not_to be_nil end end end diff --git a/spec/lib/gitlab/cycle_analytics/test_event_fetcher_spec.rb b/spec/lib/gitlab/cycle_analytics/test_event_fetcher_spec.rb index 9d4f7667f1d..6639fa54e0e 100644 --- a/spec/lib/gitlab/cycle_analytics/test_event_fetcher_spec.rb +++ b/spec/lib/gitlab/cycle_analytics/test_event_fetcher_spec.rb @@ -5,8 +5,8 @@ describe Gitlab::CycleAnalytics::TestEventFetcher 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) + it 'has a default order' do + expect(event.order).not_to be_nil end end end -- cgit v1.2.3