aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Lerche <carllerche@mac.com>2009-05-26 14:13:35 -0700
committerCarl Lerche <carllerche@mac.com>2009-05-26 14:13:35 -0700
commita3ca5638d365113028610141f025839bb3ed738b (patch)
treea7c258e93606dd7203af09ee63ec364d009a5a46
parent7dd094329eee01cf9d18e4141226357eb8f75c76 (diff)
downloadrails-a3ca5638d365113028610141f025839bb3ed738b.tar.gz
rails-a3ca5638d365113028610141f025839bb3ed738b.tar.bz2
rails-a3ca5638d365113028610141f025839bb3ed738b.zip
Get controller/test_test.rb to pass on new base
-rw-r--r--actionpack/Rakefile3
-rw-r--r--actionpack/lib/action_controller/testing/process2.rb3
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/Rakefile b/actionpack/Rakefile
index d10e8b94a7..41882e99f1 100644
--- a/actionpack/Rakefile
+++ b/actionpack/Rakefile
@@ -65,7 +65,6 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
# ==== Not ported
# * filters
# * integration
- # * test
t.test_files = %w(
action_pack_assertions addresses_render assert_select
base benchmark caching capture content_type cookie dispatcher
@@ -73,7 +72,7 @@ Rake::TestTask.new(:test_new_base_on_old_tests) do |t|
http_digest_authentication layout logging mime_responds
record_identifier redirect render render_js render_json
render_other render_xml request_forgery_protection rescue
- resources routing selector send_file url_rewriter
+ resources routing selector send_file test url_rewriter
verification view_paths webservice
).map { |name| "test/controller/#{name}_test.rb" }
t.verbose = true
diff --git a/actionpack/lib/action_controller/testing/process2.rb b/actionpack/lib/action_controller/testing/process2.rb
index 677dd41781..1c6fd2d80a 100644
--- a/actionpack/lib/action_controller/testing/process2.rb
+++ b/actionpack/lib/action_controller/testing/process2.rb
@@ -51,9 +51,10 @@ module ActionController
@request.session = ActionController::TestSession.new(session) unless session.nil?
@request.session["flash"] = ActionController::Flash::FlashHash.new.update(flash) if flash
- build_request_uri(action, parameters)
+
@controller.request = @request
@controller.params.merge!(parameters)
+ build_request_uri(action, parameters)
# Base.class_eval { include ProcessWithTest } unless Base < ProcessWithTest
@controller.process_with_new_base_test(@request, @response)
@response