diff test/functional/.svn/text-base/repositories_mercurial_controller_test.rb.svn-base @ 246:eeebe205a056 cannam

* Merge from default branch, bringing us up to SVN trunk rev 4993

--- a/test/functional/.svn/text-base/repositories_mercurial_controller_test.rb.svn-base	Thu Jan 20 09:59:02 2011 +0000
+++ b/test/functional/.svn/text-base/repositories_mercurial_controller_test.rb.svn-base	Thu Mar 03 12:02:03 2011 +0000
@@ -34,6 +34,7 @@
     User.current = nil
     @repository = Repository::Mercurial.create(:project => Project.find(3), :url => REPOSITORY_PATH)
     assert @repository
+    @diff_c_support = true
   end
 
   if File.directory?(REPOSITORY_PATH)
@@ -137,7 +138,7 @@
         assert_response :success
         assert_template 'diff'
 
-        if @repository.scm.class.client_version_above?([1, 2])
+        if @diff_c_support
           # Line 22 removed
           assert_tag :tag => 'th',
                      :content => '22',
@@ -196,6 +197,17 @@
                  :sibling => { :tag => 'td', :content => /watcher =/ }
     end
 
+    def test_annotate_at_given_revision
+      @repository.fetch_changesets
+      @repository.reload
+      [2, '400bb8672109', '400', 400].each do |r1|
+        get :annotate, :id => 3, :rev => r1, :path => ['sources', 'watchers_controller.rb']
+        assert_response :success
+        assert_template 'annotate'
+        assert_tag :tag => 'h2', :content => /@ 2:400bb8672109/
+      end
+    end
+
     def test_empty_revision
       @repository.fetch_changesets
       @repository.reload