From 1adc1496f9152c893e1f08abcb1e5e7272829899 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
Date: Tue, 13 Jan 2009 16:09:51 -0600
Subject: Add RewindableInput wrapper to fix issues with middleware that
 impolitely eat up non-rewindable input

---
 .../request/multipart_params_parsing_test.rb       | 45 +++++++++++++++++++++-
 .../request/url_encoded_params_parsing_test.rb     | 37 ++++++++++++++++++
 2 files changed, 80 insertions(+), 2 deletions(-)

(limited to 'actionpack/test')

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|
-- 
cgit v1.2.3