From 6a31e650f32054c9723b2b14cda1d7d7a1e8dfa1 Mon Sep 17 00:00:00 2001
From: Tom Preston-Werner <tom@mojombo.com>
Date: Sun, 24 Apr 2011 18:39:27 +0800
Subject: [PATCH] Tests and specs run under 1.9.

---
 Rakefile                    | 2 ++
 features/support/env.rb     | 2 +-
 test/helper.rb              | 6 ++----
 test/test_configuration.rb  | 2 +-
 test/test_core_ext.rb       | 2 +-
 test/test_filters.rb        | 2 +-
 test/test_generated_site.rb | 2 +-
 test/test_kramdown.rb       | 2 +-
 test/test_page.rb           | 2 +-
 test/test_pager.rb          | 2 +-
 test/test_post.rb           | 2 +-
 test/test_rdiscount.rb      | 2 +-
 test/test_site.rb           | 2 +-
 test/test_tags.rb           | 2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Rakefile b/Rakefile
index 11551f908be..923816c03ec 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,6 +2,8 @@ require 'rubygems'
 require 'rake'
 require 'date'
 
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[lib]))
+
 #############################################################################
 #
 # Helper functions
diff --git a/features/support/env.rb b/features/support/env.rb
index b8b64165aa9..c6642fd9bc0 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -16,4 +16,4 @@ def run_jekyll(opts = {})
 end
 
 # work around "invalid option: --format" cucumber bug (see #296)
-Test::Unit.run = true
+# Test::Unit.run = true
diff --git a/test/helper.rb b/test/helper.rb
index f83cfa71e94..6ee3f7a4428 100644
--- a/test/helper.rb
+++ b/test/helper.rb
@@ -1,18 +1,16 @@
 require 'rubygems'
 gem 'RedCloth', '>= 4.2.1'
 
-require File.join(File.dirname(__FILE__), *%w[.. lib jekyll])
+require 'jekyll'
 
 require 'RedCloth'
 require 'rdiscount'
 require 'kramdown'
 
+require 'redgreen' if RUBY_VERSION < '1.9'
 require 'shoulda'
 require 'rr'
 
-require 'test/unit'
-require 'test/unit/ui/console/testrunner'
-class Test::Unit::UI::Console::TestRunner; def guess_color_availability; true; end; end
 
 include Jekyll
 
diff --git a/test/test_configuration.rb b/test/test_configuration.rb
index 5b66420b1ed..76e8a81289f 100644
--- a/test/test_configuration.rb
+++ b/test/test_configuration.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestConfiguration < Test::Unit::TestCase
   context "loading configuration" do
diff --git a/test/test_core_ext.rb b/test/test_core_ext.rb
index 85aca6498bf..c3e62cb55c6 100644
--- a/test/test_core_ext.rb
+++ b/test/test_core_ext.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestCoreExt < Test::Unit::TestCase
   context "hash" do
diff --git a/test/test_filters.rb b/test/test_filters.rb
index 0897fbc2b22..4fa0b819a15 100644
--- a/test/test_filters.rb
+++ b/test/test_filters.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestFilters < Test::Unit::TestCase
   class JekyllFilter
diff --git a/test/test_generated_site.rb b/test/test_generated_site.rb
index cba75649a2a..c70870318e5 100644
--- a/test/test_generated_site.rb
+++ b/test/test_generated_site.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestGeneratedSite < Test::Unit::TestCase
   context "generated sites" do
diff --git a/test/test_kramdown.rb b/test/test_kramdown.rb
index f89e7286ef8..99a7b4547d6 100644
--- a/test/test_kramdown.rb
+++ b/test/test_kramdown.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestKramdown < Test::Unit::TestCase
   context "kramdown" do
diff --git a/test/test_page.rb b/test/test_page.rb
index ad5c296f1db..612789971ff 100644
--- a/test/test_page.rb
+++ b/test/test_page.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestPage < Test::Unit::TestCase
   def setup_page(file)
diff --git a/test/test_pager.rb b/test/test_pager.rb
index ffd1aa970a3..4d420f79121 100644
--- a/test/test_pager.rb
+++ b/test/test_pager.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestPager < Test::Unit::TestCase
 
diff --git a/test/test_post.rb b/test/test_post.rb
index c4a5db127c6..323ab7dc427 100644
--- a/test/test_post.rb
+++ b/test/test_post.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestPost < Test::Unit::TestCase
   def setup_post(file)
diff --git a/test/test_rdiscount.rb b/test/test_rdiscount.rb
index 2cb40d6d207..894ea18f2ec 100644
--- a/test/test_rdiscount.rb
+++ b/test/test_rdiscount.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestRdiscount < Test::Unit::TestCase
 
diff --git a/test/test_site.rb b/test/test_site.rb
index d8d1057e433..c9b991b7c03 100644
--- a/test/test_site.rb
+++ b/test/test_site.rb
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestSite < Test::Unit::TestCase
   context "creating sites" do
diff --git a/test/test_tags.rb b/test/test_tags.rb
index 7cbc12e11e0..ba3d0d3ed7c 100644
--- a/test/test_tags.rb
+++ b/test/test_tags.rb
@@ -1,6 +1,6 @@
 # coding: utf-8
 
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
 
 class TestTags < Test::Unit::TestCase