diff options
| author | Rémy Coutable <remy@rymai.me> | 2019-04-10 17:05:41 +0000 |
|---|---|---|
| committer | Rémy Coutable <remy@rymai.me> | 2019-04-10 17:05:41 +0000 |
| commit | ddab30ad3561c6834fd779458ce89084c8a95ca5 (patch) | |
| tree | bae28f15b3486e0f616491de33a5ebbff9d8dbd4 /spec | |
| parent | 909750629a89da5431faf90f491b274cff6855a1 (diff) | |
| parent | 97552924d0491dc10c3569e606a151ec13cd8bea (diff) | |
| download | gitlab-ce-ddab30ad3561c6834fd779458ce89084c8a95ca5.tar.gz | |
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
Diffstat (limited to 'spec')
| -rw-r--r-- | spec/support/helpers/stub_configuration.rb | 3 | ||||
| -rw-r--r-- | spec/support/helpers/stub_object_storage.rb | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/spec/support/helpers/stub_configuration.rb b/spec/support/helpers/stub_configuration.rb index cfa9151b2d7..3e507fb133e 100644 --- a/spec/support/helpers/stub_configuration.rb +++ b/spec/support/helpers/stub_configuration.rb @@ -120,3 +120,6 @@ module StubConfiguration end end end + +require_relative '../../../ee/spec/support/helpers/ee/stub_configuration' if + Dir.exist?("#{__dir__}/../../../ee") diff --git a/spec/support/helpers/stub_object_storage.rb b/spec/support/helpers/stub_object_storage.rb index 30c8477f16a..d31f9908714 100644 --- a/spec/support/helpers/stub_object_storage.rb +++ b/spec/support/helpers/stub_object_storage.rb @@ -73,3 +73,6 @@ module StubObjectStorage EOS end end + +require_relative '../../../ee/spec/support/helpers/ee/stub_object_storage' if + Dir.exist?("#{__dir__}/../../../ee") |