Add latest changes from gitlab-org/gitlab@15-1-stable-eev15.1.0-rc42

1 files changed, 1 insertions, 13 deletions

diff --git a/spec/lib/gitlab/ci/jwt_spec.rb b/spec/lib/gitlab/ci/jwt_spec.rb
index b0d6f5adfb1..179e2efc0c7 100644
--- a/spec/lib/gitlab/ci/jwt_spec.rb
+++ b/spec/lib/gitlab/ci/jwt_spec.rb
@@ -160,20 +160,8 @@ RSpec.describe Gitlab::Ci::Jwt do
 
     subject(:jwt) { described_class.for_build(build) }
 
-    context 'when ci_jwt_signing_key feature flag is disabled' do
+    context 'when ci_jwt_signing_key is present' do
       before do
-        stub_feature_flags(ci_jwt_signing_key: false)
-
-        allow(Rails.application.secrets).to receive(:openid_connect_signing_key).and_return(rsa_key_data)
-      end
-
-      it_behaves_like 'generating JWT for build'
-    end
-
-    context 'when ci_jwt_signing_key feature flag is enabled' do
-      before do
-        stub_feature_flags(ci_jwt_signing_key: true)
-
         stub_application_setting(ci_jwt_signing_key: rsa_key_data)
       end