Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fix problems trying to functional test AC::Metal controllers

[#5393 state:committed]
  • Loading branch information...
commit 2382667955df08599cb5df7bf3ef135817093d74 1 parent c11102d
@spastorino spastorino authored
View
10 actionpack/lib/action_controller/metal/testing.rb
@@ -14,18 +14,10 @@ def process_with_new_base_test(request, response)
cookies.write(@_response)
end
@_response.prepare!
- set_test_assigns
+ @assigns = respond_to?(:view_assigns) ? view_assigns : {}
ret
end
- def set_test_assigns
- @assigns = {}
- (instance_variable_names - self.class.protected_instance_variables).each do |var|
- name, value = var[1..-1], instance_variable_get(var)
- @assigns[name] = value
- end
- end
-
# TODO : Rewrite tests using controller.headers= to use Rack env
def headers=(new_headers)
@_response ||= ActionDispatch::Response.new
View
4 actionpack/lib/action_controller/test_case.rb
@@ -411,7 +411,7 @@ def process(action, parameters = nil, session = nil, flash = nil, http_method =
@controller.request = @request
@controller.params.merge!(parameters)
build_request_uri(action, parameters)
- Base.class_eval { include Testing }
+ @controller.class.class_eval { include Testing }
@controller.process_with_new_base_test(@request, @response)
@request.session.delete('flash') if @request.session['flash'].blank?
@response
@@ -448,7 +448,7 @@ def rescue_action_in_public!
def build_request_uri(action, parameters)
unless @request.env["PATH_INFO"]
- options = @controller.__send__(:url_options).merge(parameters)
+ options = @controller.respond_to?(:url_options) ? @controller.__send__(:url_options).merge(parameters) : parameters
options.update(
:only_path => true,
:action => action,
View
7 actionpack/test/controller/new_base/bare_metal_test.rb
@@ -39,4 +39,11 @@ class HeadTest < ActiveSupport::TestCase
assert_equal 404, status
end
end
+
+ class BareControllerTest < ActionController::TestCase
+ test "GET index" do
+ get :index
+ assert_equal "Hello world", @response.body
+ end
+ end
end
Please sign in to comment.
Something went wrong with that request. Please try again.