From 482ec2ac3f518c91544a3b3e92765eef41b91419 Mon Sep 17 00:00:00 2001
From: Piotr Sarnacki <drogus@gmail.com>
Date: Tue, 20 Dec 2011 20:17:17 +0100
Subject: Add ORIGINAL_FULLPATH to env

This behaves similarly to REQUEST_URI, but
we need to implement it on our own because
REQUEST_URI is not reliable.

Note that since PATH_INFO does not contain
information about trailing question mark,
this is not 100% accurate, for example
`/foo?` will result in `/foo` in ORIGINAL_FULLPATH
---
 .../application/build_original_fullpath_test.rb    | 27 ++++++++++++++++++++++
 railties/test/application/middleware_test.rb       | 11 ++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 railties/test/application/build_original_fullpath_test.rb

(limited to 'railties/test')

diff --git a/railties/test/application/build_original_fullpath_test.rb b/railties/test/application/build_original_fullpath_test.rb
new file mode 100644
index 0000000000..7a679ea04e
--- /dev/null
+++ b/railties/test/application/build_original_fullpath_test.rb
@@ -0,0 +1,27 @@
+require "abstract_unit"
+
+module ApplicationTests
+  class BuildOriginalPathTest < Test::Unit::TestCase
+    def test_include_original_PATH_info_in_ORIGINAL_FULLPATH
+      env = { 'PATH_INFO' => '/foo/' }
+      assert_equal "/foo/", Rails.application.send(:build_original_fullpath, env)
+    end
+
+    def test_include_SCRIPT_NAME
+      env = {
+        'SCRIPT_NAME' => '/foo',
+        'PATH_INFO' => '/bar'
+      }
+
+      assert_equal "/foo/bar", Rails.application.send(:build_original_fullpath, env)
+    end
+
+    def test_include_QUERY_STRING
+      env = {
+        'PATH_INFO' => '/foo',
+        'QUERY_STRING' => 'bar',
+      }
+      assert_equal "/foo?bar", Rails.application.send(:build_original_fullpath, env)
+    end
+  end
+end
diff --git a/railties/test/application/middleware_test.rb b/railties/test/application/middleware_test.rb
index 578370cfca..9e02ef9c66 100644
--- a/railties/test/application/middleware_test.rb
+++ b/railties/test/application/middleware_test.rb
@@ -1,5 +1,6 @@
 require 'isolation/abstract_unit'
 require 'stringio'
+require 'rack/test'
 
 module ApplicationTests
   class MiddlewareTest < Test::Unit::TestCase
@@ -75,7 +76,7 @@ module ApplicationTests
       add_to_config "config.force_ssl = true"
       add_to_config "config.ssl_options = { :host => 'example.com' }"
       boot!
-      
+
       assert_equal AppTemplate::Application.middleware.first.args, [{:host => 'example.com'}]
     end
 
@@ -193,6 +194,14 @@ module ApplicationTests
       assert_equal nil, last_response.headers["Etag"]
     end
 
+    test "ORIGINAL_FULLPATH is passed to env" do
+      boot!
+      env = ::Rack::MockRequest.env_for("/foo/?something")
+      Rails.application.call(env)
+
+      assert_equal "/foo/?something", env["ORIGINAL_FULLPATH"]
+    end
+
     private
 
       def boot!
-- 
cgit v1.2.3