Add latest changes from gitlab-org/gitlab@master

1 files changed, 26 insertions, 6 deletions

diff --git a/spec/uploaders/pages/deployment_uploader_spec.rb b/spec/uploaders/pages/deployment_uploader_spec.rb
index 1d9a0efe228..1832f73bd67 100644
--- a/spec/uploaders/pages/deployment_uploader_spec.rb
+++ b/spec/uploaders/pages/deployment_uploader_spec.rb
@@ -6,6 +6,10 @@ RSpec.describe Pages::DeploymentUploader do
   let(:pages_deployment) { create(:pages_deployment) }
   let(:uploader) { described_class.new(pages_deployment, :file) }
 
+  let(:file) do
+    fixture_file_upload("spec/fixtures/pages.zip")
+  end
+
   subject { uploader }
 
   it_behaves_like "builds correct paths",
@@ -18,16 +22,16 @@ RSpec.describe Pages::DeploymentUploader do
       stub_pages_object_storage
     end
 
-    include_context 'with storage', described_class::Store::REMOTE
-
     it_behaves_like 'builds correct paths', store_dir: %r[\A\h{2}/\h{2}/\h{64}/pages_deployments/\d+\z]
-  end
 
-  context 'when file is stored in valid local_path' do
-    let(:file) do
-      fixture_file_upload("spec/fixtures/pages.zip")
+    it 'preserves original file when stores it' do
+      uploader.store!(file)
+
+      expect(File.exist?(file.path)).to be true
     end
+  end
 
+  context 'when file is stored in valid local_path' do
     before do
       uploader.store!(file)
     end
@@ -35,5 +39,21 @@ RSpec.describe Pages::DeploymentUploader do
     subject { uploader.file.path }
 
     it { is_expected.to match(%r[#{uploader.root}/@hashed/\h{2}/\h{2}/\h{64}/pages_deployments/#{pages_deployment.id}/pages.zip]) }
+
+    it 'preserves original file when stores it' do
+      expect(File.exist?(file.path)).to be true
+    end
+  end
+
+  describe '.default_store' do
+    it 'returns local store when object storage is not enabled' do
+      expect(described_class.default_store).to eq(ObjectStorage::Store::LOCAL)
+    end
+
+    it 'returns remote store when object storage is enabled' do
+      stub_pages_object_storage
+
+      expect(described_class.default_store).to eq(ObjectStorage::Store::REMOTE)
+    end
   end
 end