Improve specs

3 files changed, 18 insertions, 9 deletions

diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index e1c6b4c115c..24e501b0151 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -152,7 +152,7 @@ describe "Pipelines" do
     end
   end
 
-  describe 'GET /:project/pipelines/stage?name=stage' do
+  describe 'GET /:project/pipelines/stage.json?name=stage' do
     let!(:pipeline) do
       create(:ci_empty_pipeline, project: project, ref: 'master',
         status: 'running')
@@ -168,7 +168,10 @@ describe "Pipelines" do
           project.namespace, project, pipeline, format: :json, stage: 'build')
       end
 
-      it { expect(page).to have_http_status(:ok) }
+      it do
+        expect(page).to have_http_status(:ok)
+        expect(JSON.parse(page.source)).to include("html")
+      end
     end
 
     context 'when accessing unknown stage' do
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 67cc3e6be68..5e1a9fa8dd8 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -179,15 +179,19 @@ describe Ci::Pipeline, models: true do
     subject { pipeline.stage('test') }
 
     context 'with status in stage' do
-      let!(:status) { create(:commit_status, pipeline: pipeline, stage: 'test') }
-
-      it 'return stage object' do
-        is_expected.to be_a(Ci::Stage)
+      before do
+        create(:commit_status, pipeline: pipeline, stage: 'test')
       end
+
+      it { expect(subject).to be_a(Ci::Stage) }
+      it { expect(subject.name).to eq('stage') }
+      it { expect(subject.statues).not_to be_empty }
     end
 
     context 'without status in stage' do
-      let!(:status) { create(:commit_status, pipeline: pipeline, stage: 'build') }
+      before do
+        create(:commit_status, pipeline: pipeline, stage: 'build')
+      end
 
       it 'return stage object' do
         is_expected.to be_nil
diff --git a/spec/models/ci/stage_spec.rb b/spec/models/ci/stage_spec.rb
index d8dce0f1cc6..65a302e9d9b 100644
--- a/spec/models/ci/stage_spec.rb
+++ b/spec/models/ci/stage_spec.rb
@@ -29,8 +29,10 @@ describe Ci::Stage, models: true do
   end
 
   describe '#statuses_count' do
-    let!(:stage_build) { create_job(:ci_build) }
-    let!(:other_build) { create_job(:ci_build, stage: 'other stage') }
+    before do
+      create_job(:ci_build) }
+      create_job(:ci_build, stage: 'other stage')
+    end
 
     subject { stage.statuses_count }