diff options
author | Yorick Peterse <yorickpeterse@gmail.com> | 2019-08-01 14:41:37 +0200 |
---|---|---|
committer | Yorick Peterse <yorickpeterse@gmail.com> | 2019-08-01 16:10:05 +0200 |
commit | 27194e08525fa2ef43aa9f3dbfda378a7b1258bd (patch) | |
tree | a52885aebbffa2da5b782e24f8eb038a55d2e045 | |
parent | 252a0b0faa07160214e46e696cbfb0761e6f2a3d (diff) | |
download | gitlab-ce-backport-fix-remaining-prepend-lines.tar.gz |
Support X_if_ee methods for QA testsbackport-fix-remaining-prepend-lines
For the QA tests to use the new injection methods, we must require the
initializer and ensure that the "constantize" method is available.
-rw-r--r-- | config/initializers/0_inject_enterprise_edition_module.rb | 2 | ||||
-rw-r--r-- | qa/qa.rb | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/config/initializers/0_inject_enterprise_edition_module.rb b/config/initializers/0_inject_enterprise_edition_module.rb index 4b21732e179..39595e23abe 100644 --- a/config/initializers/0_inject_enterprise_edition_module.rb +++ b/config/initializers/0_inject_enterprise_edition_module.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require 'active_support/inflector' + module InjectEnterpriseEditionModule def prepend_if_ee(constant) prepend(constant.constantize) if Gitlab.ee? @@ -4,6 +4,9 @@ $: << File.expand_path(File.dirname(__FILE__)) Encoding.default_external = 'UTF-8' +require_relative '../lib/gitlab' +require_relative '../config/initializers/0_inject_enterprise_edition_module' + module QA ## # GitLab QA runtime classes, mostly singletons. |