From 7ea4a42395eb09f2c2bac2ed74297fca6188fd3b Mon Sep 17 00:00:00 2001
From: Ahmad Hassan <ahmad.hassan612@gmail.com>
Date: Wed, 16 May 2018 17:17:05 +0300
Subject: [PATCH] Fix failing specs

---
 spec/lib/backup/repository_spec.rb | 29 +++--------------------------
 1 file changed, 3 insertions(+), 26 deletions(-)

diff --git a/spec/lib/backup/repository_spec.rb b/spec/lib/backup/repository_spec.rb
index b1ea9c0b622..3a568506c11 100644
--- a/spec/lib/backup/repository_spec.rb
+++ b/spec/lib/backup/repository_spec.rb
@@ -49,14 +49,14 @@ describe Backup::Repository do
 
     describe 'command failure' do
       before do
-        allow(Gitlab::Popen).to receive(:popen).and_return(['error', 1])
+        allow_any_instance_of(Gitlab::Shell).to receive(:create_repository).and_return(false)
       end
 
       context 'hashed storage' do
         it 'shows the appropriate error' do
           subject.restore
 
-          expect(progress).to have_received(:puts).with("Ignoring error on #{project.full_path} (#{project.disk_path}) - error")
+          expect(progress).to have_received(:puts).with("[Failed] restoring #{project.full_path} repository")
         end
       end
 
@@ -66,33 +66,10 @@ describe Backup::Repository do
         it 'shows the appropriate error' do
           subject.restore
 
-          expect(progress).to have_received(:puts).with("Ignoring error on #{project.full_path} - error")
+          expect(progress).to have_received(:puts).with("[Failed] restoring #{project.full_path} repository")
         end
       end
     end
-
-    describe 'folders without permissions' do
-      before do
-        allow(FileUtils).to receive(:mv).and_raise(Errno::EACCES)
-      end
-
-      it 'shows error message' do
-        expect(subject).to receive(:access_denied_error)
-        subject.restore
-      end
-    end
-
-    describe 'folder that is a mountpoint' do
-      before do
-        allow(FileUtils).to receive(:mv).and_raise(Errno::EBUSY)
-      end
-
-      it 'shows error message' do
-        expect(subject).to receive(:resource_busy_error).and_call_original
-
-        expect { subject.restore }.to raise_error(/is a mountpoint/)
-      end
-    end
   end
 
   describe '#empty_repo?' do