Commit 41061863 authored by Yorick Peterse's avatar Yorick Peterse

Resolve a few remaining CE/EE differences

parent b2536f27
...@@ -4,7 +4,7 @@ require 'spec_helper' ...@@ -4,7 +4,7 @@ require 'spec_helper'
require Rails.root.join('ee', 'spec', 'db', 'schema_support') if Gitlab.ee? require Rails.root.join('ee', 'spec', 'db', 'schema_support') if Gitlab.ee?
describe 'Database schema' do describe 'Database schema' do
prepend ::EE::DB::SchemaSupport prepend_if_ee('EE::DB::SchemaSupport')
let(:connection) { ActiveRecord::Base.connection } let(:connection) { ActiveRecord::Base.connection }
let(:tables) { connection.tables } let(:tables) { connection.tables }
......
...@@ -32,7 +32,7 @@ end ...@@ -32,7 +32,7 @@ end
require 'rainbow/ext/string' require 'rainbow/ext/string'
Rainbow.enabled = false Rainbow.enabled = false
require_relative '../ee/spec/spec_helper' require_relative('../ee/spec/spec_helper') if Gitlab.ee?
# Requires supporting ruby files with custom matchers and macros, etc, # Requires supporting ruby files with custom matchers and macros, etc,
# in spec/support/ and its subdirectories. # in spec/support/ and its subdirectories.
......
...@@ -420,7 +420,7 @@ module TestEnv ...@@ -420,7 +420,7 @@ module TestEnv
end end
end end
require_relative '../../../ee/spec/support/helpers/ee/test_env' require_relative('../../../ee/spec/support/helpers/ee/test_env') if Gitlab.ee?
::TestEnv.prepend_if_ee('::EE::TestEnv') ::TestEnv.prepend_if_ee('::EE::TestEnv')
::TestEnv.extend_if_ee('::EE::TestEnv') ::TestEnv.extend_if_ee('::EE::TestEnv')
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