Merge branch 'ce-10834-support-fast-unit-tests-in-ee' into 'master'

CE: Resolve "Support fast unit tests in EE" See merge request gitlab-org/gitlab-ce!26861

Merge branch 'ce-10834-support-fast-unit-tests-in-ee' into 'master'
CE: Resolve "Support fast unit tests in EE" See merge request gitlab-org/gitlab-ce!26861
ddab30ad · Rémy Coutable · 90975062 · 97552924 · ddab30ad · ddab30ad
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -561,6 +561,11 @@ rspec-mysql:
  <<: *only-schedules-master
  parallel: 50

+rspec-fast-spec-helper:
+  <<: *rspec-metadata-pg
+  script:
+    - bundle exec rspec spec/fast_spec_helper.rb
+
 .rspec-quarantine: &rspec-quarantine
  <<: *only-schedules-master
  script:

--- a/spec/support/helpers/stub_configuration.rb
+++ b/spec/support/helpers/stub_configuration.rb
@@ -120,3 +120,6 @@ def to_settings(hash)
    end
  end
 end
+
+require_relative '../../../ee/spec/support/helpers/ee/stub_configuration' if
+  Dir.exist?("#{__dir__}/../../../ee")
--- a/spec/support/helpers/stub_object_storage.rb
+++ b/spec/support/helpers/stub_object_storage.rb
@@ -73,3 +73,6 @@ def stub_object_storage_multipart_init(endpoint, upload_id = "upload_id")
      EOS
  end
 end
+
+require_relative '../../../ee/spec/support/helpers/ee/stub_object_storage' if
+  Dir.exist?("#{__dir__}/../../../ee")