Commit 4763866d authored by Rémy Coutable's avatar Rémy Coutable

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

Resolve "Support fast unit tests in EE"

Closes #10834

See merge request gitlab-org/gitlab-ee!10544
parents 9e5e00be 40d5817a
...@@ -684,6 +684,11 @@ rspec-mysql: ...@@ -684,6 +684,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:
......
...@@ -121,4 +121,7 @@ module StubConfiguration ...@@ -121,4 +121,7 @@ module StubConfiguration
end end
end end
require_relative '../../../ee/spec/support/helpers/ee/stub_configuration' if
Dir.exist?("#{__dir__}/../../../ee")
StubConfiguration.prepend(EE::StubConfiguration) StubConfiguration.prepend(EE::StubConfiguration)
...@@ -74,4 +74,7 @@ module StubObjectStorage ...@@ -74,4 +74,7 @@ module StubObjectStorage
end end
end end
require_relative '../../../ee/spec/support/helpers/ee/stub_object_storage' if
Dir.exist?("#{__dir__}/../../../ee")
StubObjectStorage.prepend(EE::StubObjectStorage) StubObjectStorage.prepend(EE::StubObjectStorage)
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