aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/activerecord/active_record_assertions_test.rb
diff options
context:
space:
mode:
authorJeremy Kemper <jeremy@bitsweat.net>2006-08-22 09:19:55 +0000
committerJeremy Kemper <jeremy@bitsweat.net>2006-08-22 09:19:55 +0000
commit767eaa9df13549037f053c89a0a0d334b3086873 (patch)
treed545bf8975c9d57e209b1d2fb0a41bbeeaaba044 /actionpack/test/activerecord/active_record_assertions_test.rb
parent8f89f14fc80af58c1cebb84342cf109aebc858a1 (diff)
downloadrails-767eaa9df13549037f053c89a0a0d334b3086873.tar.gz
rails-767eaa9df13549037f053c89a0a0d334b3086873.tar.bz2
rails-767eaa9df13549037f053c89a0a0d334b3086873.zip
Clean up and run the Active Record integration tests by default. Closes #5854.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4807 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/test/activerecord/active_record_assertions_test.rb')
-rw-r--r--actionpack/test/activerecord/active_record_assertions_test.rb3
1 files changed, 1 insertions, 2 deletions
diff --git a/actionpack/test/activerecord/active_record_assertions_test.rb b/actionpack/test/activerecord/active_record_assertions_test.rb
index ebb7774fc9..6662d3d10c 100644
--- a/actionpack/test/activerecord/active_record_assertions_test.rb
+++ b/actionpack/test/activerecord/active_record_assertions_test.rb
@@ -1,5 +1,4 @@
require "#{File.dirname(__FILE__)}/../active_record_unit"
-require 'fixtures/company' if ActiveRecordTestConnector.able_to_connect
class ActiveRecordAssertionsController < ActionController::Base
self.template_root = "#{File.dirname(__FILE__)}/../fixtures/"
@@ -39,7 +38,7 @@ class ActiveRecordAssertionsController < ActionController::Base
end
class ActiveRecordAssertionsControllerTest < ActiveRecordTestCase
- fixtures :companies if ActiveRecordTestConnector.able_to_connect
+ fixtures :companies
def setup
@request = ActionController::TestRequest.new