CE->EE: Resolve merge conflicts in spec/models/namespace_spec.rb

spec/models/namespace_spec.rb

@@ -215,7 +215,6 @@ describe Namespace do
           FileUtils.mkdir_p(File.join(uploads_dir, project.full_path))
           FileUtils.mkdir_p(File.join(pages_dir, project.full_path))
         end
-<<<<<<< HEAD
 
         context 'renaming child' do
           it 'correctly moves the repository, uploads and pages' do
@@ -225,37 +224,11 @@ describe Namespace do
 
             child.update_attributes!(path: 'renamed')
 
-=======
-
-        context 'renaming child' do
-          it 'correctly moves the repository, uploads and pages' do
-            expected_repository_path = File.join(TestEnv.repos_path, 'parent', 'renamed', 'the-project.git')
-            expected_upload_path = File.join(uploads_dir, 'parent', 'renamed', 'the-project')
-            expected_pages_path = File.join(pages_dir, 'parent', 'renamed', 'the-project')
-
-            child.update_attributes!(path: 'renamed')
-
-            expect(File.directory?(expected_repository_path)).to be(true)
-            expect(File.directory?(expected_upload_path)).to be(true)
-            expect(File.directory?(expected_pages_path)).to be(true)
-          end
-        end
-
-        context 'renaming parent' do
-          it 'correctly moves the repository, uploads and pages' do
-            expected_repository_path = File.join(TestEnv.repos_path, 'renamed', 'child', 'the-project.git')
-            expected_upload_path = File.join(uploads_dir, 'renamed', 'child', 'the-project')
-            expected_pages_path = File.join(pages_dir, 'renamed', 'child', 'the-project')
-
-            parent.update_attributes!(path: 'renamed')
-
->>>>>>> upstream/master
             expect(File.directory?(expected_repository_path)).to be(true)
             expect(File.directory?(expected_upload_path)).to be(true)
             expect(File.directory?(expected_pages_path)).to be(true)
           end
         end
-<<<<<<< HEAD
 
         context 'renaming parent' do
           it 'correctly moves the repository, uploads and pages' do
@@ -270,7 +243,6 @@ describe Namespace do
             expect(File.directory?(expected_pages_path)).to be(true)
           end
         end
-=======
       end
     end
 
@@ -286,7 +258,6 @@ describe Namespace do
 
         expect(before_disk_path).to eq(project.disk_path)
         expect(gitlab_shell.exists?(project.repository_storage_path, "#{project.disk_path}.git")).to be_truthy
->>>>>>> upstream/master
       end
     end
 
@@ -394,15 +365,9 @@ describe Namespace do
 
       it 'has no repositories base directories to remove' do
         allow(GitlabShellWorker).to receive(:perform_in)
-<<<<<<< HEAD
-
-        expect(File.exist?(path_in_dir)).to be(false)
-
-=======
 
         expect(File.exist?(path_in_dir)).to be(false)
 
->>>>>>> upstream/master
         namespace.destroy
 
         expect(File.exist?(deleted_path_in_dir)).to be(false)