Merged r12150 from trunk to 2.3-stable (#14931)

use assert_select instead of assert_tag in Git non ASCII path annotate test.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12152 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2013-09-18 13:03:49 +00:00
parent 9d3377c92c
commit 7bfb4759e7
@@ -532,11 +532,15 @@ class RepositoriesGitControllerTest < ActionController::TestCase
get :annotate, :id => PRJ_ID, get :annotate, :id => PRJ_ID,
:path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param], :path => repository_path_hash(['latin-1-dir', "test-#{@char_1}.txt"])[:param],
:rev => r1 :rev => r1
assert_tag :tag => 'th', assert_select "th.line-num", :text => '1' do
:content => '1', assert_select "+ td.revision" do
:attributes => { :class => 'line-num' }, assert_select "a", :text => '57ca437c'
:sibling => { :tag => 'td', assert_select "+ td.author", :text => "jsmith" do
:content => /test-#{@char_1}.txt/ } assert_select "+ td",
:text => "test-#{@char_1}.txt"
end
end
end
end end
end end
end end