From: Toshi MARUYAMA <marutosijp2@yahoo.co.jp>
Date: Sun, 13 Nov 2011 11:47:08 +0000 (+0000)
Subject: Ruby 1.9: fix tests error due to require path at test/test_helper.rb
X-Git-Tag: 1.3.0~209
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=c54b33ddca34c7a82538067b5d92935304f0f944;p=redmine.git

Ruby 1.9: fix tests error due to require path at test/test_helper.rb

Following error raises.

<pre>
/home/xxxxxx/.rvm/gems/ruby-1.9.2-p290/gems/rails-2.3.11/lib/rails/gem_dependency.rb:277:in `==':
   undefined method `name' for "actionmailer":String (NoMethodError)
...
	from /REDMINE-1/hg-workdir/redmine-bb-all/test/test_helper.rb:19:in `<top (required)>'
	from <internal:lib/rubygems/custom_require>:29:in `require'
	from <internal:lib/rubygems/custom_require>:29:in `require'
	from test/unit/changeset_test.rb:20:in `<main>'
</pre>

Moreover, in order to run tests on Ruby 1.9.2, Rails needs to be 2.3.14.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@7802 e93f8b46-1217-0410-a6f0-8f06a7374b81
---

diff --git a/test/test_helper.rb b/test/test_helper.rb
index ab7084aaa..653a97625 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -19,7 +19,7 @@ ENV["RAILS_ENV"] = "test"
 require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
 require 'test_help'
 require File.expand_path(File.dirname(__FILE__) + '/helper_testcase')
-require Rails.root.join('test', 'mocks', 'open_id_authentication_mock.rb')
+require Rails.root.join('test', 'mocks', 'open_id_authentication_mock.rb').to_s
 
 require File.expand_path(File.dirname(__FILE__) + '/object_daddy_helpers')
 include ObjectDaddyHelpers