Add latest changes from gitlab-org/gitlab@13-0-stable-ee

5 files changed, 18 insertions, 112 deletions

diff --git a/spec/views/projects/issues/_related_branches.html.haml_spec.rb b/spec/views/projects/issues/_related_branches.html.haml_spec.rb
index a6817e3fdbf..6c9bbaea38c 100644
--- a/spec/views/projects/issues/_related_branches.html.haml_spec.rb
+++ b/spec/views/projects/issues/_related_branches.html.haml_spec.rb
@@ -5,23 +5,25 @@ require 'spec_helper'
 describe 'projects/issues/_related_branches' do
   include Devise::Test::ControllerHelpers
 
-  let(:user) { create(:user) }
-  let(:project) { create(:project, :repository) }
-  let(:branch) { project.repository.find_branch('feature') }
-  let!(:pipeline) { create(:ci_pipeline, project: project, sha: branch.dereferenced_target.id, ref: 'feature') }
+  let(:pipeline) { build(:ci_pipeline, :success) }
+  let(:status) { pipeline.detailed_status(build(:user)) }
 
   before do
-    assign(:project, project)
-    assign(:related_branches, ['feature'])
-
-    project.add_developer(user)
-    allow(view).to receive(:current_user).and_return(user)
+    assign(:related_branches, [
+      { name: 'other', link: 'link-to-other', pipeline_status: nil },
+      { name: 'feature', link: 'link-to-feature', pipeline_status: status }
+    ])
 
     render
   end
 
-  it 'shows the related branches with their build status' do
-    expect(rendered).to match('feature')
+  it 'shows the related branches with their build status', :aggregate_failures do
+    expect(rendered).to have_text('feature')
+    expect(rendered).to have_text('other')
+    expect(rendered).to have_link(href: 'link-to-feature')
+    expect(rendered).to have_link(href: 'link-to-other')
     expect(rendered).to have_css('.related-branch-ci-status')
+    expect(rendered).to have_css('.ci-status-icon')
+    expect(rendered).to have_css('.related-branch-info')
   end
 end
diff --git a/spec/views/projects/issues/show.html.haml_spec.rb b/spec/views/projects/issues/show.html.haml_spec.rb
index fb09840c8f4..60a541916e9 100644
--- a/spec/views/projects/issues/show.html.haml_spec.rb
+++ b/spec/views/projects/issues/show.html.haml_spec.rb
@@ -3,18 +3,7 @@
 require 'spec_helper'
 
 describe 'projects/issues/show' do
-  let(:project) { create(:project, :repository) }
-  let(:issue) { create(:issue, project: project, author: user) }
-  let(:user) { create(:user) }
-
-  before do
-    assign(:project, project)
-    assign(:issue, issue)
-    assign(:noteable, issue)
-    stub_template 'shared/issuable/_sidebar' => ''
-    stub_template 'projects/issues/_discussion' => ''
-    allow(view).to receive(:user_status).and_return('')
-  end
+  include_context 'project show action'
 
   context 'when the issue is closed' do
     before do
@@ -152,18 +141,4 @@ describe 'projects/issues/show' do
       expect(rendered).not_to have_selector('#js-sentry-error-stack-trace')
     end
   end
-
-  context 'when issue is created by a GitLab team member' do
-    let(:user) { create(:user, email: 'test@gitlab.com') }
-
-    before do
-      allow(Gitlab).to receive(:com?).and_return(true)
-    end
-
-    it 'renders an employee badge next to their name' do
-      render
-
-      expect(rendered).to have_selector('[aria-label="GitLab Team Member"]')
-    end
-  end
 end
diff --git a/spec/views/projects/merge_requests/show.html.haml_spec.rb b/spec/views/projects/merge_requests/show.html.haml_spec.rb
index 67e7c3cf2fb..665003d137a 100644
--- a/spec/views/projects/merge_requests/show.html.haml_spec.rb
+++ b/spec/views/projects/merge_requests/show.html.haml_spec.rb
@@ -3,45 +3,7 @@
 require 'spec_helper'
 
 describe 'projects/merge_requests/show.html.haml' do
