From ffe860fd44b30ed4276546ed847f23eaad9014b9 Mon Sep 17 00:00:00 2001 From: MasterLambaster Date: Wed, 6 Jun 2012 12:55:55 +0300 Subject: [PATCH] Use proper logger form configuration --- lib/capistrano/recipes/deploy/strategy/base.rb | 2 +- test/deploy/strategy/copy_test.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/capistrano/recipes/deploy/strategy/base.rb b/lib/capistrano/recipes/deploy/strategy/base.rb index ab1e7c78a..f473a2e9b 100644 --- a/lib/capistrano/recipes/deploy/strategy/base.rb +++ b/lib/capistrano/recipes/deploy/strategy/base.rb @@ -73,7 +73,7 @@ def system(*args) private def logger - @logger ||= configuration[:logger] || Capistrano::Logger.new(:output => STDOUT) + @logger ||= configuration.logger || Capistrano::Logger.new(:output => STDOUT) end # The revision to deploy. Must return a real revision identifier, diff --git a/test/deploy/strategy/copy_test.rb b/test/deploy/strategy/copy_test.rb index 50d55fedd..75ac4b241 100644 --- a/test/deploy/strategy/copy_test.rb +++ b/test/deploy/strategy/copy_test.rb @@ -6,10 +6,11 @@ class DeployStrategyCopyTest < Test::Unit::TestCase def setup @config = { :application => "captest", - :logger => Capistrano::Logger.new(:output => StringIO.new), :releases_path => "/u/apps/test/releases", :release_path => "/u/apps/test/releases/1234567890", :real_revision => "154" } + @config.stubs(:logger).returns(stub_everything) + @source = mock("source") @config.stubs(:source).returns(@source) @strategy = Capistrano::Deploy::Strategy::Copy.new(@config)