From 6aa215aaea146f21eb5a88a511f7bbe84ad31ef5 Mon Sep 17 00:00:00 2001
From: Yorick Peterse <yorickpeterse@gmail.com>
Date: Thu, 1 Aug 2019 14:41:37 +0200
Subject: [PATCH] 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 4b21732e1797d..39595e23abec5 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 18fb4509dce0d..8be2a28942271 100644
--- a/qa/qa.rb
+++ b/qa/qa.rb
@@ -4,6 +4,9 @@
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.
--
GitLab