test/base/test_site.rb in nanoc-3.5.0 vs test/base/test_site.rb in nanoc-3.6.0

@@ -3,21 +3,27 @@
 class Nanoc::SiteTest < MiniTest::Unit::TestCase
 
   include Nanoc::TestHelpers
 
   def test_initialize_with_dir_without_config_yaml
-    assert_raises(Errno::ENOENT) do
+    assert_raises(Nanoc::Errors::GenericTrivial) do
       Nanoc::Site.new('.')
     end
   end
 
   def test_initialize_with_dir_with_config_yaml
     File.open('config.yaml', 'w') { |io| io.write('output_dir: public_html') }
     site = Nanoc::Site.new('.')
     assert_equal 'public_html', site.config[:output_dir]
   end
 
+  def test_initialize_with_dir_with_nanoc_yaml
+    File.open('nanoc.yaml', 'w') { |io| io.write('output_dir: public_html') }
+    site = Nanoc::Site.new('.')
+    assert_equal 'public_html', site.config[:output_dir]
+  end
+
   def test_initialize_with_config_hash
     site = Nanoc::Site.new(:foo => 'bar')
     assert_equal 'bar', site.config[:foo]
   end
 
@@ -63,11 +69,11 @@
         io.write "  def items ; [ Nanoc::Item.new('content', {}, '/foo/') ] ; end\n"
         io.write "end\n"
       end
 
       # Update configuration
-      File.open('config.yaml', 'w') do |io|
+      File.open('nanoc.yaml', 'w') do |io|
         io.write "data_sources:\n"
         io.write "  - type: site_test_foo"
       end
 
       # Create site
@@ -168,10 +174,10 @@
     end.must_raise Nanoc::Errors::UnknownDataSource
   end
 
   it 'should also use the toplevel config for data sources' do
     with_site do
-      File.open('config.yaml', 'w') do |io|
+      File.open('nanoc.yaml', 'w') do |io|
         io.write "data_sources:\n"
         io.write "  -\n"
         io.write "    type: filesystem_unified\n"
         io.write "    aaa: one\n"
         io.write "    config:\n"