##// END OF EJS Templates
jro_apps » redmine
RSS
Rails3: scm: mercurial: fix error of test_diff_two_revs at functional test...
Toshi MARUYAMA -
r7092:d11bd80041bf
parent child
Show More
Side by Side Unified
Context file:
r7092:d11bd80041bf Loading diff...:
Show file before | Show file after | Hide comments
@@ -1,498 +1,500
1 1 # Redmine - project management software
2 2 # Copyright (C) 2006-2011 Jean-Philippe Lang
3 3 #
4 4 # This program is free software; you can redistribute it and/or
5 5 # modify it under the terms of the GNU General Public License
6 6 # as published by the Free Software Foundation; either version 2
7 7 # of the License, or (at your option) any later version.
8 8 #
9 9 # This program is distributed in the hope that it will be useful,
10 10 # but WITHOUT ANY WARRANTY; without even the implied warranty of
11 11 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 12 # GNU General Public License for more details.
13 13 #
14 14 # You should have received a copy of the GNU General Public License
15 15 # along with this program; if not, write to the Free Software
16 16 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
17 17
18 18 require File.expand_path('../../test_helper', __FILE__)
19 19 require 'repositories_controller'
20 20
21 21 # Re-raise errors caught by the controller.
22 22 class RepositoriesController; def rescue_action(e) raise e end; end
23 23
24 24 class RepositoriesMercurialControllerTest < ActionController::TestCase
25 25 fixtures :projects, :users, :roles, :members, :member_roles,
26 26 :repositories, :enabled_modules
27 27
28 28 REPOSITORY_PATH = Rails.root.join('tmp/test/mercurial_repository').to_s
29 29 CHAR_1_HEX = "\xc3\x9c"
30 30 PRJ_ID = 3
31 31 NUM_REV = 29
32 32
33 33 ruby19_non_utf8_pass =
34 34 (RUBY_VERSION >= '1.9' && Encoding.default_external.to_s != 'UTF-8')
35 35
36 36 def setup
37 37 @controller = RepositoriesController.new
38 38 @request = ActionController::TestRequest.new
39 39 @response = ActionController::TestResponse.new
40 40 User.current = nil
41 41 @project = Project.find(PRJ_ID)
42 42 @repository = Repository::Mercurial.create(
43 43 :project => @project,
44 44 :url => REPOSITORY_PATH,
45 45 :path_encoding => 'ISO-8859-1'
46 46 )
47 47 assert @repository
48 48 @diff_c_support = true
49 49 @char_1 = CHAR_1_HEX.dup
50 50 @tag_char_1 = "tag-#{CHAR_1_HEX}-00"
51 51 @branch_char_0 = "branch-#{CHAR_1_HEX}-00"
52 52 @branch_char_1 = "branch-#{CHAR_1_HEX}-01"
53 53 if @char_1.respond_to?(:force_encoding)
54 54 @char_1.force_encoding('UTF-8')
55 55 @tag_char_1.force_encoding('UTF-8')
56 56 @branch_char_0.force_encoding('UTF-8')
57 57 @branch_char_1.force_encoding('UTF-8')
58 58 end
59 59 end
60 60
61 61 if ruby19_non_utf8_pass
62 62 puts "TODO: Mercurial functional test fails in Ruby 1.9 " +
63 63 "and Encoding.default_external is not UTF-8. " +
64 64 "Current value is '#{Encoding.default_external.to_s}'"
65 65 def test_fake; assert true end
66 66 elsif File.directory?(REPOSITORY_PATH)
67 67 def test_show_root
68 68 assert_equal 0, @repository.changesets.count
69 69 @repository.fetch_changesets
70 70 @project.reload
71 71 assert_equal NUM_REV, @repository.changesets.count
72 72 get :show, :id => PRJ_ID
73 73 assert_response :success
74 74 assert_template 'show'
75 75 assert_not_nil assigns(:entries)
76 76 assert_equal 4, assigns(:entries).size
77 77 assert assigns(:entries).detect {|e| e.name == 'images' && e.kind == 'dir'}
78 78 assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
79 79 assert assigns(:entries).detect {|e| e.name == 'README' && e.kind == 'file'}
80 80 assert_not_nil assigns(:changesets)
81 81 assert assigns(:changesets).size > 0
82 82 end
83 83
84 84 def test_show_directory
85 85 assert_equal 0, @repository.changesets.count
86 86 @repository.fetch_changesets
87 87 @project.reload
88 88 assert_equal NUM_REV, @repository.changesets.count
89 89 get :show, :id => PRJ_ID, :path => ['images']
90 90 assert_response :success
91 91 assert_template 'show'
92 92 assert_not_nil assigns(:entries)
93 93 assert_equal ['delete.png', 'edit.png'], assigns(:entries).collect(&:name)
94 94 entry = assigns(:entries).detect {|e| e.name == 'edit.png'}
95 95 assert_not_nil entry
96 96 assert_equal 'file', entry.kind
97 97 assert_equal 'images/edit.png', entry.path
98 98 assert_not_nil assigns(:changesets)
99 99 assert assigns(:changesets).size > 0
100 100 end
101 101
102 102 def test_show_at_given_revision
103 103 assert_equal 0, @repository.changesets.count
104 104 @repository.fetch_changesets
105 105 @project.reload
106 106 assert_equal NUM_REV, @repository.changesets.count
107 107 [0, '0', '0885933ad4f6'].each do |r1|
108 108 get :show, :id => PRJ_ID, :path => ['images'], :rev => r1
109 109 assert_response :success
110 110 assert_template 'show'
111 111 assert_not_nil assigns(:entries)
112 112 assert_equal ['delete.png'], assigns(:entries).collect(&:name)
113 113 assert_not_nil assigns(:changesets)
114 114 assert assigns(:changesets).size > 0
115 115 end
116 116 end
117 117
118 118 def test_show_directory_sql_escape_percent
119 119 assert_equal 0, @repository.changesets.count
120 120 @repository.fetch_changesets
121 121 @project.reload
122 122 assert_equal NUM_REV, @repository.changesets.count
123 123 [13, '13', '3a330eb32958'].each do |r1|
124 124 get :show, :id => PRJ_ID, :path => ['sql_escape', 'percent%dir'],
125 125 :rev => r1
126 126 assert_response :success
127 127 assert_template 'show'
128 128
129 129 assert_not_nil assigns(:entries)
130 130 assert_equal ['percent%file1.txt', 'percentfile1.txt'],
131 131 assigns(:entries).collect(&:name)
132 132 changesets = assigns(:changesets)
133 133 assert_not_nil changesets
134 134 assert assigns(:changesets).size > 0
135 135 assert_equal %w(13 11 10 9), changesets.collect(&:revision)
136 136 end
137 137 end
138 138
139 139 def test_show_directory_latin_1_path
140 140 assert_equal 0, @repository.changesets.count
141 141 @repository.fetch_changesets
142 142 @project.reload
143 143 assert_equal NUM_REV, @repository.changesets.count
144 144 [21, '21', 'adf805632193'].each do |r1|
145 145 get :show, :id => PRJ_ID, :path => ['latin-1-dir'], :rev => r1
146 146 assert_response :success
147 147 assert_template 'show'
148 148
149 149 assert_not_nil assigns(:entries)
150 150 assert_equal ["make-latin-1-file.rb",
151 151 "test-#{@char_1}-1.txt",
152 152 "test-#{@char_1}-2.txt",
153 153 "test-#{@char_1}.txt"], assigns(:entries).collect(&:name)
154 154 changesets = assigns(:changesets)
155 155 assert_not_nil changesets
156 156 assert_equal %w(21 20 19 18 17), changesets.collect(&:revision)
157 157 end
158 158 end
159 159
160 160 def test_show_branch
161 161 assert_equal 0, @repository.changesets.count
162 162 @repository.fetch_changesets
163 163 @project.reload
164 164 assert_equal NUM_REV, @repository.changesets.count
165 165 [
166 166 'default',
167 167 @branch_char_1,
168 168 'branch (1)[2]&,%.-3_4',
169 169 @branch_char_0,
170 170 'test_branch.latin-1',
171 171 'test-branch-00',
172 172 ].each do |bra|
173 173 get :show, :id => PRJ_ID, :rev => bra
174 174 assert_response :success
175 175 assert_template 'show'
176 176 assert_not_nil assigns(:entries)
177 177 assert assigns(:entries).size > 0
178 178 assert_not_nil assigns(:changesets)
179 179 assert assigns(:changesets).size > 0
180 180 end
181 181 end
182 182
183 183 def test_show_tag
184 184 assert_equal 0, @repository.changesets.count
185 185 @repository.fetch_changesets
186 186 @project.reload
187 187 assert_equal NUM_REV, @repository.changesets.count
188 188 [
189 189 @tag_char_1,
190 190 'tag_test.00',
191 191 'tag-init-revision'
192 192 ].each do |tag|
193 193 get :show, :id => PRJ_ID, :rev => tag
194 194 assert_response :success
195 195 assert_template 'show'
196 196 assert_not_nil assigns(:entries)
197 197 assert assigns(:entries).size > 0
198 198 assert_not_nil assigns(:changesets)
199 199 assert assigns(:changesets).size > 0
200 200 end
201 201 end
202 202
203 203 def test_changes
204 204 get :changes, :id => PRJ_ID, :path => ['images', 'edit.png']
205 205 assert_response :success
206 206 assert_template 'changes'
207 207 assert_tag :tag => 'h2', :content => 'edit.png'
208 208 end
209 209
210 210 def test_entry_show
211 211 get :entry, :id => PRJ_ID, :path => ['sources', 'watchers_controller.rb']
212 212 assert_response :success
213 213 assert_template 'entry'
214 214 # Line 10
215 215 assert_tag :tag => 'th',
216 216 :content => '10',
217 217 :attributes => { :class => 'line-num' },
218 218 :sibling => { :tag => 'td', :content => /WITHOUT ANY WARRANTY/ }
219 219 end
220 220
221 221 def test_entry_show_latin_1_path
222 222 [21, '21', 'adf805632193'].each do |r1|
223 223 get :entry, :id => PRJ_ID,
224 224 :path => ['latin-1-dir', "test-#{@char_1}-2.txt"], :rev => r1
225 225 assert_response :success
226 226 assert_template 'entry'
227 227 assert_tag :tag => 'th',
228 228 :content => '1',
229 229 :attributes => { :class => 'line-num' },
230 230 :sibling => { :tag => 'td',
231 231 :content => /Mercurial is a distributed version control system/ }
232 232 end
233 233 end
234 234
235 235 def test_entry_show_latin_1_contents
236 236 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
237 237 [27, '27', '7bbf4c738e71'].each do |r1|
238 238 get :entry, :id => PRJ_ID,
239 239 :path => ['latin-1-dir', "test-#{@char_1}.txt"], :rev => r1
240 240 assert_response :success
241 241 assert_template 'entry'
242 242 assert_tag :tag => 'th',
243 243 :content => '1',
244 244 :attributes => { :class => 'line-num' },
245 245 :sibling => { :tag => 'td',
246 246 :content => /test-#{@char_1}.txt/ }
247 247 end
248 248 end
249 249 end
250 250
251 251 def test_entry_download
252 252 get :entry, :id => PRJ_ID,
253 253 :path => ['sources', 'watchers_controller.rb'], :format => 'raw'
254 254 assert_response :success
255 255 # File content
256 256 assert @response.body.include?('WITHOUT ANY WARRANTY')
257 257 end
258 258
259 259 def test_entry_binary_force_download
260 260 get :entry, :id => PRJ_ID, :rev => 1, :path => ['images', 'edit.png']
261 261 assert_response :success
262 262 assert_equal 'image/png', @response.content_type
263 263 end
264 264
265 265 def test_directory_entry
266 266 get :entry, :id => PRJ_ID, :path => ['sources']
267 267 assert_response :success
268 268 assert_template 'show'
269 269 assert_not_nil assigns(:entry)
270 270 assert_equal 'sources', assigns(:entry).name
271 271 end
272 272
273 273 def test_diff
274 274 assert_equal 0, @repository.changesets.count
275 275 @repository.fetch_changesets
276 276 @project.reload
277 277 assert_equal NUM_REV, @repository.changesets.count
278 278 [4, '4', 'def6d2f1254a'].each do |r1|
279 279 # Full diff of changeset 4
280 280 ['inline', 'sbs'].each do |dt|
281 281 get :diff, :id => PRJ_ID, :rev => r1, :type => dt
282 282 assert_response :success
283 283 assert_template 'diff'
284 284 if @diff_c_support
285 285 # Line 22 removed
286 286 assert_tag :tag => 'th',
287 287 :content => '22',
288 288 :sibling => { :tag => 'td',
289 289 :attributes => { :class => /diff_out/ },
290 290 :content => /def remove/ }
291 291 assert_tag :tag => 'h2', :content => /4:def6d2f1254a/
292 292 end
293 293 end
294 294 end
295 295 end
296 296
297 297 def test_diff_two_revs
298 assert_equal 0, @repository.changesets.count
298 299 @repository.fetch_changesets
299 @repository.reload
300 @project.reload
301 assert_equal NUM_REV, @repository.changesets.count
300 302 [2, '400bb8672109', '400', 400].each do |r1|
301 303 [4, 'def6d2f1254a'].each do |r2|
302 304 ['inline', 'sbs'].each do |dt|
303 305 get :diff,
304 306 :id => PRJ_ID,
305 307 :rev => r1,
306 308 :rev_to => r2,
307 309 :type => dt
308 310 assert_response :success
309 311 assert_template 'diff'
310 312 diff = assigns(:diff)
311 313 assert_not_nil diff
312 314 assert_tag :tag => 'h2',
313 315 :content => /4:def6d2f1254a 2:400bb8672109/
314 316 end
315 317 end
316 318 end
317 319 end
318 320
319 321 def test_diff_latin_1_path
320 322 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
321 323 [21, 'adf805632193'].each do |r1|
322 324 ['inline', 'sbs'].each do |dt|
323 325 get :diff, :id => PRJ_ID, :rev => r1, :type => dt
324 326 assert_response :success
325 327 assert_template 'diff'
326 328 assert_tag :tag => 'thead',
327 329 :descendant => {
328 330 :tag => 'th',
329 331 :attributes => { :class => 'filename' } ,
330 332 :content => /latin-1-dir\/test-#{@char_1}-2.txt/ ,
331 333 },
332 334 :sibling => {
333 335 :tag => 'tbody',
334 336 :descendant => {
335 337 :tag => 'td',
336 338 :attributes => { :class => /diff_in/ },
337 339 :content => /It is written in Python/
338 340 }
339 341 }
340 342 end
341 343 end
342 344 end
343 345 end
344 346
345 347 def test_annotate
346 348 get :annotate, :id => PRJ_ID, :path => ['sources', 'watchers_controller.rb']
347 349 assert_response :success
348 350 assert_template 'annotate'
349 351 # Line 23, revision 4:def6d2f1254a
350 352 assert_tag :tag => 'th',
351 353 :content => '23',
352 354 :attributes => { :class => 'line-num' },
353 355 :sibling =>
354 356 {
355 357 :tag => 'td',
356 358 :attributes => { :class => 'revision' },
357 359 :child => { :tag => 'a', :content => '4:def6d2f1254a' }
358 360 }
359 361 assert_tag :tag => 'th',
360 362 :content => '23',
361 363 :attributes => { :class => 'line-num' },
362 364 :sibling =>
363 365 {
364 366 :tag => 'td' ,
365 367 :content => 'jsmith' ,
366 368 :attributes => { :class => 'author' },
367 369 }
368 370 assert_tag :tag => 'th',
369 371 :content => '23',
370 372 :attributes => { :class => 'line-num' },
371 373 :sibling => { :tag => 'td', :content => /watcher =/ }
372 374 end
373 375
374 376 def test_annotate_not_in_tip
375 377 @repository.fetch_changesets
376 378 @repository.reload
377 379 assert @repository.changesets.size > 0
378 380
379 381 get :annotate, :id => PRJ_ID,
380 382 :path => ['sources', 'welcome_controller.rb']
381 383 assert_response 404
382 384 assert_error_tag :content => /was not found/
383 385 end
384 386
385 387 def test_annotate_at_given_revision
386 388 @repository.fetch_changesets
387 389 @repository.reload
388 390 [2, '400bb8672109', '400', 400].each do |r1|
389 391 get :annotate, :id => PRJ_ID, :rev => r1,
390 392 :path => ['sources', 'watchers_controller.rb']
391 393 assert_response :success
392 394 assert_template 'annotate'
393 395 assert_tag :tag => 'h2', :content => /@ 2:400bb8672109/
394 396 end
395 397 end
396 398
397 399 def test_annotate_latin_1_path
398 400 [21, '21', 'adf805632193'].each do |r1|
399 401 get :annotate, :id => PRJ_ID,
400 402 :path => ['latin-1-dir', "test-#{@char_1}-2.txt"], :rev => r1
401 403 assert_response :success
402 404 assert_template 'annotate'
403 405 assert_tag :tag => 'th',
404 406 :content => '1',
405 407 :attributes => { :class => 'line-num' },
406 408 :sibling =>
407 409 {
408 410 :tag => 'td',
409 411 :attributes => { :class => 'revision' },
410 412 :child => { :tag => 'a', :content => '20:709858aafd1b' }
411 413 }
412 414 assert_tag :tag => 'th',
413 415 :content => '1',
414 416 :attributes => { :class => 'line-num' },
415 417 :sibling =>
416 418 {
417 419 :tag => 'td' ,
418 420 :content => 'jsmith' ,
419 421 :attributes => { :class => 'author' },
420 422 }
421 423 assert_tag :tag => 'th',
422 424 :content => '1',
423 425 :attributes => { :class => 'line-num' },
424 426 :sibling => { :tag => 'td',
425 427 :content => /Mercurial is a distributed version control system/ }
426 428
427 429 end
428 430 end
429 431
430 432 def test_annotate_latin_1_contents
431 433 with_settings :repositories_encodings => 'UTF-8,ISO-8859-1' do
432 434 [27, '7bbf4c738e71'].each do |r1|
433 435 get :annotate, :id => PRJ_ID,
434 436 :path => ['latin-1-dir', "test-#{@char_1}.txt"], :rev => r1
435 437 assert_tag :tag => 'th',
436 438 :content => '1',
437 439 :attributes => { :class => 'line-num' },
438 440 :sibling => { :tag => 'td',
439 441 :content => /test-#{@char_1}.txt/ }
440 442 end
441 443 end
442 444 end
443 445
444 446 def test_empty_revision
445 447 @repository.fetch_changesets
446 448 @repository.reload
447 449 ['', ' ', nil].each do |r|
448 450 get :revision, :id => PRJ_ID, :rev => r
449 451 assert_response 404
450 452 assert_error_tag :content => /was not found/
451 453 end
452 454 end
453 455
454 456 def test_destroy_valid_repository
455 457 @request.session[:user_id] = 1 # admin
456 458 assert_equal 0, @repository.changesets.count
457 459 @repository.fetch_changesets
458 460 @project.reload
459 461 assert_equal NUM_REV, @repository.changesets.count
460 462
461 463 get :destroy, :id => PRJ_ID
462 464 assert_response 302
463 465 @project.reload
464 466 assert_nil @project.repository
465 467 end
466 468
467 469 def test_destroy_invalid_repository
468 470 @request.session[:user_id] = 1 # admin
469 471 assert_equal 0, @repository.changesets.count
470 472 @repository.fetch_changesets
471 473 @project.reload
472 474 assert_equal NUM_REV, @repository.changesets.count
473 475
474 476 get :destroy, :id => PRJ_ID
475 477 assert_response 302
476 478 @project.reload
477 479 assert_nil @project.repository
478 480
479 481 @repository = Repository::Mercurial.create(
480 482 :project => Project.find(PRJ_ID),
481 483 :url => "/invalid",
482 484 :path_encoding => 'ISO-8859-1'
483 485 )
484 486 assert @repository
485 487 @repository.fetch_changesets
486 488 @project.reload
487 489 assert_equal 0, @repository.changesets.count
488 490
489 491 get :destroy, :id => PRJ_ID
490 492 assert_response 302
491 493 @project.reload
492 494 assert_nil @project.repository
493 495 end
494 496 else
495 497 puts "Mercurial test repository NOT FOUND. Skipping functional tests !!!"
496 498 def test_fake; assert true end
497 499 end
498 500 end
General Comments 0
You need to be logged in to leave comments. Login now