Commit edb3368c authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #5048 from Nullreff/image-diff

Fix bug with rendering changing images in commits
parents 4f9bc937 0a05ab91
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
%div.two-up.view %div.two-up.view
%span.wrap %span.wrap
.frame.deleted .frame.deleted
%a{href: project_tree_path(@project, tree_join(@commit.id, diff.old_path))} %a{href: project_blob_path(@project, tree_join(@commit.parent_id, diff.old_path))}
%img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"} %img{src: "data:#{old_file.mime_type};base64,#{Base64.encode64(old_file.data)}"}
%p.image-info.hide %p.image-info.hide
%span.meta-filesize= "#{number_to_human_size old_file.size}" %span.meta-filesize= "#{number_to_human_size old_file.size}"
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
%span.meta-height %span.meta-height
%span.wrap %span.wrap
.frame.added .frame.added
%a{href: project_tree_path(@project, tree_join(@commit.id, diff.new_path))} %a{href: project_blob_path(@project, tree_join(@commit.id, diff.new_path))}
%img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"} %img{src: "data:#{file.mime_type};base64,#{Base64.encode64(file.data)}"}
%p.image-info.hide %p.image-info.hide
%span.meta-filesize= "#{number_to_human_size file.size}" %span.meta-filesize= "#{number_to_human_size file.size}"
......
...@@ -35,3 +35,7 @@ Feature: Project Browse commits ...@@ -35,3 +35,7 @@ Feature: Project Browse commits
Scenario: I browse huge commit Scenario: I browse huge commit
Given I visit huge commit page Given I visit huge commit page
Then I see huge commit message Then I see huge commit message
Scenario: I browse a commit with an image
Given I visit a commit with an image that changed
Then The diff links to both the previous and current image
...@@ -78,4 +78,14 @@ class ProjectBrowseCommits < Spinach::FeatureSteps ...@@ -78,4 +78,14 @@ class ProjectBrowseCommits < Spinach::FeatureSteps
page.should have_content "Warning! This is a large diff" page.should have_content "Warning! This is a large diff"
page.should_not have_content "If you still want to see the diff" page.should_not have_content "If you still want to see the diff"
end end
Given 'I visit a commit with an image that changed' do
visit project_commit_path(@project, 'cc1ba255d6c5ffdce87a357ba7ccc397a4f4026b')
end
Then 'The diff links to both the previous and current image' do
links = page.all('.two-up span div a')
links[0]['href'].should =~ %r{blob/bc3735004cb45cec5e0e4fa92710897a910a5957}
links[1]['href'].should =~ %r{blob/cc1ba255d6c5ffdce87a357ba7ccc397a4f4026b}
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment