Add latest changes from gitlab-org/gitlab@master

spec/support/helpers/migrations_helpers.rb

@@ -133,3 +133,5 @@ module MigrationsHelpers
     end
   end
 end
+
+MigrationsHelpers.prepend_if_ee('EE::MigrationsHelpers')

spec/support/helpers/stub_configuration.rb

@@ -149,3 +149,5 @@ end
 require_relative '../../../ee/spec/support/helpers/ee/stub_configuration' if
   Dir.exist?("#{__dir__}/../../../ee")
+
+StubConfiguration.prepend_if_ee('EE::StubConfiguration')

spec/support/helpers/stub_gitlab_calls.rb

@@ -139,3 +139,5 @@ module StubGitlabCalls
     JSON.parse f
   end
 end
+
+StubGitlabCalls.prepend_if_ee('EE::StubGitlabCalls')

spec/support/helpers/stub_object_storage.rb

@@ -78,3 +78,5 @@ end
 require_relative '../../../ee/spec/support/helpers/ee/stub_object_storage' if
   Dir.exist?("#{__dir__}/../../../ee")
+
+StubObjectStorage.prepend_if_ee('EE::StubObjectStorage')

spec/support/helpers/test_env.rb

@@ -418,3 +418,8 @@ module TestEnv
     true
   end
 end
+
+require_relative('../../../ee/spec/support/helpers/ee/test_env') if Gitlab.ee?
+
+::TestEnv.prepend_if_ee('::EE::TestEnv')
+::TestEnv.extend_if_ee('::EE::TestEnv')

spec/support/helpers/workhorse_helpers.rb

@@ -29,7 +29,8 @@ module WorkhorseHelpers
     post(url,
          params: workhorse_params,
-         headers: workhorse_rewritten_fields_header('file' => file.path)
+         headers: workhorse_rewritten_fields_header(file_key => file.path),
+         env: { 'CONTENT_TYPE' => 'multipart/form-data' }
         )
   end

spec/support/matchers/markdown_matchers.rb

@@ -230,3 +230,5 @@ module RSpec::Matchers::DSL::Macros
     end
   end
 end
+
+MarkdownMatchers.prepend_if_ee('EE::MarkdownMatchers')

spec/views/projects/issues/show.html.haml_spec.rb

@@ -56,7 +56,41 @@ describe 'projects/issues/show' do
       end
     end
-    it 'shows "Closed" if an issue has not been moved' do
+    context 'when the issue was duplicated' do
+      let(:new_issue) { create(:issue, project: project, author: user) }
+
+      before do
+        issue.duplicated_to = new_issue
+      end
+
+      context 'when user can see the duplicated issue' do
+        before do
+          project.add_developer(user)
+        end
+
+        it 'shows "Closed (duplicated)" if an issue has been duplicated' do
+          render
+
+          expect(rendered).to have_selector('.status-box-issue-closed:not(.hidden)', text: 'Closed (duplicated)')
+        end
+
+        it 'links "duplicated" to the new issue the original issue was duplicated to' do
+          render
+
+          expect(rendered).to have_selector("a[href=\"#{issue_path(new_issue)}\"]", text: 'duplicated')
+        end
+      end
+
+      context 'when user cannot see duplicated issue' do
+        it 'does not show duplicated issue link' do
+          render
+
+          expect(rendered).not_to have_selector("a[href=\"#{issue_path(new_issue)}\"]", text: 'duplicated')
+        end
+      end
+    end
+
+    it 'shows "Closed" if an issue has not been moved or duplicated' do
       render
       expect(rendered).to have_selector('.status-box-issue-closed:not(.hidden)', text: 'Closed')

spec/views/shared/_label_row.html.haml_spec.rb

+# frozen_string_literal: true
 require 'spec_helper'
 describe 'shared/_label_row.html.haml' do