Add latest changes from gitlab-org/gitlab@13-1-stable-ee

1 files changed, 13 insertions, 8 deletions

diff --git a/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb b/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb
index 3b15d804d7c..4a711b43d9a 100644
--- a/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb
+++ b/spec/support_specs/matchers/exceed_query_limit_helpers_spec.rb
@@ -3,16 +3,21 @@
 require 'spec_helper'
 
 describe ExceedQueryLimitHelpers do
-  class TestQueries < ActiveRecord::Base
-    self.table_name = 'schema_migrations'
-  end
+  before do
+    stub_const('TestQueries', Class.new(ActiveRecord::Base))
+    stub_const('TestMatcher', Class.new)
+
+    TestQueries.class_eval do
+      self.table_name = 'schema_migrations'
+    end
 
-  class TestMatcher
-    include ExceedQueryLimitHelpers
+    TestMatcher.class_eval do
+      include ExceedQueryLimitHelpers
 
-    def expected
-      ActiveRecord::QueryRecorder.new do
-        2.times { TestQueries.count }
+      def expected
+        ActiveRecord::QueryRecorder.new do
+          2.times { TestQueries.count }
+        end
       end
     end
   end