Add latest changes from gitlab-org/gitlab@master

1 files changed, 6 insertions, 12 deletions

diff --git a/spec/lib/feature/gitaly_spec.rb b/spec/lib/feature/gitaly_spec.rb
index 4e07acf9c1a..afb522d05e1 100644
--- a/spec/lib/feature/gitaly_spec.rb
+++ b/spec/lib/feature/gitaly_spec.rb
@@ -5,10 +5,6 @@ require 'spec_helper'
 describe Feature::Gitaly do
   let(:feature_flag) { "mep_mep" }
 
-  before do
-    stub_const("#{described_class}::SERVER_FEATURE_FLAGS", [feature_flag])
-  end
-
   describe ".enabled?" do
     context 'when the gate is closed' do
       before do
@@ -28,15 +24,13 @@ describe Feature::Gitaly do
   end
 
   describe ".server_feature_flags" do
-    context 'when one flag is disabled' do
-      before do
-        stub_feature_flags(gitaly_mep_mep: false)
-      end
+    before do
+      allow(Feature).to receive(:persisted_names).and_return(%w[gitaly_mep_mep foo])
+    end
 
-      subject { described_class.server_feature_flags }
+    subject { described_class.server_feature_flags }
 
-      it { is_expected.to be_a(Hash) }
-      it { is_expected.to eq("gitaly-feature-mep-mep" => "false") }
-    end
+    it { is_expected.to be_a(Hash) }
+    it { is_expected.to eq("gitaly-feature-mep-mep" => "true") }
   end
 end