Skip to content
Browse files

Merge remote-tracking branch 'jbw/ruby-v1.9' into devel

  • Loading branch information...
2 parents 0f71bdb + de7e001 commit 093a5efbe1309ac4c4a12ed52a0b24b12cc0b995 @mojombo mojombo committed Apr 23, 2011
Showing with 10 additions and 3 deletions.
  1. +1 −0 README.textile
  2. +4 −2 test/helper.rb
  3. +3 −1 test/suite.rb
  4. +2 −0 test/test_tags.rb
View
1 README.textile
@@ -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
View
6 test/helper.rb
@@ -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
View
4 test/suite.rb
@@ -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
View
2 test/test_tags.rb
@@ -1,3 +1,5 @@
+# coding: utf-8
+
require File.dirname(__FILE__) + '/helper'
class TestTags < Test::Unit::TestCase

0 comments on commit 093a5ef

Please sign in to comment.
Something went wrong with that request. Please try again.