Skip to content

Commit

Permalink
Merge remote-tracking branch 'jbw/ruby-v1.9' into devel
Browse files Browse the repository at this point in the history
  • Loading branch information
mojombo committed Apr 23, 2011
2 parents 0f71bdb + de7e001 commit 093a5ef
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 3 deletions.
1 change: 1 addition & 0 deletions README.textile
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ h2. Developer Dependencies
* Shoulda: Test framework (Ruby)
* RR: Mocking (Ruby)
* RedGreen: Nicer test output (Ruby)
* RDiscount: Discount Markdown Processor (Ruby)

h2. License

Expand Down
6 changes: 4 additions & 2 deletions test/helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@
require 'rdiscount'
require 'kramdown'

require 'test/unit'
require 'redgreen'
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

# Send STDERR into the void to suppress program output messages
Expand Down
4 changes: 3 additions & 1 deletion test/suite.rb
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
require 'rubygems'
gem 'test-unit'
require 'test/unit'

# for some reason these tests fail when run via TextMate
# but succeed when run on the command line.

tests = Dir["#{File.dirname(__FILE__)}/test_*.rb"]
tests = Dir[File.expand_path("#{File.dirname(__FILE__)}/test_*.rb")]
tests.each do |file|
require file
end
2 changes: 2 additions & 0 deletions test/test_tags.rb
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# coding: utf-8

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

class TestTags < Test::Unit::TestCase
Expand Down

0 comments on commit 093a5ef

Please sign in to comment.