summaryrefslogtreecommitdiff
path: root/spec/lib/backup
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2017-12-01 13:58:49 +0000
committerNick Thomas <nick@gitlab.com>2018-02-07 13:40:46 +0000
commit6b0c6e69e1b249f14624550fcbca7f5ee6f51410 (patch)
tree0a724fbb80c728e64a4b445f1a798f035502dd9a /spec/lib/backup
parentead97c55eac773444dee547a934112aa282c2e2e (diff)
downloadgitlab-ce-6b0c6e69e1b249f14624550fcbca7f5ee6f51410.tar.gz
Use hashed storage in the specs40744-hashed-storage-specs
Diffstat (limited to 'spec/lib/backup')
-rw-r--r--spec/lib/backup/repository_spec.rb18
1 files changed, 15 insertions, 3 deletions
diff --git a/spec/lib/backup/repository_spec.rb b/spec/lib/backup/repository_spec.rb
index 6ee3d531d6e..f7b1a61f4f8 100644
--- a/spec/lib/backup/repository_spec.rb
+++ b/spec/lib/backup/repository_spec.rb
@@ -33,10 +33,22 @@ describe Backup::Repository do
allow(Gitlab::Popen).to receive(:popen).and_return(['error', 1])
end
- it 'shows the appropriate error' do
- described_class.new.restore
+ context 'hashed storage' do
+ it 'shows the appropriate error' do
+ described_class.new.restore
- expect(progress).to have_received(:puts).with("Ignoring error on #{project.full_path} - error")
+ expect(progress).to have_received(:puts).with("Ignoring error on #{project.full_path} (#{project.disk_path}) - error")
+ end
+ end
+
+ context 'legacy storage' do
+ let!(:project) { create(:project, :legacy_storage) }
+
+ it 'shows the appropriate error' do
+ described_class.new.restore
+
+ expect(progress).to have_received(:puts).with("Ignoring error on #{project.full_path} - error")
+ end
end
end
end