Skip to content

Commit

Permalink
Tests and specs run under 1.9.
Browse files Browse the repository at this point in the history
  • Loading branch information
mojombo committed Apr 24, 2011
1 parent 093a5ef commit 6a31e65
Show file tree
Hide file tree
Showing 14 changed files with 16 additions and 16 deletions.
2 changes: 2 additions & 0 deletions Rakefile
Expand Up @@ -2,6 +2,8 @@ require 'rubygems'
require 'rake'
require 'date'

$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), *%w[lib]))

#############################################################################
#
# Helper functions
Expand Down
2 changes: 1 addition & 1 deletion features/support/env.rb
Expand Up @@ -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
6 changes: 2 additions & 4 deletions 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

Expand Down
2 changes: 1 addition & 1 deletion test/test_configuration.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/helper'
require 'helper'

class TestConfiguration < Test::Unit::TestCase
context "loading configuration" do
Expand Down
2 changes: 1 addition & 1 deletion test/test_core_ext.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/helper'
require 'helper'

class TestCoreExt < Test::Unit::TestCase
context "hash" do
Expand Down
2 changes: 1 addition & 1 deletion test/test_filters.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/helper'
require 'helper'

class TestFilters < Test::Unit::TestCase
class JekyllFilter
Expand Down
2 changes: 1 addition & 1 deletion 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
Expand Down
2 changes: 1 addition & 1 deletion test/test_kramdown.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/helper'
require 'helper'

class TestKramdown < Test::Unit::TestCase
context "kramdown" do
Expand Down
2 changes: 1 addition & 1 deletion test/test_page.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/helper'
require 'helper'

class TestPage < Test::Unit::TestCase
def setup_page(file)
Expand Down
2 changes: 1 addition & 1 deletion test/test_pager.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/helper'
require 'helper'

class TestPager < Test::Unit::TestCase

Expand Down
2 changes: 1 addition & 1 deletion test/test_post.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/helper'
require 'helper'

class TestPost < Test::Unit::TestCase
def setup_post(file)
Expand Down
2 changes: 1 addition & 1 deletion test/test_rdiscount.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/helper'
require 'helper'

class TestRdiscount < Test::Unit::TestCase

Expand Down
2 changes: 1 addition & 1 deletion test/test_site.rb
@@ -1,4 +1,4 @@
require File.dirname(__FILE__) + '/helper'
require 'helper'

class TestSite < Test::Unit::TestCase
context "creating sites" do
Expand Down
2 changes: 1 addition & 1 deletion test/test_tags.rb
@@ -1,6 +1,6 @@
# coding: utf-8

require File.dirname(__FILE__) + '/helper'
require 'helper'

class TestTags < Test::Unit::TestCase

Expand Down

0 comments on commit 6a31e65

Please sign in to comment.