aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-01-13 14:24:10 -0800
committerYehuda Katz <wycats@gmail.com>2009-01-13 14:24:14 -0800
commitf65333a4cfcdc73b2f2e51fc4353370ab308135e (patch)
tree77a2ca3af3a54bc5412385230dd57b0641bba945 /actionpack/test/controller
parent0932b012fae2ff21214f610a0fd78a55ae4e2420 (diff)
parent1adc1496f9152c893e1f08abcb1e5e7272829899 (diff)
downloadrails-f65333a4cfcdc73b2f2e51fc4353370ab308135e.tar.gz
rails-f65333a4cfcdc73b2f2e51fc4353370ab308135e.tar.bz2
rails-f65333a4cfcdc73b2f2e51fc4353370ab308135e.zip
Sync 'rails/rails/master'
Diffstat (limited to 'actionpack/test/controller')
-rw-r--r--actionpack/test/controller/request/multipart_params_parsing_test.rb45
-rw-r--r--actionpack/test/controller/request/url_encoded_params_parsing_test.rb37
2 files changed, 80 insertions, 2 deletions
diff --git a/actionpack/test/controller/request/multipart_params_parsing_test.rb b/actionpack/test/controller/request/multipart_params_parsing_test.rb
index ce28ff46fe..d976ab8512 100644
--- a/actionpack/test/controller/request/multipart_params_parsing_test.rb
+++ b/actionpack/test/controller/request/multipart_params_parsing_test.rb
@@ -123,14 +123,14 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest
InputWrapper = Rack::Lint::InputWrapper
test "parses unwindable stream" do
- InputWrapper.any_instance.expects(:rewind).raises(Errno::ESPIPE)
+ InputWrapper.any_instance.stubs(:rewind).raises(Errno::ESPIPE)
params = parse_multipart('large_text_file')
assert_equal %w(file foo), params.keys.sort
assert_equal 'bar', params['foo']
end
test "uploads and reads file with unwindable input" do
- InputWrapper.any_instance.expects(:rewind).raises(Errno::ESPIPE)
+ InputWrapper.any_instance.stubs(:rewind).raises(Errno::ESPIPE)
with_test_routing do
post '/read', :uploaded_data => fixture_file_upload(FIXTURE_PATH + "/hello.txt", "text/plain")
@@ -138,6 +138,26 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest
end
end
+ test "passes through rack middleware and uploads file" do
+ with_muck_middleware do
+ with_test_routing do
+ post '/read', :uploaded_data => fixture_file_upload(FIXTURE_PATH + "/hello.txt", "text/plain")
+ assert_equal "File: Hello", response.body
+ end
+ end
+ end
+
+ test "passes through rack middleware and uploads file with unwindable input" do
+ InputWrapper.any_instance.stubs(:rewind).raises(Errno::ESPIPE)
+
+ with_muck_middleware do
+ with_test_routing do
+ post '/read', :uploaded_data => fixture_file_upload(FIXTURE_PATH + "/hello.txt", "text/plain")
+ assert_equal "File: Hello", response.body
+ end
+ end
+ end
+
private
def fixture(name)
File.open(File.join(FIXTURE_PATH, name), 'rb') do |file|
@@ -164,4 +184,25 @@ class MultipartParamsParsingTest < ActionController::IntegrationTest
yield
end
end
+
+ class MuckMiddleware
+ def initialize(app)
+ @app = app
+ end
+
+ def call(env)
+ req = Rack::Request.new(env)
+ req.params # Parse params
+ @app.call(env)
+ end
+ end
+
+ def with_muck_middleware
+ original_middleware = ActionController::Dispatcher.middleware
+ middleware = original_middleware.dup
+ middleware.use MuckMiddleware
+ ActionController::Dispatcher.middleware = middleware
+ yield
+ ActionController::Dispatcher.middleware = original_middleware
+ end
end
diff --git a/actionpack/test/controller/request/url_encoded_params_parsing_test.rb b/actionpack/test/controller/request/url_encoded_params_parsing_test.rb
index 26a4538ca6..b162796e5b 100644
--- a/actionpack/test/controller/request/url_encoded_params_parsing_test.rb
+++ b/actionpack/test/controller/request/url_encoded_params_parsing_test.rb
@@ -150,8 +150,45 @@ class UrlEncodedParamsParsingTest < ActionController::IntegrationTest
assert_parses expected, query
end
+ test "passes through rack middleware and parses params" do
+ with_muck_middleware do
+ assert_parses({ "a" => { "b" => "c" } }, "a[b]=c")
+ end
+ end
+
+ # The lint wrapper is used in integration tests
+ # instead of a normal StringIO class
+ InputWrapper = Rack::Lint::InputWrapper
+
+ test "passes through rack middleware and parses params with unwindable input" do
+ InputWrapper.any_instance.stubs(:rewind).raises(Errno::ESPIPE)
+ with_muck_middleware do
+ assert_parses({ "a" => { "b" => "c" } }, "a[b]=c")
+ end
+ end
private
+ class MuckMiddleware
+ def initialize(app)
+ @app = app
+ end
+
+ def call(env)
+ req = Rack::Request.new(env)
+ req.params # Parse params
+ @app.call(env)
+ end
+ end
+
+ def with_muck_middleware
+ original_middleware = ActionController::Dispatcher.middleware
+ middleware = original_middleware.dup
+ middleware.use MuckMiddleware
+ ActionController::Dispatcher.middleware = middleware
+ yield
+ ActionController::Dispatcher.middleware = original_middleware
+ end
+
def with_test_routing
with_routing do |set|
set.draw do |map|