From d99e540c16469ca95ef8580cd7ea4e215df8ff7e Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Tue, 2 Apr 2019 20:53:46 +0800 Subject: Add a test for fast_spec_helper --- .gitlab-ci.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9febc15e84a..8f80f1656d6 100644 --- 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: -- cgit v1.2.1 From 97552924d0491dc10c3569e606a151ec13cd8bea Mon Sep 17 00:00:00 2001 From: Lin Jen-Shin Date: Wed, 10 Apr 2019 23:46:16 +0800 Subject: Require possible EE extension --- spec/support/helpers/stub_configuration.rb | 3 +++ spec/support/helpers/stub_object_storage.rb | 3 +++ 2 files changed, 6 insertions(+) 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") -- cgit v1.2.1