Add latest changes from gitlab-org/gitlab@14-7-stable-eev14.7.0-rc42

1 files changed, 13 insertions, 14 deletions

diff --git a/spec/models/ci/job_artifact_spec.rb b/spec/models/ci/job_artifact_spec.rb
index 38061e0975f..2e8c41b410a 100644
--- a/spec/models/ci/job_artifact_spec.rb
+++ b/spec/models/ci/job_artifact_spec.rb
@@ -143,6 +143,17 @@ RSpec.describe Ci::JobArtifact do
     end
   end
 
+  describe '.erasable_file_types' do
+    subject { described_class.erasable_file_types }
+
+    it 'returns a list of erasable file types' do
+      all_types = described_class.file_types.keys
+      erasable_types = all_types - described_class::NON_ERASABLE_FILE_TYPES
+
+      expect(subject).to contain_exactly(*erasable_types)
+    end
+  end
+
   describe '.erasable' do
     subject { described_class.erasable }
 
@@ -534,20 +545,8 @@ RSpec.describe Ci::JobArtifact do
       context 'when the artifact is a trace' do
         let(:file_type) { :trace }
 
-        context 'when ci_store_trace_outside_transaction is enabled' do
-          it 'returns true' do
-            expect(artifact.store_after_commit?).to be_truthy
-          end
-        end
-
-        context 'when ci_store_trace_outside_transaction is disabled' do
-          before do
-            stub_feature_flags(ci_store_trace_outside_transaction: false)
-          end
-
-          it 'returns false' do
-            expect(artifact.store_after_commit?).to be_falsey
-          end
+        it 'returns true' do
+          expect(artifact.store_after_commit?).to be_truthy
         end
       end