5 files changed, 141 insertions, 0 deletions
diff --git a/actionpack/test/dispatch/best_standards_support_test.rb b/actionpack/test/dispatch/best_standards_support_test.rb
new file mode 100644
index 0000000000..0737c40a39
--- /dev/null
+++ b/actionpack/test/dispatch/best_standards_support_test.rb
@@ -0,0 +1,34 @@
+require 'abstract_unit'
+
+class BestStandardsSupportTest < ActiveSupport::TestCase
+  def test_with_best_standards_support
+    _, headers, _ = app(true, {}).call({})
+    assert_equal "IE=Edge,chrome=1", headers["X-UA-Compatible"]
+  end
+
+  def test_with_builtin_best_standards_support
+    _, headers, _ = app(:builtin, {}).call({})
+    assert_equal "IE=Edge", headers["X-UA-Compatible"]
+  end
+
+  def test_without_best_standards_support
+    _, headers, _ = app(false, {}).call({})
+    assert_equal nil, headers["X-UA-Compatible"]
+  end
+
+  def test_appends_to_app_headers
+    app_headers = { "X-UA-Compatible" => "requiresActiveX=true" }
+    _, headers, _ = app(true, app_headers).call({})
+
+    expects = "requiresActiveX=true,IE=Edge,chrome=1"
+    assert_equal expects, headers["X-UA-Compatible"]
+  end
+
+  private
+
+    def app(type, headers)
+      app = proc { [200, headers, "response"] }
+      ActionDispatch::BestStandardsSupport.new(app, type)
+    end
+
+end
diff --git a/actionpack/test/dispatch/prefix_generation_test.rb b/actionpack/test/dispatch/prefix_generation_test.rb
index bd5b5edab0..88dc2c093b 100644
--- a/actionpack/test/dispatch/prefix_generation_test.rb
+++ b/actionpack/test/dispatch/prefix_generation_test.rb
@@ -248,6 +248,11 @@ module TestGenerationPrefix
       assert_equal "/something/", app_object.root_path
     end
 
+    test "[OBJECT] generating application's route includes default_url_options[:trailing_slash]" do
+      RailsApplication.routes.default_url_options[:trailing_slash] = true
+      assert_equal "/awesome/blog/posts", engine_object.posts_path
+    end
+
     test "[OBJECT] generating engine's route with url_for" do
       path = engine_object.url_for(:controller => "inside_engine_generating",
                                    :action => "show",
diff --git a/actionpack/test/dispatch/request_test.rb b/actionpack/test/dispatch/request_test.rb
index 5b3d38c48c..56431b4daf 100644
--- a/actionpack/test/dispatch/request_test.rb
+++ b/actionpack/test/dispatch/request_test.rb
@@ -530,6 +530,13 @@ class RequestTest < ActiveSupport::TestCase
     assert_equal Mime::XML, request.negotiate_mime([Mime::XML, Mime::CSV])
   end
 
+  test "raw_post rewinds rack.input if RAW_POST_DATA is nil" do
+    request = stub_request('rack.input' => StringIO.new("foo"),
+                           'CONTENT_LENGTH' => 3)
+    assert_equal "foo", request.raw_post
+    assert_equal "foo", request.env['rack.input'].read
+  end
+
   test "process parameter filter" do
     test_hashes = [
     [{'foo'=>'bar'},{'foo'=>'bar'},%w'food'],
diff --git a/actionpack/test/dispatch/routing/route_set_test.rb b/actionpack/test/dispatch/routing/route_set_test.rb
new file mode 100644
index 0000000000..629b8ed8bd
--- /dev/null
+++ b/actionpack/test/dispatch/routing/route_set_test.rb
@@ -0,0 +1,86 @@
+require 'abstract_unit'
+
+module ActionDispatch
+  module Routing
+    class RouteSetTest < ActiveSupport::TestCase
+      class SimpleApp
+        def initialize(response)
+          @response = response
+        end
+
+        def call(env)
+          [ 200, { 'Content-Type' => 'text/plain' }, [response] ]
+        end
+      end
+
+      setup do
+        @set = RouteSet.new
+      end
+
+      test "url helpers are added when route is added" do
+        draw do
+          get 'foo', :to => SimpleApp.new('foo#index')
+        end
+
+        assert_equal '/foo', url_helpers.foo_path
+        assert_raises NoMethodError do
+          assert_equal '/bar', url_helpers.bar_path
+        end
+
+        draw do
+          get 'foo', :to => SimpleApp.new('foo#index')
+          get 'bar', :to => SimpleApp.new('bar#index')
+        end
+
+        assert_equal '/foo', url_helpers.foo_path
+        assert_equal '/bar', url_helpers.bar_path
+      end
+
+      test "url helpers are updated when route is updated" do
+        draw do
+          get 'bar', :to => SimpleApp.new('bar#index'), :as => :bar
+        end
+
+        assert_equal '/bar', url_helpers.bar_path
+
+        draw do
+          get 'baz', :to => SimpleApp.new('baz#index'), :as => :bar
+        end
+
+        assert_equal '/baz', url_helpers.bar_path
+      end
+
+      test "url helpers are removed when route is removed" do
+        draw do
+          get 'foo', :to => SimpleApp.new('foo#index')
+          get 'bar', :to => SimpleApp.new('bar#index')
+        end
+
+        assert_equal '/foo', url_helpers.foo_path
+        assert_equal '/bar', url_helpers.bar_path
+
+        draw do
+          get 'foo', :to => SimpleApp.new('foo#index')
+        end
+
+        assert_equal '/foo', url_helpers.foo_path
+        assert_raises NoMethodError do
+          assert_equal '/bar', url_helpers.bar_path
+        end
+      end
+
+      private
+        def clear!
+          @set.clear!
+        end
+
+        def draw(&block)
+          @set.draw(&block)
+        end
+
+        def url_helpers
+          @set.url_helpers
+        end
+    end
+  end
+end
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index e61b4e2d8f..46d16598f7 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -887,6 +887,15 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal original_options, options
   end
 
+  def test_url_for_does_not_modify_controller
+    controller = '/projects'
+    options = {:controller => controller, :action => 'status', :only_path => true}
+    url = url_for(options)
+
+    assert_equal '/projects/status', url
+    assert_equal '/projects', controller
+  end
+
   # tests the arguments modification free version of define_hash_access
   def test_named_route_with_no_side_effects
     original_options = { :host => 'test.host' }