From 25e1bbd1a80f3139504ad86f6728cde8a564d5da Mon Sep 17 00:00:00 2001 From: James Lopez Date: Tue, 29 Nov 2016 08:37:02 +0100 Subject: [PATCH 1/2] fix blob controller spec failure --- app/controllers/projects/blob_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 9940263ae24..398122b3073 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -119,7 +119,7 @@ class Projects::BlobController < Projects::ApplicationController from_merge_request = MergeRequestsFinder.new(current_user, project_id: @project.id).execute.find_by(iid: params[:from_merge_request_iid]) if from_merge_request && @target_branch == @ref diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + - "##{hexdigest(@path)}" + "#file-path-#{hexdigest(@path)}" else namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end From 280afe0a6480185f61c4f107724367bd5a170b2a Mon Sep 17 00:00:00 2001 From: James Lopez Date: Tue, 29 Nov 2016 10:40:56 +0100 Subject: [PATCH 2/2] fix blob controller spec failure - updated not to use file-path- --- app/controllers/projects/blob_controller.rb | 2 +- spec/controllers/projects/blob_controller_spec.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/projects/blob_controller.rb b/app/controllers/projects/blob_controller.rb index 398122b3073..9940263ae24 100644 --- a/app/controllers/projects/blob_controller.rb +++ b/app/controllers/projects/blob_controller.rb @@ -119,7 +119,7 @@ class Projects::BlobController < Projects::ApplicationController from_merge_request = MergeRequestsFinder.new(current_user, project_id: @project.id).execute.find_by(iid: params[:from_merge_request_iid]) if from_merge_request && @target_branch == @ref diffs_namespace_project_merge_request_path(from_merge_request.target_project.namespace, from_merge_request.target_project, from_merge_request) + - "#file-path-#{hexdigest(@path)}" + "##{hexdigest(@path)}" else namespace_project_blob_path(@project.namespace, @project, File.join(@target_branch, @path)) end diff --git a/spec/controllers/projects/blob_controller_spec.rb b/spec/controllers/projects/blob_controller_spec.rb index 1c2b0a4a45c..3efef757ae2 100644 --- a/spec/controllers/projects/blob_controller_spec.rb +++ b/spec/controllers/projects/blob_controller_spec.rb @@ -67,7 +67,7 @@ describe Projects::BlobController do put :update, mr_params after_edit_path = diffs_namespace_project_merge_request_path(project.namespace, project, merge_request) - file_anchor = "#file-path-#{Digest::SHA1.hexdigest('CHANGELOG')}" + file_anchor = "##{Digest::SHA1.hexdigest('CHANGELOG')}" expect(response).to redirect_to(after_edit_path + file_anchor) end