Merge branch 'ee-resolve-more-ce-ee-differences' into 'master'

Resolve a few remaining CE/EE differences

Closes #14063

See merge request gitlab-org/gitlab-ee!15893

spec/db/schema_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 require Rails.root.join('ee', 'spec', 'db', 'schema_support') if Gitlab.ee?
 
 describe 'Database schema' do
-  prepend ::EE::DB::SchemaSupport
+  prepend_if_ee('EE::DB::SchemaSupport')
 
   let(:connection) { ActiveRecord::Base.connection }
   let(:tables) { connection.tables }

spec/spec_helper.rb

@@ -32,7 +32,7 @@ end
 require 'rainbow/ext/string'
 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,
 # in spec/support/ and its subdirectories.

spec/support/helpers/test_env.rb

@@ -420,7 +420,7 @@ module TestEnv
   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.extend_if_ee('::EE::TestEnv')