Add latest changes from gitlab-org/gitlab@master

1 files changed, 24 insertions, 8 deletions

diff --git a/spec/frontend/fixtures/pipelines.rb b/spec/frontend/fixtures/pipelines.rb
index b4b7f0e332f..2a538352abe 100644
--- a/spec/frontend/fixtures/pipelines.rb
+++ b/spec/frontend/fixtures/pipelines.rb
@@ -5,16 +5,22 @@ require 'spec_helper'
 RSpec.describe Projects::PipelinesController, '(JavaScript fixtures)', type: :controller do
   include JavaScriptFixturesHelpers
 
-  let(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
-  let(:project) { create(:project, :repository, namespace: namespace, path: 'pipelines-project') }
-  let(:commit) { create(:commit, project: project) }
-  let(:commit_without_author) { RepoHelpers.another_sample_commit }
-  let!(:user) { create(:user, developer_projects: [project], email: commit.author_email) }
-  let!(:pipeline) { create(:ci_pipeline, project: project, sha: commit.id, user: user) }
+  let_it_be(:namespace) { create(:namespace, name: 'frontend-fixtures' )}
+  let_it_be(:project) { create(:project, :repository, namespace: namespace, path: 'pipelines-project') }
+
+  let_it_be(:commit_without_author) { RepoHelpers.another_sample_commit }
   let!(:pipeline_without_author) { create(:ci_pipeline, project: project, sha: commit_without_author.id) }
-  let!(:pipeline_without_commit) { create(:ci_pipeline, status: :success, project: project, sha: '0000') }
+  let!(:build_pipeline_without_author) { create(:ci_build, pipeline: pipeline_without_author, stage: 'test') }
 
-  render_views
+  let_it_be(:pipeline_without_commit) { create(:ci_pipeline, status: :success, project: project, sha: '0000') }
+  let!(:build_pipeline_without_commit) { create(:ci_build, pipeline: pipeline_without_commit, stage: 'test') }
+
+  let(:commit) { create(:commit, project: project) }
+  let(:user) { create(:user, developer_projects: [project], email: commit.author_email) }
+  let!(:pipeline) { create(:ci_pipeline, :with_test_reports, project: project, sha: commit.id, user: user) }
+  let!(:build_success) { create(:ci_build, pipeline: pipeline, stage: 'build') }
+  let!(:build_test) { create(:ci_build, pipeline: pipeline, stage: 'test') }
+  let!(:build_deploy_failed) { create(:ci_build, status: :failed, pipeline: pipeline, stage: 'deploy') }
 
   before(:all) do
     clean_frontend_fixtures('pipelines/')
@@ -32,4 +38,14 @@ RSpec.describe Projects::PipelinesController, '(JavaScript fixtures)', type: :co
 
     expect(response).to be_successful
   end
+
+  it "pipelines/test_report.json" do
+    get :test_report, params: {
+      namespace_id: namespace,
+      project_id: project,
+      id: pipeline.id
+    }, format: :json
+
+    expect(response).to be_successful
+  end
 end