Add latest changes from gitlab-org/gitlab@15-6-stable-eev15.6.0-rc42

1 files changed, 23 insertions, 1 deletions

diff --git a/spec/lib/gitlab/feature_categories_spec.rb b/spec/lib/gitlab/feature_categories_spec.rb
index 477da900d0a..a35166a4499 100644
--- a/spec/lib/gitlab/feature_categories_spec.rb
+++ b/spec/lib/gitlab/feature_categories_spec.rb
@@ -5,7 +5,7 @@ require 'spec_helper'
 RSpec.describe Gitlab::FeatureCategories do
   let(:fake_categories) { %w(foo bar) }
 
-  subject { described_class.new(fake_categories) }
+  subject(:feature_categories) { described_class.new(fake_categories) }
 
   describe "#valid?" do
     it "returns true if category is known", :aggregate_failures do
@@ -14,6 +14,28 @@ RSpec.describe Gitlab::FeatureCategories do
     end
   end
 
+  describe '#get!' do
+    subject { feature_categories.get!(category) }
+
+    let(:category) { 'foo' }
+
+    it { is_expected.to eq('foo') }
+
+    context 'when category does not exist' do
+      let(:category) { 'zzz' }
+
+      it { expect { subject }.to raise_error(RuntimeError) }
+
+      context 'when on production' do
+        before do
+          allow(Gitlab).to receive(:dev_or_test_env?).and_return(false)
+        end
+
+        it { is_expected.to eq('unknown') }
+      end
+    end
+  end
+
   describe "#from_request" do
     let(:request_env) { {} }
     let(:verified) { true }