1 files changed, 13 insertions, 30 deletions

diff --git a/spec/tasks/gitlab/lfs/migrate_rake_spec.rb b/spec/tasks/gitlab/lfs/migrate_rake_spec.rb
index a85a0031a6c..66d1a192a96 100644
--- a/spec/tasks/gitlab/lfs/migrate_rake_spec.rb
+++ b/spec/tasks/gitlab/lfs/migrate_rake_spec.rb
@@ -5,49 +5,32 @@ describe 'gitlab:lfs namespace rake task' do
     Rake.application.rake_require 'tasks/gitlab/lfs/migrate'
   end
 
-  context 'migration tasks' do
+  describe 'migrate' do
     let(:local) { ObjectStorage::Store::LOCAL }
     let(:remote) { ObjectStorage::Store::REMOTE }
+    let!(:lfs_object) { create(:lfs_object, :with_file, file_store: local) }
 
-    before do
-      stub_lfs_object_storage(background_upload: false, direct_upload: false)
+    def lfs_migrate
+      run_rake_task('gitlab:lfs:migrate')
     end
 
-    describe 'migrate' do
-      subject { run_rake_task('gitlab:lfs:migrate') }
-
-      let!(:lfs_object) { create(:lfs_object, :with_file) }
-
-      context 'object storage disabled' do
-        before do
-          stub_lfs_object_storage(enabled: false)
-        end
-
-        it "doesn't migrate files" do
-          expect { subject }.not_to change { lfs_object.reload.file_store }
-        end
+    context 'object storage disabled' do
+      before do
+        stub_lfs_object_storage(enabled: false)
       end
 
-      context 'object storage enabled' do
-        it 'migrates local file to object storage' do
-          expect { subject }.to change { lfs_object.reload.file_store }.from(local).to(remote)
-        end
+      it "doesn't migrate files" do
+        expect { lfs_migrate }.not_to change { lfs_object.reload.file_store }
       end
     end
 
-    describe 'migrate_to_local' do
-      subject { run_rake_task('gitlab:lfs:migrate_to_local') }
-
-      let(:lfs_object) { create(:lfs_object, :with_file, :object_storage) }
-
+    context 'object storage enabled' do
       before do
-        stub_lfs_object_storage(background_upload: false, direct_upload: true)
+        stub_lfs_object_storage
       end
 
-      context 'object storage enabled' do
-        it 'migrates remote files to local storage' do
-          expect { subject }.to change { lfs_object.reload.file_store }.from(remote).to(local)
-        end
+      it 'migrates local file to object storage' do
+        expect { lfs_migrate }.to change { lfs_object.reload.file_store }.from(local).to(remote)
       end
     end
   end