Add latest changes from gitlab-org/gitlab@master

1 files changed, 16 insertions, 10 deletions

diff --git a/spec/mailers/notify_spec.rb b/spec/mailers/notify_spec.rb
index bae92b78a24..684fe9bb9cf 100644
--- a/spec/mailers/notify_spec.rb
+++ b/spec/mailers/notify_spec.rb
@@ -649,16 +649,20 @@ RSpec.describe Notify do
       end
 
       context 'the model has no namespace' do
-        class TopLevelThing
-          include Referable
-          include Noteable
+        before do
+          stub_const('TopLevelThing', Class.new)
 
-          def to_reference(*_args)
-            'tlt-ref'
-          end
+          TopLevelThing.class_eval do
+            include Referable
+            include Noteable
 
-          def id
-            'tlt-id'
+            def to_reference(*_args)
+              'tlt-ref'
+            end
+
+            def id
+              'tlt-id'
+            end
           end
         end
 
@@ -672,8 +676,10 @@ RSpec.describe Notify do
       end
 
       context 'the model has a namespace' do
-        module Namespaced
-          class Thing
+        before do
+          stub_const('Namespaced::Thing', Class.new)
+
+          Namespaced::Thing.class_eval do
             include Referable
             include Noteable