test/hirb_test.rb in hirb-0.2.9 vs test/hirb_test.rb in hirb-0.2.10

@@ -1,13 +1,15 @@
 require File.join(File.dirname(__FILE__), 'test_helper')
 
 class HirbTest < Test::Unit::TestCase
-  before(:each) {Hirb.instance_eval "@config = nil"}
+  before(:all) { Hirb.config_files = nil }
+  before(:each) { Hirb.config = nil }
 
   test "config converts yaml when config file exists" do
     yaml_data = {:blah=>'blah'}
     File.stubs('exists?').returns(true)
+    Hirb.config_files = ['ok']
     YAML::expects(:load_file).returns(yaml_data)
     Hirb.config.should == yaml_data
   end
   
   test "config defaults to hash when no config file" do
@@ -15,16 +17,23 @@
     Hirb.config.should == {}
   end
   
   test "config reloads if given explicit reload" do
     Hirb.config
-    Hirb.expects(:read_config_file)
+    Hirb.expects(:read_config_file).returns({})
     Hirb.config(true)
   end
 
+  test "config reads multiple config files and merges them" do
+    Hirb.config_files = %w{one two}
+    Hirb.expects(:read_config_file).times(2).returns({:output=>{"String"=>:auto_table}}, {:output=>{"Array"=>:auto_table}})
+    Hirb.config.should == {:output=>{"Array"=>:auto_table, "String"=>:auto_table}}
+    Hirb.config_files = nil
+  end
+
   test "config_file sets correctly when no ENV['HOME']" do
-    Hirb.config_file = nil
+    Hirb.config_files = nil
     home = ENV.delete('HOME')
-    Hirb.config_file.class.should == String
+    Hirb.config_files[0].class.should == String
     ENV["HOME"] = home
   end
 end
\ No newline at end of file