diff test/functional/.svn/text-base/repositories_mercurial_controller_test.rb.svn-base @ 129:5e974759e8b2 cannam

Merge from the default branch

--- a/test/functional/.svn/text-base/repositories_mercurial_controller_test.rb.svn-base	Wed Jan 19 13:27:01 2011 +0000
+++ b/test/functional/.svn/text-base/repositories_mercurial_controller_test.rb.svn-base	Wed Jan 19 15:15:02 2011 +0000
@@ -44,7 +44,7 @@
       assert_not_nil assigns(:entries)
       assert_not_nil assigns(:changesets)
     end
-    
+
     def test_show_root
       get :show, :id => 3
       assert_response :success
@@ -55,7 +55,7 @@
       assert assigns(:entries).detect {|e| e.name == 'sources' && e.kind == 'dir'}
       assert assigns(:entries).detect {|e| e.name == 'README'  && e.kind == 'file'}
     end
-    
+
     def test_show_directory
       get :show, :id => 3, :path => ['images']
       assert_response :success
@@ -133,7 +133,7 @@
 
       [4, '4', 'def6d2f1254a'].each do |r1|
         # Full diff of changeset 4
-        get :diff, :id => 3, :rev => 4
+        get :diff, :id => 3, :rev => r1
         assert_response :success
         assert_template 'diff'
 
@@ -200,8 +200,8 @@
       @repository.fetch_changesets
       @repository.reload
       ['', ' ', nil].each do |r|
-        get :revision, :id => 1, :rev => r
-        assert_response 500
+        get :revision, :id => 3, :rev => r
+        assert_response 404
         assert_error_tag :content => /was not found/
       end
     end