1 files changed, 72 insertions, 8 deletions
diff --git a/spec/models/ci/build_spec.rb b/spec/models/ci/build_spec.rb
index c978e33bf54..dd1fbd7d0d5 100644
--- a/spec/models/ci/build_spec.rb
+++ b/spec/models/ci/build_spec.rb
@@ -1136,6 +1136,19 @@ RSpec.describe Ci::Build, feature_category: :continuous_integration do
           it do
             is_expected.to all(a_hash_including(key: a_string_matching(/-protected$/)))
           end
+
+          context 'and the cache has the `unprotect` option' do
+            let(:options) do
+              { cache: [
+                { key: "key", paths: ["public"], policy: "pull-push", unprotect: true },
+                { key: "key2", paths: ["public"], policy: "pull-push", unprotect: true }
+              ] }
+            end
+
+            it do
+              is_expected.to all(a_hash_including(key: a_string_matching(/-non_protected$/)))
+            end
+          end
         end
 
         context 'when pipeline is not on a protected ref' do
@@ -3533,6 +3546,52 @@ RSpec.describe Ci::Build, feature_category: :continuous_integration do
       end
     end
 
+    context 'for the apple_app_store integration' do
+      let_it_be(:apple_app_store_integration) { create(:apple_app_store_integration) }
+
+      let(:apple_app_store_variables) do
+        [
+          { key: 'APP_STORE_CONNECT_API_KEY_ISSUER_ID', value: apple_app_store_integration.app_store_issuer_id, masked: true, public: false },
+          { key: 'APP_STORE_CONNECT_API_KEY_KEY', value: Base64.encode64(apple_app_store_integration.app_store_private_key), masked: true, public: false },
+          { key: 'APP_STORE_CONNECT_API_KEY_KEY_ID', value: apple_app_store_integration.app_store_key_id, masked: true, public: false }
+        ]
+      end
+
+      context 'when the apple_app_store exists' do
+        context 'when a build is protected' do
+          before do
+            allow(build.pipeline).to receive(:protected_ref?).and_return(true)
+            build.project.update!(apple_app_store_integration: apple_app_store_integration)
+          end
+
+          it 'includes apple_app_store variables' do
+            is_expected.to include(*apple_app_store_variables)
+          end
+        end
+
+        context 'when a build is not protected' do
+          before do
+            allow(build.pipeline).to receive(:protected_ref?).and_return(false)
+            build.project.update!(apple_app_store_integration: apple_app_store_integration)
+          end
+
+          it 'does not include the apple_app_store variables' do
+            expect(subject.find { |v| v[:key] == 'APP_STORE_CONNECT_API_KEY_ISSUER_ID' }).to be_nil
+            expect(subject.find { |v| v[:key] == 'APP_STORE_CONNECT_API_KEY_KEY' }).to be_nil
+            expect(subject.find { |v| v[:key] == 'APP_STORE_CONNECT_API_KEY_KEY_ID' }).to be_nil
+          end
+        end
+      end
+
+      context 'when the apple_app_store integration does not exist' do
+        it 'does not include apple_app_store variables' do
+          expect(subject.find { |v| v[:key] == 'APP_STORE_CONNECT_API_KEY_ISSUER_ID' }).to be_nil
+          expect(subject.find { |v| v[:key] == 'APP_STORE_CONNECT_API_KEY_KEY' }).to be_nil
+          expect(subject.find { |v| v[:key] == 'APP_STORE_CONNECT_API_KEY_KEY_ID' }).to be_nil
+        end
+      end
+    end
+
     context 'when build has dependency which has dotenv variable' do
       let!(:prepare) { create(:ci_build, pipeline: pipeline, stage_idx: 0) }
       let!(:build) { create(:ci_build, pipeline: pipeline, stage_idx: 1, options: { dependencies: [prepare.name] }) }
@@ -5664,17 +5723,22 @@ RSpec.describe Ci::Build, feature_category: :continuous_integration do
 
       expect(prefix).to eq(ci_testing_partition_id)
     end
+  end
 
-    context 'when ci_build_partition_id_token_prefix is disabled' do
-      before do
-        stub_feature_flags(ci_build_partition_id_token_prefix: false)
-      end
+  describe '#remove_token!' do
+    it 'removes the token' do
+      expect(build.token).to be_present
 
-      it 'does not include partition_id as a token prefix' do
-        prefix = ci_build.token.split('_').first.to_i(16)
+      build.remove_token!
 
-        expect(prefix).not_to eq(ci_testing_partition_id)
-      end
+      expect(build.token).to be_nil
+      expect(build.changes).to be_empty
+    end
+
+    it 'does not remove the token when FF is disabled' do
+      stub_feature_flags(remove_job_token_on_completion: false)
+
+      expect { build.remove_token! }.not_to change(build, :token)
     end
   end
 end