missed some renames
git-svn-id: https://svn.thoughtbot.com/plugins/shoulda/trunk@84 7bbfaf0e-4d1d-0410-9690-a8bb5f8ef2aa
This commit is contained in:
parent
7910643c6f
commit
f77e17b6e4
2
init.rb
2
init.rb
|
@ -1,3 +1,3 @@
|
|||
require 'rubygems'
|
||||
require 'active_support'
|
||||
require 'tb_test_helpers'
|
||||
require 'shoulda'
|
|
@ -3,7 +3,7 @@ require 'test/unit/ui/console/testrunner'
|
|||
# Completely stolen from redgreen gem
|
||||
#
|
||||
# Adds colored output to your tests. Specify <tt>color: true</tt> in
|
||||
# your <tt>test/tb_test_helpers.conf</tt> file to enable.
|
||||
# your <tt>test/shoulda.conf</tt> file to enable.
|
||||
#
|
||||
# *Bug*: for some reason, this adds another line of output to the end of
|
||||
# every rake task, as though there was another (empty) set of tests.
|
||||
|
|
|
@ -3,8 +3,8 @@ require 'context'
|
|||
require 'general'
|
||||
require 'yaml'
|
||||
|
||||
config_file = "tb_test_helpers.conf"
|
||||
config_file = defined?(RAILS_ROOT) ? File.join(RAILS_ROOT, "test", "tb_test_helpers.conf") : File.join("test", "tb_test_helpers.conf")
|
||||
config_file = "shoulda.conf"
|
||||
config_file = defined?(RAILS_ROOT) ? File.join(RAILS_ROOT, "test", "shoulda.conf") : File.join("test", "shoulda.conf")
|
||||
|
||||
tb_test_options = (YAML.load_file(config_file) rescue {}).symbolize_keys
|
||||
require 'color' if tb_test_options[:color]
|
||||
|
|
|
@ -3,4 +3,4 @@ $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
|
|||
require 'rubygems'
|
||||
require 'active_support'
|
||||
require 'test/unit'
|
||||
require 'tb_test_helpers'
|
||||
require 'shoulda'
|
||||
|
|
Loading…
Reference in New Issue