Merge remote branch 'mainstream/master'

Conflicts:
	activerecord/lib/active_record/base.rb
	railties/lib/rails/configuration.rb
	railties/lib/rails/log_subscriber.rb

1 files changed, 36 insertions, 0 deletions

diff --git a/actionpack/test/dispatch/mount_test.rb b/actionpack/test/dispatch/mount_test.rb
new file mode 100644
index 0000000000..00ca5ec9dc
--- /dev/null
+++ b/actionpack/test/dispatch/mount_test.rb
@@ -0,0 +1,36 @@
+require 'abstract_unit'
+
+class TestRoutingMount < ActionDispatch::IntegrationTest
+  Router = ActionDispatch::Routing::RouteSet.new
+  Router.draw do
+    SprocketsApp = lambda { |env|
+      [200, {"Content-Type" => "text/html"}, ["#{env["SCRIPT_NAME"]} -- #{env["PATH_INFO"]}"]]
+    }
+
+    mount SprocketsApp, :at => "/sprockets"
+    mount SprocketsApp => "/shorthand"
+
+    scope "/its_a" do
+      mount SprocketsApp, :at => "/sprocket"
+    end
+  end
+
+  def app
+    Router
+  end
+
+  def test_mounting_sets_script_name
+    get "/sprockets/omg"
+    assert_equal "/sprockets -- /omg", response.body
+  end
+
+  def test_mounting_works_with_scope
+    get "/its_a/sprocket/omg"
+    assert_equal "/its_a/sprocket -- /omg", response.body
+  end
+  
+  def test_mounting_with_shorthand
+    get "/shorthand/omg"
+    assert_equal "/shorthand -- /omg", response.body
+  end
+end
\ No newline at end of file