diff test/unit/repository_darcs_test.rb @ 511:107d36338b70 live

Merge from branch "cannam"

--- a/test/unit/repository_darcs_test.rb	Thu Jun 09 16:51:06 2011 +0100
+++ b/test/unit/repository_darcs_test.rb	Thu Jul 14 10:43:07 2011 +0100
@@ -15,29 +15,32 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-require File.dirname(__FILE__) + '/../test_helper'
+require File.expand_path('../../test_helper', __FILE__)
 
 class RepositoryDarcsTest < ActiveSupport::TestCase
   fixtures :projects
-  
+
   # No '..' in the repository path
   REPOSITORY_PATH = RAILS_ROOT.gsub(%r{config\/\.\.}, '') + '/tmp/test/darcs_repository'
-  
+
   def setup
-    @project = Project.find(1)
-    assert @repository = Repository::Darcs.create(:project => @project, :url => REPOSITORY_PATH)
+    @project = Project.find(3)
+    @repository = Repository::Darcs.create(
+                      :project => @project, :url => REPOSITORY_PATH,
+                      :log_encoding => 'UTF-8')
+    assert @repository
   end
-  
+
   if File.directory?(REPOSITORY_PATH)  
     def test_fetch_changesets_from_scratch
       @repository.fetch_changesets
       @repository.reload
-      
+
       assert_equal 6, @repository.changesets.count
       assert_equal 13, @repository.changes.count
       assert_equal "Initial commit.", @repository.changesets.find_by_revision('1').comments
     end
-    
+
     def test_fetch_changesets_incremental
       @repository.fetch_changesets
       # Remove changesets with revision > 3
@@ -48,18 +51,28 @@
       @repository.fetch_changesets
       assert_equal 6, @repository.changesets.count
     end
-    
+
+    def test_entries_invalid_revision
+      @repository.fetch_changesets
+      @repository.reload
+      assert_nil @repository.entries('', '123')
+    end
+
     def test_deleted_files_should_not_be_listed
+      @repository.fetch_changesets
+      @repository.reload
       entries = @repository.entries('sources')
       assert entries.detect {|e| e.name == 'watchers_controller.rb'}
       assert_nil entries.detect {|e| e.name == 'welcome_controller.rb'}
     end
-    
+
     def test_cat
-      @repository.fetch_changesets
-      cat = @repository.cat("sources/welcome_controller.rb", 2)
-      assert_not_nil cat
-      assert cat.include?('class WelcomeController < ApplicationController')
+      if @repository.scm.supports_cat?
+        @repository.fetch_changesets
+        cat = @repository.cat("sources/welcome_controller.rb", 2)
+        assert_not_nil cat
+        assert cat.include?('class WelcomeController < ApplicationController')
+      end
     end
   else
     puts "Darcs test repository NOT FOUND. Skipping unit tests !!!"