Fix for issue #75 and missing host exception #77

Merged
merged 2 commits into from Oct 1, 2012
@@ -16,7 +16,7 @@ class IntegrationTest < MiniTest::Rails::ActiveSupport::TestCase
def self.app
# DEPRECATE Rails application fallback
# This should be set by the initializer
- @@app || (defined?(Rails.application) && Rails.application) || nil
+ @@app || (defined?(::Rails.application) && ::Rails.application) || nil
end
def self.app=(app)
@@ -26,6 +26,11 @@ def self.app=(app)
def app
super || ::ActionDispatch::IntegrationTest.app
end
+
+ def url_options
+ reset! unless integration_session
+ integration_session.url_options
+ end
# Register by name
register_spec_type(/Acceptance ?Test\z/i, self)