Permalink
Browse files

Merge pull request #7474 from steveklabnik/backport_89ebd28

Backport 89ebd28 to 3-2-stable
  • Loading branch information...
2 parents 58d35f6 + 728e925 commit f84fc39e2ad4195a7002d92c9bb7ead78f3d57b2 @drogus drogus committed Aug 29, 2012
@@ -12,7 +12,7 @@ def self.new(env = {})
end
def initialize(env = {})
- env = Rails.application.env_config.merge(env) if defined?(Rails.application)
+ env = Rails.application.env_config.merge(env) if defined?(Rails.application) && Rails.application
super(DEFAULT_ENV.merge(env))
self.host = 'test.host'
@@ -55,6 +55,13 @@ class TestRequestTest < ActiveSupport::TestCase
assert_cookies({"user_name" => "david"}, req.cookie_jar)
end
+ test "does not complain when Rails.application is nil" do
+ Rails.stubs(:application).returns(nil)
+ req = ActionDispatch::TestRequest.new
+
+ assert_equal false, req.env.empty?
+ end
+
private
def assert_cookies(expected, cookie_jar)
assert_equal(expected, cookie_jar.instance_variable_get("@cookies"))

0 comments on commit f84fc39

Please sign in to comment.