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

1 files changed, 2 insertions, 8 deletions

diff --git a/spec/lib/gitlab/chat_spec.rb b/spec/lib/gitlab/chat_spec.rb
index 08cc16314c5..be606fe6db1 100644
--- a/spec/lib/gitlab/chat_spec.rb
+++ b/spec/lib/gitlab/chat_spec.rb
@@ -5,19 +5,13 @@ require 'spec_helper'
 describe Gitlab::Chat, :use_clean_rails_memory_store_caching do
   describe '.available?' do
     it 'returns true when the chatops feature is available' do
-      allow(Feature)
-        .to receive(:enabled?)
-        .with(:chatops, default_enabled: true)
-        .and_return(true)
+      stub_feature_flags(chatops: true)
 
       expect(described_class).to be_available
     end
 
     it 'returns false when the chatops feature is not available' do
-      allow(Feature)
-        .to receive(:enabled?)
-        .with(:chatops, default_enabled: true)
-        .and_return(false)
+      stub_feature_flags(chatops: false)
 
       expect(described_class).not_to be_available
     end