-  include Devise::Test::ControllerHelpers
-  include ProjectForksHelper
-
-  let(:user) { create(:user) }
-  let(:project) { create(:project, :public, :repository) }
-  let(:forked_project) { fork_project(project, user, repository: true) }
-  let(:unlink_project) { Projects::UnlinkForkService.new(forked_project, user) }
-  let(:note) { create(:note_on_merge_request, project: project, noteable: closed_merge_request) }
-
-  let(:closed_merge_request) do
-    create(:closed_merge_request,
-      source_project: forked_project,
-      target_project: project,
-      author: user)
-  end
-
-  def preload_view_requirements
-    # This will load the status fields of the author of the note and merge request
-    # to avoid queries in when rendering the view being tested.
-    closed_merge_request.author.status
-    note.author.status
-  end
-
-  before do
-    assign(:project, project)
-    assign(:merge_request, closed_merge_request)
-    assign(:commits_count, 0)
-    assign(:note, note)
-    assign(:noteable, closed_merge_request)
-    assign(:notes, [])
-    assign(:pipelines, Ci::Pipeline.none)
-    assign(:issuable_sidebar, serialize_issuable_sidebar(user, project, closed_merge_request))
-
-    preload_view_requirements
-
-    allow(view).to receive_messages(current_user: user,
-                                    can?: true,
-                                    current_application_settings: Gitlab::CurrentSettings.current_application_settings)
-  end
+  include_context 'merge request show action'
 
   describe 'merge request assignee sidebar' do
     context 'when assignee is allowed to merge' do
@@ -92,24 +54,4 @@ describe 'projects/merge_requests/show.html.haml' do
       expect(rendered).to have_css('a', visible: false, text: 'Close')
     end
   end
-
-  context 'when merge request is created by a GitLab team member' do
-    let(:user) { create(:user, email: 'test@gitlab.com') }
-
-    before do
-      allow(Gitlab).to receive(:com?).and_return(true)
-    end
-
-    it 'renders an employee badge next to their name' do
-      render
-
-      expect(rendered).to have_selector('[aria-label="GitLab Team Member"]')
-    end
-  end
-
-  def serialize_issuable_sidebar(user, project, merge_request)
-    MergeRequestSerializer
-      .new(current_user: user, project: project)
-      .represent(closed_merge_request, serializer: 'sidebar')
-  end
 end
diff --git a/spec/views/projects/services/_form.haml_spec.rb b/spec/views/projects/services/_form.haml_spec.rb
index 272ac97604a..a3faa92b50e 100644
--- a/spec/views/projects/services/_form.haml_spec.rb
+++ b/spec/views/projects/services/_form.haml_spec.rb
@@ -7,6 +7,8 @@ describe 'projects/services/_form' do
   let(:user) { create(:admin) }
 
   before do
+    stub_feature_flags(integration_form_refactor: false)
+
     assign(:project, project)
 
     allow(controller).to receive(:current_user).and_return(user)
@@ -29,20 +31,5 @@ describe 'projects/services/_form' do
       expect(rendered).to have_content('Event will be triggered when a commit is created/updated')
       expect(rendered).to have_content('Event will be triggered when a merge request is created/updated/merged')
     end
-
-    context 'when service is Jira' do
-      let(:project) { create(:jira_project) }
-
-      before do
-        assign(:service, project.jira_service)
-      end
-
-      it 'display merge_request_events and commit_events descriptions' do
-        render
-
-        expect(rendered).to have_content('Jira comments will be created when an issue gets referenced in a commit.')
-        expect(rendered).to have_content('Jira comments will be created when an issue gets referenced in a merge request.')
-      end
-    end
   end
 end
diff --git a/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb b/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb
index 94a85486cfa..d25860ab301 100644
--- a/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb
+++ b/spec/views/projects/settings/ci_cd/_autodevops_form.html.haml_spec.rb
@@ -13,7 +13,7 @@ describe 'projects/settings/ci_cd/_autodevops_form' do
   it 'shows a warning message about Kubernetes cluster' do
     render
 
-    expect(rendered).to have_text('You must add a Kubernetes cluster integration to this project with a domain in order for your deployment strategy to work correctly.')
+    expect(rendered).to have_text('Add a Kubernetes cluster integration with a domain or create an AUTO_DEVOPS_PLATFORM_TARGET CI variable')
   end
 
   context 'when the project has an available kubernetes cluster' do