aboutsummaryrefslogtreecommitdiffstats
path: root/actionwebservice/test/abstract_unit.rb
diff options
context:
space:
mode:
Diffstat (limited to 'actionwebservice/test/abstract_unit.rb')
-rw-r--r--actionwebservice/test/abstract_unit.rb19
1 files changed, 11 insertions, 8 deletions
diff --git a/actionwebservice/test/abstract_unit.rb b/actionwebservice/test/abstract_unit.rb
index 392951ede7..3afd928561 100644
--- a/actionwebservice/test/abstract_unit.rb
+++ b/actionwebservice/test/abstract_unit.rb
@@ -9,7 +9,7 @@ require 'action_web_service'
require 'action_controller'
require 'action_controller/test_process'
-ActionController::Base.logger = nil
+ActionController::Base.logger = Logger.new("debug.log")
ActionController::Base.ignore_missing_templates = true
begin
@@ -20,13 +20,16 @@ rescue Object => e
fail "\nFailed to load activerecord: #{e}"
end
-ActiveRecord::Base.establish_connection(
- :adapter => "mysql",
- :username => "rails",
- :encoding => "utf8",
- :database => "actionwebservice_unittest"
-)
-ActiveRecord::Base.connection
+ActiveRecord::Base.configurations = {
+ 'mysql' => {
+ :adapter => "mysql",
+ :username => "rails",
+ :encoding => "utf8",
+ :database => "actionwebservice_unittest"
+ }
+}
+
+ActiveRecord::Base.establish_connection 'mysql'
Test::Unit::TestCase.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"