Add latest changes from gitlab-org/gitlab@master

1 files changed, 3 insertions, 3 deletions

diff --git a/spec/lib/gitlab/config/entry/simplifiable_spec.rb b/spec/lib/gitlab/config/entry/simplifiable_spec.rb
index 65e18fe3f10..5c208cab449 100644
--- a/spec/lib/gitlab/config/entry/simplifiable_spec.rb
+++ b/spec/lib/gitlab/config/entry/simplifiable_spec.rb
@@ -24,9 +24,9 @@ describe Gitlab::Config::Entry::Simplifiable do
     let(:unknown) { double('unknown strategy') }
 
     before do
-      stub_const("#{described_class.name}::Something", first)
-      stub_const("#{described_class.name}::DifferentOne", second)
-      stub_const("#{described_class.name}::UnknownStrategy", unknown)
+      entry::Something = first
+      entry::DifferentOne = second
+      entry::UnknownStrategy = unknown
     end
 
     context 'when first strategy should be used' do