Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-05-02 10:55:43 +0300
committerDouwe Maan <douwe@gitlab.com>2018-05-02 10:55:43 +0300
commit9ba9c3c8333311be79e3ca45a43da5e49423e669 (patch)
tree9b7bafe9601ab20d4b16fe6ddc028233a84fc740 /spec/services
parent83e0395190bd189e68ae51bdc7c5c76e81f99bab (diff)
parent9bb7abedf57f5325a92bebc2d93b85cf7e1fc303 (diff)
Merge branch 'make-job-lfs-artifacts-read-only' into 'master'
Fix file_store for artifacts and lfs when saving See merge request gitlab-org/gitlab-ce!18624
Diffstat (limited to 'spec/services')
-rw-r--r--spec/services/projects/update_pages_service_spec.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/spec/services/projects/update_pages_service_spec.rb b/spec/services/projects/update_pages_service_spec.rb
index a418808fd26..347ac13828c 100644
--- a/spec/services/projects/update_pages_service_spec.rb
+++ b/spec/services/projects/update_pages_service_spec.rb
@@ -123,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