kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

remove Rails application fallback from AD::IntegrationTest

Browse source 
set AD::IntegrationTest.app in railtie initializer
This commit is contained in:
Sergey Nartimov 2011-12-23 19:56:49 +03:00
parent a64ab95987
commit 5f3b9dec0a
4 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
actionpack/lib/action_dispatch.rb
View file

@ -29,6 +29,7 @@ $:.unshift(activemodel_path) if File.directory?(activemodel_path) && !$:.include
require 'active_support' require 'active_support'
require 'active_support/dependencies/autoload' require 'active_support/dependencies/autoload'
require 'active_support/core_ext/module/attribute_accessors'
require 'action_pack' require 'action_pack'
require 'active_model' require 'active_model'
@ -88,6 +89,8 @@ module ActionDispatch
autoload :CacheStore, 'action_dispatch/middleware/session/cache_store' autoload :CacheStore, 'action_dispatch/middleware/session/cache_store'
end end
mattr_accessor :test_app
autoload_under 'testing' do autoload_under 'testing' do
autoload :Assertions autoload :Assertions
autoload :Integration autoload :Integration

2
actionpack/lib/action_dispatch/railtie.rb
View file

@ -28,6 +28,8 @@ module ActionDispatch
config.action_dispatch.always_write_cookie = Rails.env.development? if config.action_dispatch.always_write_cookie.nil? config.action_dispatch.always_write_cookie = Rails.env.development? if config.action_dispatch.always_write_cookie.nil?
ActionDispatch::Cookies::CookieJar.always_write_cookie = config.action_dispatch.always_write_cookie ActionDispatch::Cookies::CookieJar.always_write_cookie = config.action_dispatch.always_write_cookie
ActionDispatch.test_app = app
end end
end end
end end

9
actionpack/lib/action_dispatch/testing/integration.rb
View file

@ -463,9 +463,12 @@ module ActionDispatch
@@app = nil @@app = nil
def self.app def self.app
# DEPRECATE Rails application fallback if !@@app && !ActionDispatch.test_app
# This should be set by the initializer ActiveSupport::Deprecation.warn "Rails application fallback is deprecated " \
@@app || (defined?(Rails.application) && Rails.application) || nil "and no longer works, please set ActionDispatch.test_app", caller
end
@@app || ActionDispatch.test_app
end end
def self.app=(app) def self.app=(app)

5
railties/test/application/configuration_test.rb
View file

@ -282,6 +282,11 @@ module ApplicationTests
assert_equal res, last_response.body # value should be unchanged assert_equal res, last_response.body # value should be unchanged
end end
test "sets ActionDispatch.test_app" do
make_basic_app
assert_equal Rails.application, ActionDispatch.test_app
end
test "sets all Active Record models to whitelist all attributes by default" do test "sets all Active Record models to whitelist all attributes by default" do
add_to_config <<-RUBY add_to_config <<-RUBY
config.active_record.whitelist_attributes = true config.active_record.whitelist_attributes = true