Added Ci::Stage specs

3 files changed, 10 insertions, 8 deletions

diff --git a/spec/lib/gitlab/ci/status/pipeline/factory_spec.rb b/spec/lib/gitlab/ci/status/pipeline/factory_spec.rb
index d6243940f2e..939ad2edf04 100644
--- a/spec/lib/gitlab/ci/status/pipeline/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/pipeline/factory_spec.rb
@@ -21,7 +21,7 @@ describe Gitlab::Ci::Status::Pipeline::Factory do
             Gitlab::Ci::Status.const_get(core_status.capitalize))
         end
 
-        it 'extends core status with common pipeline methods' do
+        it 'extends core status with common stage methods' do
           expect(status).to have_details
           expect(status).not_to have_action
           expect(status.details_path)
@@ -45,7 +45,7 @@ describe Gitlab::Ci::Status::Pipeline::Factory do
         .to be_a Gitlab::Ci::Status::Pipeline::SuccessWithWarnings
     end
 
-    it 'extends core status with common pipeline methods' do
+    it 'extends core status with common stage methods' do
       expect(status).to have_details
     end
   end
diff --git a/spec/lib/gitlab/ci/status/stage/common_spec.rb b/spec/lib/gitlab/ci/status/stage/common_spec.rb
index f15d6047878..f3259c6f23e 100644
--- a/spec/lib/gitlab/ci/status/stage/common_spec.rb
+++ b/spec/lib/gitlab/ci/status/stage/common_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe Gitlab::Ci::Status::Stage::Common do
-  let(:pipeline) { create(:ci_pipeline) }
-  let(:stage) { Ci::Stage.new(pipeline, name: 'test') }
+  let(:pipeline) { create(:ci_empty_pipeline) }
+  let(:stage) { build(:ci_stage, pipeline: pipeline, name: 'test') }
 
   subject do
     Class.new(Gitlab::Ci::Status::Core)
diff --git a/spec/lib/gitlab/ci/status/stage/factory_spec.rb b/spec/lib/gitlab/ci/status/stage/factory_spec.rb
index 2d22bd1e2a0..17929665c83 100644
--- a/spec/lib/gitlab/ci/status/stage/factory_spec.rb
+++ b/spec/lib/gitlab/ci/status/stage/factory_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 
 describe Gitlab::Ci::Status::Stage::Factory do
-  let(:pipeline) { create(:ci_pipeline) }
-  let(:stage) { Ci::Stage.new(pipeline, name: 'test') }
+  let(:pipeline) { create(:ci_empty_pipeline) }
+  let(:stage) { build(:ci_stage, pipeline: pipeline, name: 'test') }
 
   subject do
     described_class.new(stage)
@@ -15,8 +15,10 @@ describe Gitlab::Ci::Status::Stage::Factory do
   context 'when stage has a core status' do
     HasStatus::AVAILABLE_STATUSES.each do |core_status|
       context "when core status is #{core_status}" do
-        let!(:build) do
+        before do
           create(:ci_build, pipeline: pipeline, stage: 'test', status: core_status)
+          create(:commit_status, pipeline: pipeline, stage: 'test', status: core_status)
+          create(:ci_build, pipeline: pipeline, stage: 'build', status: :failed)
         end
 
         it "fabricates a core status #{core_status}" do
@@ -24,7 +26,7 @@ describe Gitlab::Ci::Status::Stage::Factory do
             Gitlab::Ci::Status.const_get(core_status.capitalize))
         end
 
-        it 'extends core status with common pipeline methods' do
+        it 'extends core status with common stage methods' do
           expect(status).to have_details
           expect(status.details_path).to include "pipelines/#{pipeline.id}"
           expect(status.details_path).to include "##{stage.name}"