##// END OF EJS Templates
Merged r12139, r12140 and r12141 from trunk to 2.3-stable (#14931)...
Toshi MARUYAMA -
r11914:bcae8790916a
parent child
Show More
@@ -137,26 +137,15 class RepositoriesBazaarControllerTest < ActionController::TestCase
137 :path => repository_path_hash(['doc-mkdir.txt'])[:param]
137 :path => repository_path_hash(['doc-mkdir.txt'])[:param]
138 assert_response :success
138 assert_response :success
139 assert_template 'annotate'
139 assert_template 'annotate'
140 assert_tag :tag => 'th', :content => '2',
140 assert_select "th.line-num", :text => '2' do
141 :sibling => {
141 assert_select "+ td.revision" do
142 :tag => 'td',
142 assert_select "a", :text => '3'
143 :child => {
143 assert_select "+ td.author", :text => "jsmith@" do
144 :tag => 'a',
144 assert_select "+ td",
145 :content => '3'
145 :text => "Main purpose:"
146 }
146 end
147 }
147 end
148 assert_tag :tag => 'th', :content => '2',
148 end
149 :sibling => { :tag => 'td', :content => /jsmith/ }
150 assert_tag :tag => 'th', :content => '2',
151 :sibling => {
152 :tag => 'td',
153 :child => {
154 :tag => 'a',
155 :content => '3'
156 }
157 }
158 assert_tag :tag => 'th', :content => '2',
159 :sibling => { :tag => 'td', :content => /Main purpose/ }
160 end
149 end
161
150
162 def test_destroy_valid_repository
151 def test_destroy_valid_repository
@@ -432,30 +432,15 class RepositoriesMercurialControllerTest < ActionController::TestCase
432 :rev => r1
432 :rev => r1
433 assert_response :success
433 assert_response :success
434 assert_template 'annotate'
434 assert_template 'annotate'
435 assert_tag :tag => 'th',
435 assert_select "th.line-num", :text => '1' do
436 :content => '1',
436 assert_select "+ td.revision" do
437 :attributes => { :class => 'line-num' },
437 assert_select "a", :text => '20:709858aafd1b'
438 :sibling =>
438 assert_select "+ td.author", :text => "jsmith" do
439 {
439 assert_select "+ td",
440 :tag => 'td',
440 :text => "Mercurial is a distributed version control system."
441 :attributes => { :class => 'revision' },
441 end
442 :child => { :tag => 'a', :content => '20:709858aafd1b' }
442 end
443 }
443 end
444 assert_tag :tag => 'th',
445 :content => '1',
446 :attributes => { :class => 'line-num' },
447 :sibling =>
448 {
449 :tag => 'td' ,
450 :content => 'jsmith' ,
451 :attributes => { :class => 'author' },
452 }
453 assert_tag :tag => 'th',
454 :content => '1',
455 :attributes => { :class => 'line-num' },
456 :sibling => { :tag => 'td',
457 :content => /Mercurial is a distributed version control system/ }
458
459 end
444 end
460 end
445 end
461
446
General Comments 0
You need to be logged in to leave comments. Login now