test/cli/commands/test_create_site.rb in nanoc-4.0.0b4 vs test/cli/commands/test_create_site.rb in nanoc-4.0.0rc1

@@ -8,31 +8,31 @@
 
   def test_can_compile_new_site
     Nanoc::CLI.run %w( create_site foo )
 
     FileUtils.cd('foo') do
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
   end
 
   def test_can_compile_new_site_in_current_directory
     FileUtils.mkdir('foo')
 
     FileUtils.cd('foo') do
       Nanoc::CLI.run %w( create_site ./ )
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
   end
 
   def test_can_compile_new_site_with_binary_items
     Nanoc::CLI.run %w( create_site foo )
 
     FileUtils.cd('foo') do
       File.open('content/blah', 'w') { |io| io << 'asdf' }
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       assert File.file?('output/blah')
     end
   end
@@ -41,22 +41,22 @@
     FileUtils.mkdir('foo')
     FileUtils.touch(File.join('foo', 'SomeFile.txt'))
     Nanoc::CLI.run %w( create_site foo --force )
 
     FileUtils.cd('foo') do
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
   end
 
   def test_compiled_site_output
     FileUtils.mkdir('foo')
     FileUtils.touch(File.join('foo', 'SomeFile.txt'))
     Nanoc::CLI.run %w( create_site foo --force )
 
     FileUtils.cd('foo') do
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
 
       assert File.file?('output/index.html')
     end
   end
@@ -73,13 +73,12 @@
     Nanoc::CLI.run %w( create_site foo )
 
     FileUtils.cd('foo') do
       # Try with encoding = default encoding = utf-8
       File.open('content/index.html', 'w') { |io| io.write("Hello <\xD6>!\n") }
-      site = Nanoc::Int::Site.new('.')
       exception = assert_raises(RuntimeError) do
-        site.compile
+        Nanoc::Int::SiteLoader.new.new_from_cwd
       end
       assert_equal 'Could not read content/index.html because the file is not valid UTF-8.', exception.message
 
       # Try with encoding = specific
       File.open('nanoc.yaml', 'w') do |io|
@@ -87,10 +86,10 @@
         io.write("data_sources:\n")
         io.write("  -\n")
         io.write("    type: filesystem\n")
         io.write("    identifier_type: full\n")
       end
-      site = Nanoc::Int::Site.new('.')
+      site = Nanoc::Int::SiteLoader.new.new_from_cwd
       site.compile
     end
     FileUtils
   ensure
     Encoding.default_external = original_encoding