Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

If IntegrationSession is initialized with an objects that responds to…

… #routes, automatically extend the URL helpers from the RouteSet onto it
  • Loading branch information...
commit 050831803a9e553ba392a73732b00528dfa8c6ad 1 parent 6324eee
Carlhuda authored
View
1  actionpack/lib/action_dispatch/routing/route_set.rb
@@ -203,7 +203,6 @@ def #{selector}(*args)
url_for(options)
end
- protected :#{selector}
END_EVAL
helpers << selector
end
View
28 actionpack/lib/action_dispatch/testing/integration.rb
@@ -162,12 +162,31 @@ def cookies
# A running counter of the number of requests processed.
attr_accessor :request_count
+ include ActionDispatch::Routing::UrlFor
+
# Create and initialize a new Session instance.
def initialize(app)
@app = app
+
+ # If the app is a Rails app, make url_helpers available on the session
+ # This makes app.url_for and app.foo_path available in the console
+ if app.respond_to?(:routes) && app.routes.respond_to?(:url_helpers)
+ singleton_class.class_eval { include app.routes.url_helpers }
+ end
+
reset!
end
+ def url_options
+ opts = super.reverse_merge(
+ :host => host,
+ :protocol => https? ? "https" : "http"
+ )
+
+ opts.merge!(:port => 443) if !opts.key?(:port) && https?
+ opts
+ end
+
# Resets the instance. This can be used to reset the state information
# in an existing session instance, so it can be used from a clean-slate
# condition.
@@ -346,13 +365,8 @@ def copy_session_variables! #:nodoc:
include ActionDispatch::Routing::UrlFor
def url_options
- opts = super.reverse_merge(
- :host => host,
- :protocol => https? ? "https" : "http"
- )
-
- opts.merge!(:port => 443) if !opts.key?(:port) && https?
- opts
+ reset! unless @integration_session
+ @integration_session.url_options
end
# Delegate unhandled messages to the current session instance.
View
1  actionpack/test/abstract_unit.rb
@@ -85,6 +85,7 @@ class TestCase
class RoutedRackApp
attr_reader :router
+ alias routes router
def initialize(router, &blk)
@router = router
View
1  actionpack/test/controller/caching_test.rb
@@ -511,7 +511,6 @@ def reset!
@request = ActionController::TestRequest.new
@response = ActionController::TestResponse.new
@controller = ActionCachingTestController.new
- # ROUTES TODO: It seems bad to explicitly remix in the class
@controller.singleton_class.send(:include, @router.url_helpers)
@request.host = 'hostname.com'
end
View
6 actionpack/test/controller/integration_test.rb
@@ -178,8 +178,8 @@ def test_opens_new_session
session1 = @test.open_session { |sess| }
session2 = @test.open_session # implicit session
- assert_equal ::ActionController::Integration::Session, session1.class
- assert_equal ::ActionController::Integration::Session, session2.class
+ assert_kind_of ::ActionController::Integration::Session, session1
+ assert_kind_of ::ActionController::Integration::Session, session2
assert_not_equal session1, session2
end
@@ -221,8 +221,6 @@ def test_integration_methods_called
end
class IntegrationProcessTest < ActionController::IntegrationTest
- include SharedTestRoutes.url_helpers
-
class IntegrationController < ActionController::Base
def get
respond_to do |format|
View
1  actionpack/test/controller/resources_test.rb
@@ -1230,7 +1230,6 @@ def assert_restful_named_routes_for(controller_name, singular_name = nil, option
end
@controller = "#{options[:options][:controller].camelize}Controller".constantize.new
- # ROUTES TODO: Figure out a way to not extend the routing helpers here
@controller.singleton_class.send(:include, @router.url_helpers)
@request = ActionController::TestRequest.new
@response = ActionController::TestResponse.new
Please sign in to comment.
Something went wrong with that request. Please try again.