Skip to content

Commit

Permalink
Show old file name for renamed files in diffs
Browse files Browse the repository at this point in the history
  • Loading branch information
eduardoj committed Jan 18, 2023
1 parent b3fc72f commit f4d7037
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/api/app/helpers/webui/request_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ def target_project_link(row)
end

def calculate_filename(filename, file_element)
return filename unless file_element['state'] == 'changed'
return filename unless ['changed', 'renamed'].include?(file_element['state'])
return filename if file_element['old']['name'] == filename

"#{file_element['old']['name']} -> #{filename}"
Expand Down
9 changes: 9 additions & 0 deletions src/api/spec/helpers/webui/request_helper_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,15 @@
it { expect(calculate_filename(filename, file_element)).to eq(filename) }
it { expect(calculate_filename(new_filename, file_element)).to eq("#{filename} -> #{new_filename}") }
end

context 'for renamed files' do
let(:file_element) do
{ state: 'renamed', old: { name: filename } }.with_indifferent_access
end
let(:new_filename) { 'apache3' }

it { expect(calculate_filename(new_filename, file_element)).to eq("#{filename} -> #{new_filename}") }
end
end

context 'source diffs' do
Expand Down

0 comments on commit f4d7037

Please sign in to comment.