From 21100f373af6ada4646223230540880cb988b82a Mon Sep 17 00:00:00 2001 From: Grzegorz Bizon Date: Sat, 6 May 2017 13:52:05 +0200 Subject: Add minor improvements to jobs groups status specs --- app/services/ci/expire_pipeline_cache_service.rb | 2 +- spec/lib/gitlab/ci/status/group/common_spec.rb | 3 ++- spec/lib/gitlab/ci/status/group/factory_spec.rb | 12 +++++++----- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/services/ci/expire_pipeline_cache_service.rb b/app/services/ci/expire_pipeline_cache_service.rb index 6a7ac6dab35..e2299d1a79d 100644 --- a/app/services/ci/expire_pipeline_cache_service.rb +++ b/app/services/ci/expire_pipeline_cache_service.rb @@ -1,6 +1,6 @@ module Ci class ExpirePipelineCacheService < BaseService - include Gitlab::Routing.url_helpers + include Gitlab::Routing attr_reader :pipeline diff --git a/spec/lib/gitlab/ci/status/group/common_spec.rb b/spec/lib/gitlab/ci/status/group/common_spec.rb index 566bb411e96..c0ca05881f5 100644 --- a/spec/lib/gitlab/ci/status/group/common_spec.rb +++ b/spec/lib/gitlab/ci/status/group/common_spec.rb @@ -2,7 +2,8 @@ require 'spec_helper' describe Gitlab::Ci::Status::Group::Common do subject do - Gitlab::Ci::Status::Core.new(nil, nil).extend(described_class) + Gitlab::Ci::Status::Core.new(double, double) + .extend(described_class) end it 'does not have action' do diff --git a/spec/lib/gitlab/ci/status/group/factory_spec.rb b/spec/lib/gitlab/ci/status/group/factory_spec.rb index 382436e8c3e..0cd83123938 100644 --- a/spec/lib/gitlab/ci/status/group/factory_spec.rb +++ b/spec/lib/gitlab/ci/status/group/factory_spec.rb @@ -1,11 +1,13 @@ require 'spec_helper' describe Gitlab::Ci::Status::Group::Factory do - subject { described_class } - - it { is_expected.to respond_to(:common_helpers) } + it 'inherits from the core factory' do + expect(described_class) + .to be < Gitlab::Ci::Status::Factory + end - it 'inherrits from Status::Factory' do - expect(subject).to be < Gitlab::Ci::Status::Factory + it 'exposes group helpers' do + expect(described_class.common_helpers) + .to eq Gitlab::Ci::Status::Group::Common end end -- cgit v1.2.1