From d9dfa7b2b6c634625d9db64c0d563b2a8e4c75cd Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 1 Sep 2012 07:25:45 +0000 Subject: [PATCH] Merged r10245 from trunk to 2.0-stable (#11752) scm: git: add functional test of diff with revision and path. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.0-stable@10272 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- .../repositories_git_controller_test.rb | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/test/functional/repositories_git_controller_test.rb b/test/functional/repositories_git_controller_test.rb index 44e74ea7d..753776341 100644 --- a/test/functional/repositories_git_controller_test.rb +++ b/test/functional/repositories_git_controller_test.rb @@ -287,6 +287,30 @@ class RepositoriesGitControllerTest < ActionController::TestCase end end + def test_diff_with_rev_and_path + assert_equal 0, @repository.changesets.count + @repository.fetch_changesets + @project.reload + assert_equal NUM_REV, @repository.changesets.count + # Full diff of changeset 2f9c0091 + ['inline', 'sbs'].each do |dt| + get :diff, + :id => PRJ_ID, + :rev => '2f9c0091c754a91af7a9c478e36556b4bde8dcf7', + :path => repository_path_hash(['sources', 'watchers_controller.rb'])[:param], + :type => dt + assert_response :success + assert_template 'diff' + # Line 22 removed + assert_tag :tag => 'th', + :content => '22', + :sibling => { :tag => 'td', + :attributes => { :class => /diff_out/ }, + :content => /def remove/ } + assert_tag :tag => 'h2', :content => /2f9c0091/ + end + end + def test_diff_truncated assert_equal 0, @repository.changesets.count @repository.fetch_changesets -- 2.39.5