Fix stage and pipeline specs and rubocop offenses19703-direct-link-pipelines

4 files changed, 31 insertions, 21 deletions

diff --git a/spec/controllers/projects/pipelines_controller_spec.rb b/spec/controllers/projects/pipelines_controller_spec.rb
index 94113250c9f..5fe7e6407cc 100644
--- a/spec/controllers/projects/pipelines_controller_spec.rb
+++ b/spec/controllers/projects/pipelines_controller_spec.rb
@@ -12,14 +12,6 @@ describe Projects::PipelinesController do
   end
 
   describe 'GET stages.json' do
-    def get_stage(name)
-      get :stage, namespace_id: project.namespace.path,
-                  project_id: project.path,
-                  id: pipeline.id,
-                  stage: name,
-                  format: :json
-    end
-
     context 'when accessing existing stage' do
       before do
         create(:ci_build, pipeline: pipeline, stage: 'build')
@@ -39,8 +31,17 @@ describe Projects::PipelinesController do
         get_stage('test')
       end
 
-      it { expect(response).to have_http_status(:not_found) }
+      it 'responds with not found' do
+        expect(response).to have_http_status(:not_found)
+      end
     end
 
+    def get_stage(name)
+      get :stage, namespace_id: project.namespace.path,
+                  project_id: project.path,
+                  id: pipeline.id,
+                  stage: name,
+                  format: :json
+    end
   end
 end
diff --git a/spec/features/projects/pipelines/pipelines_spec.rb b/spec/features/projects/pipelines/pipelines_spec.rb
index fa8ba21b389..1ff57f92c4c 100644
--- a/spec/features/projects/pipelines/pipelines_spec.rb
+++ b/spec/features/projects/pipelines/pipelines_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe "Pipelines", feature: true, js:true do
+describe 'Pipelines', :feature, :js do
   include GitlabRoutingHelper
   include WaitForAjax
 
@@ -70,23 +70,32 @@ describe "Pipelines", feature: true, js:true do
     end
 
     context 'with manual actions' do
-      let!(:manual) { create(:ci_build, :manual, pipeline: pipeline, name: 'manual build', stage: 'test', commands: 'test') }
+      let!(:manual) do
+        create(:ci_build, :manual, pipeline: pipeline,
+                                   name: 'manual build',
+                                   stage: 'test',
+                                   commands: 'test')
+      end
 
-      before { visit namespace_project_pipelines_path(project.namespace, project) }
+      before do
+        visit namespace_project_pipelines_path(project.namespace, project)
+      end
 
-      it do
+      it 'has link to the manual action' do
         find('.js-pipeline-dropdown-manual-actions').click
-         expect(page).to have_link('Manual build')
-       end
 
-      context 'when playing' do
+        expect(page).to have_link('Manual build')
+      end
 
+      context 'when manual action was played' do
         before do
           find('.js-pipeline-dropdown-manual-actions').click
           click_link('Manual build')
         end
 
-        it { expect(manual.reload).to be_pending }
+        it 'enqueues manual action job' do
+          expect(manual.reload).to be_pending
+        end
       end
     end
 
diff --git a/spec/models/ci/pipeline_spec.rb b/spec/models/ci/pipeline_spec.rb
index 5e1a9fa8dd8..dc377d15f15 100644
--- a/spec/models/ci/pipeline_spec.rb
+++ b/spec/models/ci/pipeline_spec.rb
@@ -183,9 +183,9 @@ describe Ci::Pipeline, models: true 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 }
+      it { expect(subject).to be_a Ci::Stage }
+      it { expect(subject.name).to eq 'test' }
+      it { expect(subject.statuses).not_to be_empty }
     end
 
     context 'without status in stage' do
diff --git a/spec/models/ci/stage_spec.rb b/spec/models/ci/stage_spec.rb
index 786091a577d..742bedb37e4 100644
--- a/spec/models/ci/stage_spec.rb
+++ b/spec/models/ci/stage_spec.rb
@@ -30,7 +30,7 @@ describe Ci::Stage, models: true do
 
   describe '#statuses_count' do
     before do
-      create_job(:ci_build) }
+      create_job(:ci_build)
       create_job(:ci_build, stage: 'other stage')
     end