Merge remote branch 'rails/master'

2 files changed, 15 insertions, 1 deletions

diff --git a/railties/test/application/loading_test.rb b/railties/test/application/loading_test.rb
index b337d3fc6e..340ce67511 100644
--- a/railties/test/application/loading_test.rb
+++ b/railties/test/application/loading_test.rb
@@ -12,7 +12,7 @@ class LoadingTest < Test::Unit::TestCase
     @app ||= Rails.application
   end
 
-  def test_load_should_load_constants
+  def test_constants_in_app_are_autoloaded
     app_file "app/models/post.rb", <<-MODEL
       class Post < ActiveRecord::Base
         validates_acceptance_of :title, :accept => "omg"
@@ -29,6 +29,19 @@ class LoadingTest < Test::Unit::TestCase
     assert_equal 'omg', p.title
   end
 
+  def test_models_without_table_do_not_panic_on_scope_definitions_when_loaded
+    app_file "app/models/user.rb", <<-MODEL
+      class User < ActiveRecord::Base
+        default_scope where(:published => true)
+      end
+    MODEL
+
+    require "#{rails_root}/config/environment"
+    setup_ar!
+
+    User
+  end
+
   def test_descendants_are_cleaned_on_each_request_without_cache_classes
     add_to_config <<-RUBY
       config.cache_classes = false
diff --git a/railties/test/application/url_generation_test.rb b/railties/test/application/url_generation_test.rb
index 72cae23985..2b6ec26cd0 100644
--- a/railties/test/application/url_generation_test.rb
+++ b/railties/test/application/url_generation_test.rb
@@ -16,6 +16,7 @@ module ApplicationTests
       class MyApp < Rails::Application
         config.secret_token = "3b7cd727ee24e8444053437c36cc66c4"
         config.session_store :cookie_store, :key => "_myapp_session"
+        config.active_support.deprecation = :log
       end
 
       MyApp.initialize!