Nemcio/Redmine
1
0
Fork 0
mirror of https://github.com/redmine/redmine.git synced 2026-01-19 22:13:00 +01:00
Code Issues Packages Projects Releases Activity

Merged r12139, r12140 and r12141 from trunk to 2.3-stable (#14931)

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/2.3-stable@12144 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Toshi MARUYAMA
2013-09-18 08:09:59 +00:00
parent 2c44829509
commit bcae879091
2 changed files with 18 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
test/functional/repositories_bazaar_controller_test.rb
View File

@@ -137,26 +137,15 @@ class RepositoriesBazaarControllerTest < ActionController::TestCase
:path => repository_path_hash(['doc-mkdir.txt'])[:param]
assert_response :success
assert_template 'annotate'
assert_tag :tag => 'th', :content => '2',
:sibling => {
:tag => 'td',
:child => {
:tag => 'a',
:content => '3'
}
}
assert_tag :tag => 'th', :content => '2',
:sibling => { :tag => 'td', :content => /jsmith/ }
assert_tag :tag => 'th', :content => '2',
:sibling => {
:tag => 'td',
:child => {
:tag => 'a',
:content => '3'
}
}
assert_tag :tag => 'th', :content => '2',
:sibling => { :tag => 'td', :content => /Main purpose/ }
assert_select "th.line-num", :text => '2' do
assert_select "+ td.revision" do
assert_select "a", :text => '3'
assert_select "+ td.author", :text => "jsmith@" do
assert_select "+ td",
:text => "Main purpose:"
end
end
end
end
def test_destroy_valid_repository

33
test/functional/repositories_mercurial_controller_test.rb
View File

@@ -432,30 +432,15 @@ class RepositoriesMercurialControllerTest < ActionController::TestCase
:rev => r1
assert_response :success
assert_template 'annotate'
assert_tag :tag => 'th',
:content => '1',
:attributes => { :class => 'line-num' },
:sibling =>
{
:tag => 'td',
:attributes => { :class => 'revision' },
:child => { :tag => 'a', :content => '20:709858aafd1b' }
}
assert_tag :tag => 'th',
:content => '1',
:attributes => { :class => 'line-num' },
:sibling =>
{
:tag => 'td' ,
:content => 'jsmith' ,
:attributes => { :class => 'author' },
}
assert_tag :tag => 'th',
:content => '1',
:attributes => { :class => 'line-num' },
:sibling => { :tag => 'td',
:content => /Mercurial is a distributed version control system/ }
assert_select "th.line-num", :text => '1' do
assert_select "+ td.revision" do
assert_select "a", :text => '20:709858aafd1b'
assert_select "+ td.author", :text => "jsmith" do
assert_select "+ td",
:text => "Mercurial is a distributed version control system."
end
end
end
end
end