Add latest changes from gitlab-org/gitlab@master

3 files changed, 2 insertions, 129 deletions

diff --git a/spec/views/profiles/show.html.haml_spec.rb b/spec/views/profiles/show.html.haml_spec.rb
index e1c21f87780..14e6feed3ab 100644
--- a/spec/views/profiles/show.html.haml_spec.rb
+++ b/spec/views/profiles/show.html.haml_spec.rb
@@ -19,48 +19,4 @@ describe 'profiles/show' do
       expect(rendered).to have_field('user_id', with: user.id)
     end
   end
-
-  context 'gitlab.com organization field' do
-    before do
-      allow(Gitlab).to receive(:com?).and_return(true)
-    end
-
-    context 'when `:gitlab_employee_badge` feature flag is enabled' do
-      context 'and when user has an `@gitlab.com` email address' do
-        let(:user) { create(:user, email: 'test@gitlab.com') }
-
-        it 'displays the organization field as `readonly` with a `value` of `GitLab`' do
-          render
-
-          expect(rendered).to have_selector('#user_organization[readonly][value="GitLab"]')
-        end
-      end
-
-      context 'and when a user does not have an `@gitlab.com` email' do
-        let(:user) { create(:user, email: 'test@example.com') }
-
-        it 'displays an editable organization field' do
-          render
-
-          expect(rendered).to have_selector('#user_organization:not([readonly]):not([value="GitLab"])')
-        end
-      end
-    end
-
-    context 'when `:gitlab_employee_badge` feature flag is disabled' do
-      before do
-        stub_feature_flags(gitlab_employee_badge: false)
-      end
-
-      context 'and when a user has an `@gitlab.com` email' do
-        let(:user) { create(:user, email: 'test@gitlab.com') }
-
-        it 'displays an editable organization field' do
-          render
-
-          expect(rendered).to have_selector('#user_organization:not([readonly]):not([value="GitLab"])')
-        end
-      end
-    end
-  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