Support renames in diff_for_path actions

3 files changed, 23 insertions, 23 deletions

diff --git a/spec/controllers/projects/commit_controller_spec.rb b/spec/controllers/projects/commit_controller_spec.rb
index 472c4904919..3001d32e719 100644
--- a/spec/controllers/projects/commit_controller_spec.rb
+++ b/spec/controllers/projects/commit_controller_spec.rb
@@ -267,7 +267,7 @@ describe Projects::CommitController do
       context 'when the user has access to the project' do
         context 'when the path exists in the diff' do
           it 'enables diff notes' do
-            diff_for_path(id: commit.id, path: existing_path)
+            diff_for_path(id: commit.id, old_path: existing_path, new_path: existing_path)
 
             expect(assigns(:diff_notes_disabled)).to be_falsey
             expect(assigns(:comments_target)).to eq(noteable_type: 'Commit',
@@ -280,12 +280,12 @@ describe Projects::CommitController do
               meth.call(diffs, diff_refs, project)
             end
 
-            diff_for_path(id: commit.id, path: existing_path)
+            diff_for_path(id: commit.id, old_path: existing_path, new_path: existing_path)
           end
         end
 
         context 'when the path does not exist in the diff' do
-          before { diff_for_path(id: commit.id, path: existing_path.succ) }
+          before { diff_for_path(id: commit.id, old_path: existing_path.succ, new_path: existing_path.succ) }
 
           it 'returns a 404' do
             expect(response).to have_http_status(404)
@@ -296,7 +296,7 @@ describe Projects::CommitController do
       context 'when the user does not have access to the project' do
         before do
           project.team.truncate
-          diff_for_path(id: commit.id, path: existing_path)
+          diff_for_path(id: commit.id, old_path: existing_path, new_path: existing_path)
         end
 
         it 'returns a 404' do
@@ -306,7 +306,7 @@ describe Projects::CommitController do
     end
 
     context 'when the commit does not exist' do
-      before { diff_for_path(id: commit.id.succ, path: existing_path) }
+      before { diff_for_path(id: commit.id.succ, old_path: existing_path, new_path: existing_path) }
 
       it 'returns a 404' do
         expect(response).to have_http_status(404)
diff --git a/spec/controllers/projects/compare_controller_spec.rb b/spec/controllers/projects/compare_controller_spec.rb
index 1dd144a7b72..4058d5e2453 100644
--- a/spec/controllers/projects/compare_controller_spec.rb
+++ b/spec/controllers/projects/compare_controller_spec.rb
@@ -81,7 +81,7 @@ describe Projects::CompareController do
       context 'when the user has access to the project' do
         context 'when the path exists in the diff' do
           it 'disables diff notes' do
-            diff_for_path(from: ref_from, to: ref_to, path: existing_path)
+            diff_for_path(from: ref_from, to: ref_to, old_path: existing_path, new_path: existing_path)
 
             expect(assigns(:diff_notes_disabled)).to be_truthy
           end
@@ -92,12 +92,12 @@ describe Projects::CompareController do
               meth.call(diffs, diff_refs, project)
             end
 
-            diff_for_path(from: ref_from, to: ref_to, path: existing_path)
+            diff_for_path(from: ref_from, to: ref_to, old_path: existing_path, new_path: existing_path)
           end
         end
 
         context 'when the path does not exist in the diff' do
-          before { diff_for_path(from: ref_from, to: ref_to, path: existing_path.succ) }
+          before { diff_for_path(from: ref_from, to: ref_to, old_path: existing_path.succ, new_path: existing_path.succ) }
 
           it 'returns a 404' do
             expect(response).to have_http_status(404)
@@ -108,7 +108,7 @@ describe Projects::CompareController do
       context 'when the user does not have access to the project' do
         before do
           project.team.truncate
-          diff_for_path(from: ref_from, to: ref_to, path: existing_path)
+          diff_for_path(from: ref_from, to: ref_to, old_path: existing_path, new_path: existing_path)
         end
 
         it 'returns a 404' do
@@ -118,7 +118,7 @@ describe Projects::CompareController do
     end
 
     context 'when the from ref does not exist' do
-      before { diff_for_path(from: ref_from.succ, to: ref_to, path: existing_path) }
+      before { diff_for_path(from: ref_from.succ, to: ref_to, old_path: existing_path, new_path: existing_path) }
 
       it 'returns a 404' do
         expect(response).to have_http_status(404)
@@ -126,7 +126,7 @@ describe Projects::CompareController do
     end
 
     context 'when the to ref does not exist' do
-      before { diff_for_path(from: ref_from, to: ref_to.succ, path: existing_path) }
+      before { diff_for_path(from: ref_from, to: ref_to.succ, old_path: existing_path, new_path: existing_path) }
 
       it 'returns a 404' do
         expect(response).to have_http_status(404)
diff --git a/spec/controllers/projects/merge_requests_controller_spec.rb b/spec/controllers/projects/merge_requests_controller_spec.rb
index ff160f51329..210085e3b1a 100644
--- a/spec/controllers/projects/merge_requests_controller_spec.rb
+++ b/spec/controllers/projects/merge_requests_controller_spec.rb
@@ -384,7 +384,7 @@ describe Projects::MergeRequestsController do
         context 'when the user can view the merge request' do
           context 'when the path exists in the diff' do
             it 'enables diff notes' do
-              diff_for_path(id: merge_request.iid, path: existing_path)
+              diff_for_path(id: merge_request.iid, old_path: existing_path, new_path: existing_path)
 
               expect(assigns(:diff_notes_disabled)).to be_falsey
               expect(assigns(:comments_target)).to eq(noteable_type: 'MergeRequest',
@@ -397,12 +397,12 @@ describe Projects::MergeRequestsController do
                 meth.call(diffs, diff_refs, project)
               end
 
-              diff_for_path(id: merge_request.iid, path: existing_path)
+              diff_for_path(id: merge_request.iid, old_path: existing_path, new_path: existing_path)
             end
           end
 
           context 'when the path does not exist in the diff' do
-            before { diff_for_path(id: merge_request.iid, path: 'files/ruby/nopen.rb') }
+            before { diff_for_path(id: merge_request.iid, old_path: 'files/ruby/nopen.rb', new_path: 'files/ruby/nopen.rb') }
 
             it 'returns a 404' do
               expect(response).to have_http_status(404)
@@ -413,7 +413,7 @@ describe Projects::MergeRequestsController do
         context 'when the user cannot view the merge request' do
           before do
             project.team.truncate
-            diff_for_path(id: merge_request.iid, path: existing_path)
+            diff_for_path(id: merge_request.iid, old_path: existing_path, new_path: existing_path)
           end
 
           it 'returns a 404' do
@@ -423,7 +423,7 @@ describe Projects::MergeRequestsController do
       end
 
       context 'when the merge request does not exist' do
-        before { diff_for_path(id: merge_request.iid.succ, path: existing_path) }
+        before { diff_for_path(id: merge_request.iid.succ, old_path: existing_path, new_path: existing_path) }
 
         it 'returns a 404' do
           expect(response).to have_http_status(404)
@@ -435,7 +435,7 @@ describe Projects::MergeRequestsController do
 
         before do
           other_project.team << [user, :master]
-          diff_for_path(id: merge_request.iid, path: existing_path, project_id: other_project.to_param)
+          diff_for_path(id: merge_request.iid, old_path: existing_path, new_path: existing_path, project_id: other_project.to_param)
         end
 
         it 'returns a 404' do
@@ -449,7 +449,7 @@ describe Projects::MergeRequestsController do
 
       context 'when both branches are in the same project' do
         it 'disables diff notes' do
-          diff_for_path(path: existing_path, merge_request: { source_branch: 'feature', target_branch: 'master' })
+          diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_branch: 'feature', target_branch: 'master' })
 
           expect(assigns(:diff_notes_disabled)).to be_truthy
         end
