From 85dc423f7090da0a52c73eb66faf22ddb20efff9 Mon Sep 17 00:00:00 2001 From: GitLab Bot Date: Sat, 19 Sep 2020 01:45:44 +0000 Subject: Add latest changes from gitlab-org/gitlab@13-4-stable-ee --- spec/lib/backup/uploads_spec.rb | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'spec/lib/backup/uploads_spec.rb') diff --git a/spec/lib/backup/uploads_spec.rb b/spec/lib/backup/uploads_spec.rb index 7c2d715b580..678b670db34 100644 --- a/spec/lib/backup/uploads_spec.rb +++ b/spec/lib/backup/uploads_spec.rb @@ -18,4 +18,22 @@ RSpec.describe Backup::Uploads do end end end + + describe '#dump' do + before do + allow(File).to receive(:realpath).with('/var/uploads').and_return('/var/uploads') + allow(File).to receive(:realpath).with('/var/uploads/..').and_return('/var') + allow(Gitlab.config.uploads).to receive(:storage_path) { '/var' } + end + + it 'uses the correct upload dir' do + expect(backup.app_files_dir).to eq('/var/uploads') + end + + it 'excludes tmp from backup tar' do + expect(backup).to receive(:tar).and_return('blabla-tar') + expect(backup).to receive(:run_pipeline!).with([%w(blabla-tar --exclude=lost+found --exclude=./tmp -C /var/uploads -cf - .), 'gzip -c -1'], any_args) + backup.dump + end + end end -- cgit v1.2.3