Merge branch 'rc/move-more-ee-only-spec-files' into 'master'

Move EE-specific spec files that were not under spec/ee

See merge request gitlab-org/gitlab-ee!4532

ee/spec/controllers/groups/epics_controller_spec.rb

@@ -141,7 +141,7 @@ describe Groups::EpicsController do
           show_epic(:json)
 
           expect(response).to have_http_status(200)
-          expect(response).to match_response_schema('entities/epic')
+          expect(response).to match_response_schema('entities/epic', dir: 'ee')
         end
 
         context 'with unauthorized user' do

spec/factories/remote_mirrors.rb → ee/spec/factories/remote_mirrors.rb

-require_relative '../support/test_env'
-
 FactoryBot.define do
   factory :remote_mirror, class: 'RemoteMirror' do
     association :project, :repository

spec/ee/spec/lib/ee/gitlab/ci/config_spec.rb → ee/spec/lib/ee/gitlab/ci/config_spec.rb

@@ -6,7 +6,7 @@ describe EE::Gitlab::Ci::Config do
   let(:gitlab_ci_yml) do
     <<~HEREDOC
     include:
-      - /spec/ee/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml
+      - /ee/spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml
       - #{remote_location}
 
     image: ruby:2.2
@@ -38,7 +38,7 @@ describe EE::Gitlab::Ci::Config do
         POSTGRES_DB: $CI_ENVIRONMENT_SLUG
       HEREDOC
     end
-    let(:local_file_content) {  File.read("#{Rails.root}/spec/ee/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml") }
+    let(:local_file_content) {  File.read(Rails.root.join('ee/spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml')) }
 
     before do
       allow(project).to receive(:feature_available?).with(:external_files_in_gitlab_ci).and_return(true)

spec/ee/spec/lib/gitlab/ci/external/processor_spec.rb → ee/spec/lib/gitlab/ci/external/processor_spec.rb

@@ -107,7 +107,7 @@ describe Gitlab::Ci::External::Processor do
       let(:remote_file) { 'https://gitlab.com/gitlab-org/gitlab-ce/blob/1234/.gitlab-ci-1.yml' }
       let(:external_files) do
         [
-          '/spec/ee/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml',
+          '/ee/spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml',
           remote_file
         ]
       end
@@ -128,7 +128,7 @@ describe Gitlab::Ci::External::Processor do
       end
 
       before do
-        local_file_content = File.read("#{Rails.root}/spec/ee/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml")
+        local_file_content = File.read(Rails.root.join('ee/spec/fixtures/gitlab/ci/external_files/.gitlab-ci-template-1.yml'))
         allow_any_instance_of(Gitlab::Ci::External::File::Local).to receive(:fetch_local_content).and_return(local_file_content)
         WebMock.stub_request(:get, remote_file).to_return(body: remote_file_content)
       end

ee/spec/lib/ee/gitlab/email/handler/ee/service_desk_handler_spec.rb → ee/spec/lib/gitlab/email/handler/ee/service_desk_handler_spec.rb

@@ -8,7 +8,7 @@ describe Gitlab::Email::Handler::EE::ServiceDeskHandler do
     stub_config_setting(host: 'localhost')
   end
 
-  let(:email_raw) { fixture_file('emails/service_desk.eml') }
+  let(:email_raw) { fixture_file('emails/service_desk.eml', dir: 'ee') }
   let(:namespace) { create(:namespace, name: "email") }
 
   context 'service desk is enabled for the project' do
@@ -64,7 +64,7 @@ describe Gitlab::Email::Handler::EE::ServiceDeskHandler do
     end
 
     context 'when the email is forwarded through an alias' do
-      let(:email_raw) { fixture_file('emails/service_desk_forwarded.eml') }
+      let(:email_raw) { fixture_file('emails/service_desk_forwarded.eml', dir: 'ee') }
 
       it 'sends thank you the email and creates issue' do
         setup_attachment

ee/spec/lib/gitlab/email/handler_spec.rb

+require 'spec_helper'
+
+describe Gitlab::Email::Handler do
+  before do
+    stub_incoming_email_setting(enabled: true, address: "incoming+%{key}@appmail.adventuretime.ooo")
+    stub_config_setting(host: 'localhost')
+  end
+
+  describe '.for' do
+    def handler_for(fixture, mail_key)
+      described_class.for(fixture_file(fixture), mail_key)
+    end
+
+    def ee_handler_for(fixture, mail_key)
+      described_class.for(fixture_file(fixture, dir: 'ee'), mail_key)
+    end
+
+    context 'a Service Desk email' do
+      it 'uses the Service Desk handler when Service Desk is enabled' do
+        allow(License).to receive(:feature_available?).and_call_original
+        allow(License).to receive(:feature_available?).with(:service_desk).and_return(true)
+
+        expect(ee_handler_for('emails/service_desk.eml', 'some/project')).to be_instance_of(Gitlab::Email::Handler::EE::ServiceDeskHandler)
+      end
+
+      it 'uses no handler when Service Desk is disabled' do
+        allow(License).to receive(:feature_available?).and_call_original
+        allow(License).to receive(:feature_available?).with(:service_desk).and_return(false)
+
+        expect(ee_handler_for('emails/service_desk.eml', 'some/project')).to be_nil
+      end
+    end
+
+    context 'a new issue email' do
+      let!(:user) { create(:user, email: 'jake@adventuretime.ooo', incoming_email_token: 'auth_token') }
+
+      it 'uses the create issue handler when Service Desk is enabled' do
+        allow(License).to receive(:feature_available?).and_call_original
+        allow(License).to receive(:feature_available?).with(:service_desk).and_return(true)
+
+        expect(handler_for('emails/valid_new_issue.eml', 'some/project+auth_token')).to be_instance_of(Gitlab::Email::Handler::CreateIssueHandler)
+      end
+
+      it 'uses the create issue handler when Service Desk is disabled' do
+        allow(License).to receive(:feature_available?).and_call_original
+        allow(License).to receive(:feature_available?).with(:service_desk).and_return(false)
+
+        expect(handler_for('emails/valid_new_issue.eml', 'some/project+auth_token')).to be_instance_of(Gitlab::Email::Handler::CreateIssueHandler)
+      end
+    end
+  end
+end