@@ -460,7 +460,7 @@ describe Projects::MergeRequestsController do
             meth.call(diffs, diff_refs, project)
           end
 
-          diff_for_path(path: existing_path, merge_request: { source_branch: 'feature', target_branch: 'master' })
+          diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_branch: 'feature', target_branch: 'master' })
         end
       end
 
@@ -471,7 +471,7 @@ describe Projects::MergeRequestsController do
 
         context 'when the path exists in the diff' do
           it 'disables diff notes' do
-            diff_for_path(path: existing_path, merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' })
+            diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' })
 
             expect(assigns(:diff_notes_disabled)).to be_truthy
           end
@@ -482,12 +482,12 @@ describe Projects::MergeRequestsController do
               meth.call(diffs, diff_refs, project)
             end
 
-            diff_for_path(path: existing_path, merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' })
+            diff_for_path(old_path: existing_path, new_path: existing_path, merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' })
           end
         end
 
         context 'when the path does not exist in the diff' do
-          before { diff_for_path(path: 'files/ruby/nopen.rb', merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' }) }
+          before { diff_for_path(old_path: 'files/ruby/nopen.rb', new_path: 'files/ruby/nopen.rb', merge_request: { source_project: other_project, source_branch: 'feature', target_branch: 'master' }) }
 
           it 'returns a 404' do
             expect(response).to have_http_status(404)
@@ -497,7 +497,7 @@ describe Projects::MergeRequestsController do
     end
   end
 
-  describe 'GET #commits' do
+  describe 'GET commits' do
     def go(format: 'html')
       get :commits,
           namespace_id: project.namespace.to_param,