1 files changed, 18 insertions, 1 deletions
diff --git a/actionwebservice/test/abstract_unit.rb b/actionwebservice/test/abstract_unit.rb
index a57299bea0..149f108c98 100644
--- a/actionwebservice/test/abstract_unit.rb
+++ b/actionwebservice/test/abstract_unit.rb
@@ -5,10 +5,27 @@ $:.unshift(File.dirname(__FILE__) + '/../../actionpack/lib')
 $:.unshift(File.dirname(__FILE__) + '/../../activerecord/lib')
 
 require 'test/unit'
-require 'active_record'
 require 'action_web_service'
 require 'action_controller'
 require 'action_controller/test_process'
 
 ActionController::Base.logger = nil
 ActionController::Base.ignore_missing_templates = true
+
+begin
+  PATH_TO_AR = File.dirname(__FILE__) + '/../../activerecord'
+  require "#{PATH_TO_AR}/lib/active_record" unless Object.const_defined?(:ActiveRecord)
+  require "#{PATH_TO_AR}/lib/active_record/fixtures" unless Object.const_defined?(:Fixtures)
+rescue Object => e
+  fail "\nFailed to load activerecord: #{e}"
+end
+
+ActiveRecord::Base.establish_connection(
+  :adapter  => "mysql",
+  :username => "rails",
+  :encoding => "utf8",
+  :database => "activewebservice_unittest"
+)
+ActiveRecord::Base.connection
+
+Test::Unit::TestCase.fixture_path = "#{File.dirname(__FILE__)}/fixtures/"