From c60be9c5710e29a37e37d18491abec91b487ffbc Mon Sep 17 00:00:00 2001
From: Nick Quaranto <nick@quaran.to>
Date: Tue, 17 Mar 2009 23:17:51 -0400
Subject: [PATCH] Stubbing out the configuration makes for much less warnings.

---
 test/helper.rb              |  6 +++++-
 test/test_generated_site.rb | 13 +++++++------
 test/test_post.rb           |  2 +-
 test/test_site.rb           | 12 ++++++------
 4 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/test/helper.rb b/test/helper.rb
index 71d8d635..e67d7d25 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -11,7 +11,11 @@ class Test::Unit::TestCase
   include RR::Adapters::TestUnit
 
   def dest_dir
-    File.join(File.dirname(__FILE__), *%w[dest])
+    File.join(File.dirname(__FILE__), 'dest')
+  end
+
+  def source_dir
+    File.join(File.dirname(__FILE__), 'source')
   end
 
   def clear_dest
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index 8226291a..91c5edf2 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -4,9 +4,11 @@ class TestGeneratedSite < Test::Unit::TestCase
   context "generated sites" do
     setup do
       clear_dest
-      @source = File.join(File.dirname(__FILE__), *%w[source])
-      @configuration = Jekyll.configuration 'source' => @source, 'destination' => dest_dir
-      @site = Site.new(@configuration)
+      stub(Jekyll).configuration do
+        Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
+      end
+
+      @site = Site.new(Jekyll.configuration)
       @site.process
       @index = File.read(File.join(dest_dir, 'index.html'))
     end
@@ -16,9 +18,8 @@ class TestGeneratedSite < Test::Unit::TestCase
     end
 
     should "render post.content" do
-      latest_post = Dir[File.join(@source, '_posts/*')].last
-      post = Post.new(@site, @source, '', File.basename(latest_post))
-      #Jekyll.content_type = post.determine_content_type
+      latest_post = Dir[File.join(source_dir, '_posts/*')].last
+      post = Post.new(@site, source_dir, '', File.basename(latest_post))
       post.transform
       assert @index.include?(post.content)
     end
diff --git a/test/test_post.rb b/test/test_post.rb
index 213089fe..936ddad0 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/helper'
 
 class TestPost < Test::Unit::TestCase
   def setup_post(file)
-    Post.new(@site, File.join(File.dirname(__FILE__), *%w[source]), '', file)
+    Post.new(@site, File.join(File.dirname(__FILE__), 'source'), '', file)
   end
 
   def do_render(post)
diff --git a/test/test_site.rb b/test/test_site.rb
index de4bb095..e568e51f 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -3,10 +3,10 @@ require File.dirname(__FILE__) + '/helper'
 class TestSite < Test::Unit::TestCase
   context "creating sites" do
     setup do
-      @source = File.join(File.dirname(__FILE__), 'source')
-      @configuration = Jekyll.configuration(:source => @source, :destination => dest_dir)
-
-      @s = Site.new(@configuration)
+      stub(Jekyll).configuration do
+        Jekyll::DEFAULTS.merge({'source' => source_dir, 'destination' => dest_dir})
+      end
+      @site = Site.new(Jekyll.configuration)
     end
 
     #should "read layouts" do
@@ -37,8 +37,8 @@ class TestSite < Test::Unit::TestCase
               .baz.markdow foo.markdown~]
       ent2 = %w[.htaccess _posts bla.bla]
 
-      assert_equal %w[foo.markdown bar.markdown baz.markdown], @s.filter_entries(ent1)
-      assert_equal ent2, @s.filter_entries(ent2)
+      assert_equal %w[foo.markdown bar.markdown baz.markdown], @site.filter_entries(ent1)
+      assert_equal ent2, @site.filter_entries(ent2)
     end
   end
 end