From 1cb33f3a95ea27994ffc07d86b57eabc8e3de2c5 Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Sat, 1 Jan 2011 22:05:48 +0000 Subject: [PATCH] Merged r4608 from trunk (repository: switch darcs cat test if cat supports). git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@4609 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- test/unit/repository_darcs_test.rb | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/test/unit/repository_darcs_test.rb b/test/unit/repository_darcs_test.rb index c612a716e..d470bebfa 100644 --- a/test/unit/repository_darcs_test.rb +++ b/test/unit/repository_darcs_test.rb @@ -54,12 +54,14 @@ class RepositoryDarcsTest < ActiveSupport::TestCase 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 !!!"