1 files changed, 52 insertions, 87 deletions
diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb
index dd31a677dfe..347ac13828c 100644
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
@@ -21,76 +21,57 @@ describe Projects::UpdatePagesService do
   end
 
   context 'legacy artifacts' do
-    %w(tar.gz zip).each do |format|
-      let(:extension) { format }
+    let(:extension) { 'zip' }
 
-      context "for valid #{format}" do
-        before do
-          build.update_attributes(legacy_artifacts_file: file)
-          build.update_attributes(legacy_artifacts_metadata: metadata)
-        end
-
-        describe 'pages artifacts' do
-          context 'with expiry date' do
-            before do
-              build.artifacts_expire_in = "2 days"
-              build.save!
-            end
-
-            it "doesn't delete artifacts" do
-              expect(execute).to eq(:success)
-
-              expect(build.reload.artifacts?).to eq(true)
-            end
-          end
+    before do
+      build.update_attributes(legacy_artifacts_file: file)
+      build.update_attributes(legacy_artifacts_metadata: metadata)
+    end
 
-          context 'without expiry date' do
-            it "does delete artifacts" do
-              expect(execute).to eq(:success)
+    describe 'pages artifacts' do
+      it "doesn't delete artifacts after deploying" do
+        expect(execute).to eq(:success)
 
-              expect(build.reload.artifacts?).to eq(false)
-            end
-          end
-        end
+        expect(build.reload.artifacts?).to eq(true)
+      end
+    end
 
-        it 'succeeds' do
-          expect(project.pages_deployed?).to be_falsey
-          expect(execute).to eq(:success)
-          expect(project.pages_deployed?).to be_truthy
+    it 'succeeds' do
+      expect(project.pages_deployed?).to be_falsey
+      expect(execute).to eq(:success)
+      expect(project.pages_deployed?).to be_truthy
 
-          # Check that all expected files are extracted
-          %w[index.html zero .hidden/file].each do |filename|
-            expect(File.exist?(File.join(project.public_pages_path, filename))).to be_truthy
-          end
-        end
+      # Check that all expected files are extracted
+      %w[index.html zero .hidden/file].each do |filename|
+        expect(File.exist?(File.join(project.public_pages_path, filename))).to be_truthy
+      end
+    end
 
-        it 'limits pages size' do
-          stub_application_setting(max_pages_size: 1)
-          expect(execute).not_to eq(:success)
-        end
+    it 'limits pages size' do
+      stub_application_setting(max_pages_size: 1)
+      expect(execute).not_to eq(:success)
+    end
 
-        it 'removes pages after destroy' do
-          expect(PagesWorker).to receive(:perform_in)
-          expect(project.pages_deployed?).to be_falsey
-          expect(execute).to eq(:success)
-          expect(project.pages_deployed?).to be_truthy
-          project.destroy
-          expect(project.pages_deployed?).to be_falsey
-        end
+    it 'removes pages after destroy' do
+      expect(PagesWorker).to receive(:perform_in)
+      expect(project.pages_deployed?).to be_falsey
+      expect(execute).to eq(:success)
+      expect(project.pages_deployed?).to be_truthy
+      project.destroy
+      expect(project.pages_deployed?).to be_falsey
+    end
 
-        it 'fails if sha on branch is not latest' do
-          build.update_attributes(ref: 'feature')
+    it 'fails if sha on branch is not latest' do
+      build.update_attributes(ref: 'feature')
 
-          expect(execute).not_to eq(:success)
-        end
+      expect(execute).not_to eq(:success)
+    end
 
-        it 'fails for empty file fails' do
-          build.update_attributes(legacy_artifacts_file: empty_file)
+    it 'fails for empty file fails' do
+      build.update_attributes(legacy_artifacts_file: empty_file)
 
-          expect { execute }
-            .to raise_error(Projects::UpdatePagesService::FailedToExtractError)
-        end
-      end
+      expect { execute }
+        .to raise_error(Projects::UpdatePagesService::FailedToExtractError)
     end
   end
 
@@ -104,25 +85,10 @@ describe Projects::UpdatePagesService do
       end
 
       describe 'pages artifacts' do
-        context 'with expiry date' do
-          before do
-            build.artifacts_expire_in = "2 days"
-            build.save!
-          end
-
-          it "doesn't delete artifacts" do
-            expect(execute).to eq(:success)
-
-            expect(build.artifacts?).to eq(true)
-          end
-        end
-
-        context 'without expiry date' do
-          it "does delete artifacts" do
-            expect(execute).to eq(:success)
+        it "doesn't delete artifacts after deploying" do
+          expect(execute).to eq(:success)
 
-            expect(build.reload.artifacts?).to eq(false)
-          end
+          expect(build.artifacts?).to eq(true)
         end
       end
 
@@ -157,11 +123,13 @@ describe Projects::UpdatePagesService do
         expect(execute).not_to eq(:success)
       end
 
-      it 'fails for empty file fails' do
-        build.job_artifacts_archive.update_attributes(file: empty_file)
+      context 'when using empty file' do
+        let(:file) { empty_file }
 
-        expect { execute }
-          .to raise_error(Projects::UpdatePagesService::FailedToExtractError)
+        it 'fails to extract' do
+          expect { execute }
+            .to raise_error(Projects::UpdatePagesService::FailedToExtractError)
+        end
       end
 
       context 'when timeout happens by DNS error' do
@@ -175,13 +143,12 @@ describe Projects::UpdatePagesService do
 
           build.reload
           expect(deploy_status).to be_failed
-          expect(build.artifacts?).to be_truthy
         end
       end
 
       context 'when failed to extract zip artifacts' do
         before do
-          allow_any_instance_of(described_class)
+          expect_any_instance_of(described_class)
             .to receive(:extract_zip_archive!)
             .and_raise(Projects::UpdatePagesService::FailedToExtractError)
         end
@@ -192,21 +159,19 @@ describe Projects::UpdatePagesService do
 
           build.reload
           expect(deploy_status).to be_failed
-          expect(build.artifacts?).to be_truthy
         end
       end
 
       context 'when missing artifacts metadata' do
         before do
-          allow(build).to receive(:artifacts_metadata?).and_return(false)
+          expect(build).to receive(:artifacts_metadata?).and_return(false)
         end
 
-        it 'does not raise an error and remove artifacts as failed job' do
+        it 'does not raise an error as failed job' do
           execute
 
           build.reload
           expect(deploy_status).to be_failed
-          expect(build.artifacts?).to be_falsey
         end
       end
     end