Refactor changing files in web UI

4 files changed, 19 insertions, 17 deletions

diff --git a/spec/lib/gitlab/diff/position_tracer_spec.rb b/spec/lib/gitlab/diff/position_tracer_spec.rb
index 994995b57b8..c166f83664a 100644
--- a/spec/lib/gitlab/diff/position_tracer_spec.rb
+++ b/spec/lib/gitlab/diff/position_tracer_spec.rb
@@ -100,7 +100,7 @@ describe Gitlab::Diff::PositionTracer, lib: true do
       project,
       current_user,
       start_branch: branch_name,
-      target_branch: branch_name,
+      branch_name: branch_name,
       commit_message: "Create file",
       file_path: file_name,
       file_content: content
@@ -113,7 +113,7 @@ describe Gitlab::Diff::PositionTracer, lib: true do
       project,
       current_user,
       start_branch: branch_name,
-      target_branch: branch_name,
+      branch_name: branch_name,
       commit_message: "Update file",
       file_path: file_name,
       file_content: content
@@ -122,11 +122,11 @@ describe Gitlab::Diff::PositionTracer, lib: true do
   end
 
   def delete_file(branch_name, file_name)
-    Files::DestroyService.new(
+    Files::DeleteService.new(
       project,
       current_user,
       start_branch: branch_name,
-      target_branch: branch_name,
+      branch_name: branch_name,
       commit_message: "Delete file",
       file_path: file_name
     ).execute
diff --git a/spec/lib/gitlab/git/index_spec.rb b/spec/lib/gitlab/git/index_spec.rb
index 07d71f6777d..21b71654251 100644
--- a/spec/lib/gitlab/git/index_spec.rb
+++ b/spec/lib/gitlab/git/index_spec.rb
@@ -33,7 +33,7 @@ describe Gitlab::Git::Index, seed_helper: true do
       end
 
       it 'raises an error' do
-        expect { index.create(options) }.to raise_error('Filename already exists')
+        expect { index.create(options) }.to raise_error('A file with this name already exists')
       end
     end
 
@@ -89,7 +89,7 @@ describe Gitlab::Git::Index, seed_helper: true do
       end
 
       it 'raises an error' do
-        expect { index.create_dir(options) }.to raise_error('Directory already exists as a file')
+        expect { index.create_dir(options) }.to raise_error('A file with this name already exists')
       end
     end
 
@@ -99,7 +99,7 @@ describe Gitlab::Git::Index, seed_helper: true do
       end
 
       it 'raises an error' do
-        expect { index.create_dir(options) }.to raise_error('Directory already exists')
+        expect { index.create_dir(options) }.to raise_error('A directory with this name already exists')
       end
     end
   end
@@ -118,7 +118,7 @@ describe Gitlab::Git::Index, seed_helper: true do
       end
 
       it 'raises an error' do
-        expect { index.update(options) }.to raise_error("File doesn't exist")
+        expect { index.update(options) }.to raise_error("A file with this name doesn't exist")
       end
     end
 
@@ -156,7 +156,15 @@ describe Gitlab::Git::Index, seed_helper: true do
       it 'raises an error' do
         options[:previous_path] = 'documents/story.txt'
 
-        expect { index.move(options) }.to raise_error("File doesn't exist")
+        expect { index.move(options) }.to raise_error("A file with this name doesn't exist")
+      end
+    end
+
+    context 'when a file at the new path already exists' do
+      it 'raises an error' do
+        options[:file_path] = 'CHANGELOG'
+
+        expect { index.move(options) }.to raise_error("A file with this name already exists")
       end
     end
 
@@ -203,7 +211,7 @@ describe Gitlab::Git::Index, seed_helper: true do
       end
 
       it 'raises an error' do
-        expect { index.delete(options) }.to raise_error("File doesn't exist")
+        expect { index.delete(options) }.to raise_error("A file with this name doesn't exist")
       end
     end
 
diff --git a/spec/lib/gitlab/git_access_spec.rb b/spec/lib/gitlab/git_access_spec.rb
index 703b41f95ac..d8b72615fab 100644
--- a/spec/lib/gitlab/git_access_spec.rb
+++ b/spec/lib/gitlab/git_access_spec.rb
@@ -211,7 +211,7 @@ describe Gitlab::GitAccess, lib: true do
         target_branch = project.repository.lookup('feature')
         source_branch = project.repository.create_file(
           user,
-          'John Doe',
+          'filename',
           'This is the file content',
           message: 'This is a good commit message',
           branch_name: unprotected_branch)
diff --git a/spec/lib/gitlab/regex_spec.rb b/spec/lib/gitlab/regex_spec.rb
index ba45e2d758c..127cd8c78d8 100644
--- a/spec/lib/gitlab/regex_spec.rb
+++ b/spec/lib/gitlab/regex_spec.rb
@@ -32,12 +32,6 @@ describe Gitlab::Regex, lib: true do
     it { is_expected.to match('foo@bar') }
   end
 
-  describe '.file_path_regex' do
-    subject { described_class.file_path_regex }
-
-    it { is_expected.to match('foo@/bar') }
-  end
-
   describe '.environment_slug_regex' do
     subject { described_class.environment_slug_regex }