Commit ddab30ad authored by Rémy Coutable's avatar Rémy Coutable

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
parents 90975062 97552924
...@@ -561,6 +561,11 @@ rspec-mysql: ...@@ -561,6 +561,11 @@ rspec-mysql:
<<: *only-schedules-master <<: *only-schedules-master
parallel: 50 parallel: 50
rspec-fast-spec-helper:
<<: *rspec-metadata-pg
script:
- bundle exec rspec spec/fast_spec_helper.rb
.rspec-quarantine: &rspec-quarantine .rspec-quarantine: &rspec-quarantine
<<: *only-schedules-master <<: *only-schedules-master
script: script:
......
...@@ -120,3 +120,6 @@ module StubConfiguration ...@@ -120,3 +120,6 @@ module StubConfiguration
end end
end end
end end
require_relative '../../../ee/spec/support/helpers/ee/stub_configuration' if
Dir.exist?("#{__dir__}/../../../ee")
...@@ -73,3 +73,6 @@ module StubObjectStorage ...@@ -73,3 +73,6 @@ module StubObjectStorage
EOS EOS
end end
end end
require_relative '../../../ee/spec/support/helpers/ee/stub_object_storage' if
Dir.exist?("#{__dir__}/../../../ee")
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment