Permalink
Browse files

Tests and specs run under 1.9.

  • Loading branch information...
1 parent 093a5ef commit 6a31e650f32054c9723b2b14cda1d7d7a1e8dfa1 @mojombo mojombo committed Apr 24, 2011
View
@@ -2,6 +2,8 @@ require 'rubygems'
require 'rake'
require 'date'
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[lib]))
+
#############################################################################
#
# Helper functions
View
@@ -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
View
@@ -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
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
class TestConfiguration < Test::Unit::TestCase
context "loading configuration" do
View
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
class TestCoreExt < Test::Unit::TestCase
context "hash" do
View
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
class TestFilters < Test::Unit::TestCase
class JekyllFilter
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
class TestGeneratedSite < Test::Unit::TestCase
context "generated sites" do
View
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
class TestKramdown < Test::Unit::TestCase
context "kramdown" do
View
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
class TestPage < Test::Unit::TestCase
def setup_page(file)
View
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
class TestPager < Test::Unit::TestCase
View
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
class TestPost < Test::Unit::TestCase
def setup_post(file)
View
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
class TestRdiscount < Test::Unit::TestCase
View
@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
class TestSite < Test::Unit::TestCase
context "creating sites" do
View
@@ -1,6 +1,6 @@
# coding: utf-8
-require File.dirname(__FILE__) + '/helper'
+require 'helper'
class TestTags < Test::Unit::TestCase

0 comments on commit 6a31e65

Please sign in to comment.