From 27194e08525fa2ef43aa9f3dbfda378a7b1258bd Mon Sep 17 00:00:00 2001 From: Yorick Peterse Date: Thu, 1 Aug 2019 14:41:37 +0200 Subject: Support X_if_ee methods for QA tests For the QA tests to use the new injection methods, we must require the initializer and ensure that the "constantize" method is available. --- config/initializers/0_inject_enterprise_edition_module.rb | 2 ++ qa/qa.rb | 3 +++ 2 files changed, 5 insertions(+) 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? diff --git a/qa/qa.rb b/qa/qa.rb index 18fb4509dce..8be2a289422 100644 --- a/qa/qa.rb +++ b/qa/qa.rb @@ -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. -- cgit v1.2.1