From ad06f855515998427ea554e7efc211535ebb180a Mon Sep 17 00:00:00 2001 From: Adam Byrtek Date: Fri, 14 Aug 2009 23:50:26 +0200 Subject: [PATCH 5/8] Tests updated to accomodate new clean checkout process. --- lib/source_control/abstract_adapter.rb | 2 +- test/unit/source_control/subversion_test.rb | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/source_control/abstract_adapter.rb b/lib/source_control/abstract_adapter.rb index bcc151c..5a42843 100644 --- a/lib/source_control/abstract_adapter.rb +++ b/lib/source_control/abstract_adapter.rb @@ -30,7 +30,7 @@ module SourceControl begin checkout(revision, stdout, new_path) FileUtils.rm_rf(path) - FileUtils.mv(new_path, path) + FileUtils.mv(new_path, path) if File.directory?(new_path) ensure FileUtils.rm_rf(new_path) end diff --git a/test/unit/source_control/subversion_test.rb b/test/unit/source_control/subversion_test.rb index 298f7b2..2d69f65 100644 --- a/test/unit/source_control/subversion_test.rb +++ b/test/unit/source_control/subversion_test.rb @@ -145,7 +145,7 @@ class SourceControl::SubversionTest < Test::Unit::TestCase end def test_checkout_requires_repository_location - assert_raises('Repository location is not specified') { Subversion.new.checkout('.') } + assert_raises(BuilderError) { Subversion.new.checkout('.') } end def test_new_does_not_allow_random_params @@ -160,7 +160,7 @@ class SourceControl::SubversionTest < Test::Unit::TestCase assert File.directory?("project") svn = Subversion.new(:repository => 'http://foo.com/svn/project', :path => "project") - svn.expects(:svn).with("co", ["http://foo.com/svn/project", "project", "--revision", 5], + svn.expects(:svn).with("co", ["http://foo.com/svn/project", "project.new", "--revision", 5], :execute_in_project_directory => false) svn.clean_checkout(Subversion::Revision.new(5)) @@ -177,7 +177,7 @@ class SourceControl::SubversionTest < Test::Unit::TestCase end io = StringIO.new - svn.clean_checkout(Subversion::Revision.new(5), io) + svn.checkout(Subversion::Revision.new(5), io) assert_equal "hello world\n", io.string end -- 1.6.3.3