aboutsummaryrefslogtreecommitdiffstats
path: root/railties
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-03-02 12:31:29 -0800
committerCarlhuda <carlhuda@engineyard.com>2010-03-02 12:31:29 -0800
commit57bae9764e45ad19dff7a879eeb46d1dffc5ca22 (patch)
tree8ba1ff64374a1ddbf805708ea2767df504651a09 /railties
parenta64fcc1a8d84b274691b5e332257eabf0cb5c2a8 (diff)
downloadrails-57bae9764e45ad19dff7a879eeb46d1dffc5ca22.tar.gz
rails-57bae9764e45ad19dff7a879eeb46d1dffc5ca22.tar.bz2
rails-57bae9764e45ad19dff7a879eeb46d1dffc5ca22.zip
Fix a test that assumes that defined?(ActiveRecord) == defined?(ActiveRecord::Base)
Diffstat (limited to 'railties')
-rw-r--r--railties/test/application/initializers/frameworks_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/railties/test/application/initializers/frameworks_test.rb b/railties/test/application/initializers/frameworks_test.rb
index 94d3505518..91f31df2e7 100644
--- a/railties/test/application/initializers/frameworks_test.rb
+++ b/railties/test/application/initializers/frameworks_test.rb
@@ -91,7 +91,7 @@ module ApplicationTests
test "database middleware doesn't initialize when activerecord is not in frameworks" do
use_frameworks []
require "#{app_path}/config/environment"
- assert_nil defined?(ActiveRecord)
+ assert_nil defined?(ActiveRecord::Base)
end
end
end