Add latest changes from gitlab-org/gitlab@master

1 files changed, 7 insertions, 4 deletions

diff --git a/spec/lib/gitlab/config/entry/factory_spec.rb b/spec/lib/gitlab/config/entry/factory_spec.rb
index a614ef56a78..81ca5f2cba1 100644
--- a/spec/lib/gitlab/config/entry/factory_spec.rb
+++ b/spec/lib/gitlab/config/entry/factory_spec.rb
@@ -4,11 +4,14 @@ require 'spec_helper'
 
 describe Gitlab::Config::Entry::Factory do
   describe '#create!' do
-    class Script < Gitlab::Config::Entry::Node
-      include Gitlab::Config::Entry::Validatable
+    before do
+      stub_const('Script', Class.new(Gitlab::Config::Entry::Node))
+      Script.class_eval do
+        include Gitlab::Config::Entry::Validatable
 
-      validations do
-        validates :config, array_of_strings: true
+        validations do
+          validates :config, array_of_strings: true
+        end
       end
     end