1 files changed, 6 insertions, 23 deletions
diff --git a/spec/initializers/omniauth_spec.rb b/spec/initializers/omniauth_spec.rb
index 928eac8c533..f0a73162dd2 100644
--- a/spec/initializers/omniauth_spec.rb
+++ b/spec/initializers/omniauth_spec.rb
@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 RSpec.describe 'OmniAuth initializer for GitLab' do
-  let(:load_omniauth_initializer) do
+  def load_omniauth_initializer
     load Rails.root.join('config/initializers/omniauth.rb')
   end
 
@@ -15,32 +15,15 @@ RSpec.describe 'OmniAuth initializer for GitLab' do
     before do
       allow(Settings).to receive(:gitlab).and_return({ 'base_url' => base_url })
       allow(Gitlab::OmniauthInitializer).to receive(:full_host).and_return('proc')
-    end
-
-    context 'with feature flags not available' do
-      before do
-        expect(Feature).to receive(:feature_flags_available?).and_return(false)
-        load_omniauth_initializer
-      end
 
-      it { is_expected.to eq(base_url) }
+      load_omniauth_initializer
     end
 
-    context 'with the omniauth_initializer_fullhost_proc FF disabled' do
-      before do
-        stub_feature_flags(omniauth_initializer_fullhost_proc: false)
-        load_omniauth_initializer
-      end
-
-      it { is_expected.to eq(base_url) }
+    # to clear existing mocks and prevent order-dependent failures
+    after(:all) do
+      load_omniauth_initializer
     end
 
-    context 'with the omniauth_initializer_fullhost_proc FF disabled' do
-      before do
-        load_omniauth_initializer
-      end
-
-      it { is_expected.to eq('proc') }
-    end
+    it { is_expected.to eq('proc') }
   end
 end