1 files changed, 19 insertions, 9 deletions
diff --git a/spec/models/ci/job_artifact_spec.rb b/spec/models/ci/job_artifact_spec.rb
index 594211c288f..4474df73434 100644
--- a/spec/models/ci/job_artifact_spec.rb
+++ b/spec/models/ci/job_artifact_spec.rb
@@ -90,25 +90,35 @@ describe Ci::JobArtifact do
   describe 'validates file format' do
     subject { artifact.valid? }
 
-    let(:artifact) { build(:ci_job_artifact, file_format: file_format) }
-
-    context 'when file format is present' do
-      let(:file_format) { :raw }
+    context 'when archive type with zip format' do
+      let(:artifact) { build(:ci_job_artifact, :archive, file_format: :zip) }
 
       it { is_expected.to be_truthy }
     end
 
-    context 'when file format is not defined' do
-      let(:file_format) { :new_format }
+    context 'when archive type with gzip format' do
+      let(:artifact) { build(:ci_job_artifact, :archive, file_format: :gzip) }
+
+      it { is_expected.to be_falsy }
+    end
+
+    context 'when archive type without format specification' do
+      let(:artifact) { build(:ci_job_artifact, :archive, file_format: nil) }
 
-      it { expect { subject }.to raise_error(ArgumentError) }
+      it { is_expected.to be_falsy }
     end
 
-    context 'when file format is not present' do
-      let(:file_format) { nil }
+    context 'when junit type with zip format' do
+      let(:artifact) { build(:ci_job_artifact, :junit, file_format: :zip) }
 
       it { is_expected.to be_falsy }
     end
+
+    context 'when junit type with gzip format' do
+      let(:artifact) { build(:ci_job_artifact, :junit, file_format: :gzip) }
+
+      it { is_expected.to be_truthy }
+    end
   end
 
   describe '#file' do