From 7c7bacffe76fd05e20f5f2b4d45fa57c3ca7533c Mon Sep 17 00:00:00 2001 From: Parker Moore Date: Fri, 12 Apr 2013 22:37:01 +0200 Subject: [PATCH] Refactor setup block for test of Configuration#config_files --- test/test_configuration.rb | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/test/test_configuration.rb b/test/test_configuration.rb index c8a2aac5..8793b29d 100644 --- a/test/test_configuration.rb +++ b/test/test_configuration.rb @@ -27,11 +27,10 @@ class TestConfiguration < Test::Unit::TestCase end context "#config_files" do setup do - @config = Configuration[Configuration::DEFAULTS] - @base_config = {"source" => source_dir} - @no_override = @base_config.merge({}) - @one_config_file = @base_config.merge({ "config" => "config.yml" }) - @multiple_files = @base_config.merge({ "config" => %w[config/site.yml config/deploy.yml configuration.yml] }) + @config = Configuration[{"source" => source_dir}] + @no_override = {} + @one_config_file = {"config" => "config.yml"} + @multiple_files = {"config" => %w[config/site.yml config/deploy.yml configuration.yml]} end should "always return an array" do