Merge branch '211795-fix-flaky-test' into 'master'

Fix a test that only pass on retry

Closes #211795

See merge request gitlab-org/gitlab!27584

ee/spec/controllers/groups/billings_controller_spec.rb

@@ -9,7 +9,7 @@ describe Groups::BillingsController do
   describe 'GET index' do
     before do
       stub_application_setting(check_namespace_plan: true)
-      allow(Gitlab).to receive(:dev_env_org_or_com?) { true }
+      allow(Gitlab::CurrentSettings).to receive(:should_check_namespace_plan?) { true }
     end
 
     context 'authorized' do
@@ -48,7 +48,7 @@ describe Groups::BillingsController do
       end
 
       it 'renders 404 when it is not gitlab.com' do
-        allow(Gitlab).to receive(:dev_env_org_or_com?) { false }
+        expect(Gitlab::CurrentSettings).to receive(:should_check_namespace_plan?).at_least(:once) { false }
         group.add_owner(user)
         sign_in(user)