From 9ea71988f763e488f25a5abef4995aa0b62de2cb Mon Sep 17 00:00:00 2001
From: GitLab Bot <gitlab-bot@gitlab.com>
Date: Sun, 24 Nov 2024 15:25:33 +0000
Subject: [PATCH] Add latest changes from gitlab-org/gitlab@master

---
 spec/lib/ci/job_token/jwt/decode_spec.rb | 1 +
 spec/lib/gitlab/auth_spec.rb             | 4 ++++
 spec/models/ci/build_spec.rb             | 1 +
 spec/spec_helper.rb                      | 4 ++++
 4 files changed, 10 insertions(+)

diff --git a/spec/lib/ci/job_token/jwt/decode_spec.rb b/spec/lib/ci/job_token/jwt/decode_spec.rb
index c6d6c2989cd..8104354e497 100644
--- a/spec/lib/ci/job_token/jwt/decode_spec.rb
+++ b/spec/lib/ci/job_token/jwt/decode_spec.rb
@@ -17,6 +17,7 @@ RSpec.describe ::Ci::JobToken::Jwt::Decode, feature_category: :continuous_integr
   end
 
   before do
+    stub_feature_flags(ci_job_token_jwt: true)
     allow(::Ci::JobToken::Jwt::Encode).to receive(:key).and_return(key)
     allow(described_class).to receive(:key).and_return(key)
   end
diff --git a/spec/lib/gitlab/auth_spec.rb b/spec/lib/gitlab/auth_spec.rb
index 742cee67863..4a8c6013930 100644
--- a/spec/lib/gitlab/auth_spec.rb
+++ b/spec/lib/gitlab/auth_spec.rb
@@ -1043,6 +1043,10 @@ RSpec.describe Gitlab::Auth, :use_clean_rails_memory_store_caching, feature_cate
 
     let_it_be(:user) { create(:user) }
 
+    before do
+      stub_feature_flags(ci_job_token_jwt: true)
+    end
+
     context 'for running build' do
       let!(:build) { create(:ci_build, :running, user: user) }
 
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index 97dcc3e3009..48a91b69a1e 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -6125,6 +6125,7 @@ RSpec.describe Ci::Build, feature_category: :continuous_integration, factory_def
     let(:token) { 'my-token' }
 
     before do
+      stub_feature_flags(ci_job_token_jwt: true)
       allow_next_instance_of(::Ci::JobToken::Jwt::Encode, build) do |encode|
         allow(encode).to receive(:jwt).and_return(token)
       end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 5eac6f968db..6ed9c88779b 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -356,6 +356,10 @@ RSpec.configure do |config|
       # Our test suite is setup to test plain text editor by default with separate tests just
       # for the rich text editor. Switch the flag off to continue testing the same way as before
       stub_feature_flags(rich_text_editor_as_default: false)
+
+      # TODO: temporary measure to unblock master
+      # issue: https://gitlab.com/gitlab-org/quality/engineering-productivity/master-broken-incidents/-/issues/9437
+      stub_feature_flags(ci_job_token_jwt: false)
     else
       unstub_all_feature_flags
     end