Merge branch 'master' of github.com:lifo/docrails

7 files changed, 266 insertions, 7 deletions

diff --git a/actionpack/test/dispatch/header_test.rb b/actionpack/test/dispatch/header_test.rb
index ec6ba494dc..bc7cad8db5 100644
--- a/actionpack/test/dispatch/header_test.rb
+++ b/actionpack/test/dispatch/header_test.rb
@@ -13,4 +13,9 @@ class HeaderTest < ActiveSupport::TestCase
     assert_equal "text/plain", @headers["CONTENT_TYPE"]
     assert_equal "text/plain", @headers["HTTP_CONTENT_TYPE"]
   end
+
+  test "fetch" do
+    assert_equal "text/plain", @headers.fetch("content-type", nil)
+    assert_equal "not found", @headers.fetch('not-found', 'not found')
+  end
 end
diff --git a/actionpack/test/dispatch/mount_test.rb b/actionpack/test/dispatch/mount_test.rb
index f7a746120e..536e35ab2e 100644
--- a/actionpack/test/dispatch/mount_test.rb
+++ b/actionpack/test/dispatch/mount_test.rb
@@ -37,6 +37,11 @@ class TestRoutingMount < ActionDispatch::IntegrationTest
     assert_equal "/sprockets -- /omg", response.body
   end
 
+  def test_mounting_works_with_nested_script_name
+    get "/foo/sprockets/omg", {}, 'SCRIPT_NAME' => '/foo', 'PATH_INFO' => '/sprockets/omg'
+    assert_equal "/foo/sprockets -- /omg", response.body
+  end
+
   def test_mounting_works_with_scope
     get "/its_a/sprocket/omg"
     assert_equal "/its_a/sprocket -- /omg", response.body
diff --git a/actionpack/test/dispatch/request/session_test.rb b/actionpack/test/dispatch/request/session_test.rb
new file mode 100644
index 0000000000..4d24456ba6
--- /dev/null
+++ b/actionpack/test/dispatch/request/session_test.rb
@@ -0,0 +1,48 @@
+require 'abstract_unit'
+require 'action_dispatch/middleware/session/abstract_store'
+
+module ActionDispatch
+  class Request
+    class SessionTest < ActiveSupport::TestCase
+      def test_create_adds_itself_to_env
+        env = {}
+        s = Session.create(store, env, {})
+        assert_equal s, env[Rack::Session::Abstract::ENV_SESSION_KEY]
+      end
+
+      def test_to_hash
+        env = {}
+        s = Session.create(store, env, {})
+        s['foo'] = 'bar'
+        assert_equal 'bar', s['foo']
+        assert_equal({'foo' => 'bar'}, s.to_hash)
+      end
+
+      def test_create_merges_old
+        env = {}
+        s = Session.create(store, env, {})
+        s['foo'] = 'bar'
+
+        s1 = Session.create(store, env, {})
+        refute_equal s, s1
+        assert_equal 'bar', s1['foo']
+      end
+
+      def test_find
+        env = {}
+        assert_nil Session.find(env)
+
+        s = Session.create(store, env, {})
+        assert_equal s, Session.find(env)
+      end
+
+      private
+      def store
+        Class.new {
+          def load_session(env); [1, {}]; end
+          def session_exists?(env); true; end
+        }.new
+      end
+    end
+  end
+end
diff --git a/actionpack/test/dispatch/routing_assertions_test.rb b/actionpack/test/dispatch/routing_assertions_test.rb
index e953029456..517354ae58 100644
--- a/actionpack/test/dispatch/routing_assertions_test.rb
+++ b/actionpack/test/dispatch/routing_assertions_test.rb
@@ -47,7 +47,7 @@ class RoutingAssertionsTest < ActionController::TestCase
   def test_assert_recognizes_with_extras
     assert_recognizes({ :controller => 'articles', :action => 'index', :page => '1' }, '/articles', { :page => '1' })
   end
- 
+
   def test_assert_recognizes_with_method
     assert_recognizes({ :controller => 'articles', :action => 'create' }, { :path => '/articles', :method => :post })
     assert_recognizes({ :controller => 'articles', :action => 'update', :id => '1' }, { :path => '/articles/1', :method => :put })
@@ -57,7 +57,7 @@ class RoutingAssertionsTest < ActionController::TestCase
     assert_raise(ActionController::RoutingError) do
       assert_recognizes({ :controller => 'secure_articles', :action => 'index' }, 'http://test.host/secure/articles')
     end
-    assert_recognizes({ :controller => 'secure_articles', :action => 'index' }, 'https://test.host/secure/articles')
+    assert_recognizes({ :controller => 'secure_articles', :action => 'index', :protocol => 'https://' }, 'https://test.host/secure/articles')
   end
 
   def test_assert_recognizes_with_block_constraint
@@ -90,7 +90,7 @@ class RoutingAssertionsTest < ActionController::TestCase
     assert_raise(ActionController::RoutingError) do
       assert_routing('http://test.host/secure/articles', { :controller => 'secure_articles', :action => 'index' })
     end
-    assert_routing('https://test.host/secure/articles', { :controller => 'secure_articles', :action => 'index' })
+    assert_routing('https://test.host/secure/articles', { :controller => 'secure_articles', :action => 'index', :protocol => 'https://' })
   end
 
   def test_assert_routing_with_block_constraint
diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 4b8d308043..3cec816f1c 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -171,6 +171,8 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
             post :preview, :on => :collection
           end
         end
+
+        post 'new', :action => 'new', :on => :collection, :as => :new
       end
 
       resources :replies do
@@ -827,6 +829,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' }
@@ -876,6 +887,12 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal '/projects/1/edit', edit_project_path(:id => '1')
   end
 
+  def test_projects_with_post_action_and_new_path_on_collection
+    post '/projects/new'
+    assert_equal "project#new", @response.body
+    assert_equal "/projects/new", new_projects_path
+  end
+
   def test_projects_involvements
     get '/projects/1/involvements'
     assert_equal 'involvements#index', @response.body
@@ -2450,7 +2467,6 @@ class TestMultipleNestedController < ActionDispatch::IntegrationTest
     get "/foo/bar/baz"
     assert_equal "/pooh", @response.body
   end
-
 end
 
 class TestTildeAndMinusPaths < ActionDispatch::IntegrationTest
@@ -2512,3 +2528,123 @@ private
     %(<html><body>You are being <a href="#{ERB::Util.h(url)}">redirected</a>.</body></html>)
   end
 end
+
+class TestConstraintsAccessingParameters < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      ok = lambda { |env| [200, { 'Content-Type' => 'text/plain' }, []] }
+
+      get "/:foo" => ok, :constraints => lambda { |r| r.params[:foo] == 'foo' }
+      get "/:bar" => ok
+    end
+  end
+
+  def app; Routes end
+
+  test "parameters are reset between constraint checks" do
+    get "/bar"
+    assert_equal nil, @request.params[:foo]
+    assert_equal "bar", @request.params[:bar]
+  end
+end
+
+class TestOptimizedNamedRoutes < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      ok = lambda { |env| [200, { 'Content-Type' => 'text/plain' }, []] }
+      get '/foo' => ok, as: :foo
+    end
+  end
+
+  include Routes.url_helpers
+  def app; Routes end
+
+  test 'enabled when not mounted and default_url_options is empty' do
+    assert Routes.url_helpers.optimize_routes_generation?
+  end
+
+  test 'named route called as singleton method' do
+    assert_equal '/foo', Routes.url_helpers.foo_path
+  end
+
+  test 'named route called on included module' do
+    assert_equal '/foo', foo_path
+  end
+end
+
+class TestNamedRouteUrlHelpers < ActionDispatch::IntegrationTest
+  class CategoriesController < ActionController::Base
+    def show
+      render :text => "categories#show"
+    end
+  end
+
+  class ProductsController < ActionController::Base
+    def show
+      render :text => "products#show"
+    end
+  end
+
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      scope :module => "test_named_route_url_helpers" do
+        get "/categories/:id" => 'categories#show', :as => :category
+        get "/products/:id" => 'products#show', :as => :product
+      end
+    end
+  end
+
+  def app; Routes end
+
+  include Routes.url_helpers
+
+  test "url helpers do not ignore nil parameters when using non-optimized routes" do
+    Routes.stubs(:optimize_routes_generation?).returns(false)
+
+    get "/categories/1"
+    assert_response :success
+    assert_raises(ActionController::RoutingError) { product_path(nil) }
+  end
+end
+
+class TestUrlConstraints < ActionDispatch::IntegrationTest
+  Routes = ActionDispatch::Routing::RouteSet.new.tap do |app|
+    app.draw do
+      ok = lambda { |env| [200, { 'Content-Type' => 'text/plain' }, []] }
+
+      constraints :subdomain => 'admin' do
+        get '/' => ok, :as => :admin_root
+      end
+
+      scope :constraints => { :protocol => 'https://' } do
+        get '/' => ok, :as => :secure_root
+      end
+
+      get '/' => ok, :as => :alternate_root, :constraints => { :port => 8080 }
+    end
+  end
+
+  include Routes.url_helpers
+  def app; Routes end
+
+  test "constraints are copied to defaults when using constraints method" do
+    assert_equal 'http://admin.example.com/', admin_root_url
+
+    get 'http://admin.example.com/'
+    assert_response :success
+  end
+
+  test "constraints are copied to defaults when using scope constraints hash" do
+    assert_equal 'https://www.example.com/', secure_root_url
+
+    get 'https://www.example.com/'
+    assert_response :success
+  end
+
+  test "constraints are copied to defaults when using route constraints hash" do
+    assert_equal 'http://www.example.com:8080/', alternate_root_url
+
+    get 'http://www.example.com:8080/'
+    assert_response :success
+  end
+end
diff --git a/actionpack/test/dispatch/session/abstract_store_test.rb b/actionpack/test/dispatch/session/abstract_store_test.rb
new file mode 100644
index 0000000000..8daf3d3f5e
--- /dev/null
+++ b/actionpack/test/dispatch/session/abstract_store_test.rb
@@ -0,0 +1,56 @@
+require 'abstract_unit'
+require 'action_dispatch/middleware/session/abstract_store'
+
+module ActionDispatch
+  module Session
+    class AbstractStoreTest < ActiveSupport::TestCase
+      class MemoryStore < AbstractStore
+        def initialize(app)
+          @sessions = {}
+          super
+        end
+
+        def get_session(env, sid)
+          sid ||= 1
+          session = @sessions[sid] ||= {}
+          [sid, session]
+        end
+
+        def set_session(env, sid, session, options)
+          @sessions[sid] = session
+        end
+      end
+
+      def test_session_is_set
+        env = {}
+        as = MemoryStore.new app
+        as.call(env)
+
+        assert @env
+        assert Request::Session.find @env
+      end
+
+      def test_new_session_object_is_merged_with_old
+        env = {}
+        as = MemoryStore.new app
+        as.call(env)
+
+        assert @env
+        session = Request::Session.find @env
+        session['foo'] = 'bar'
+
+        as.call(@env)
+        session1 = Request::Session.find @env
+
+        refute_equal session, session1
+        assert_equal session.to_hash, session1.to_hash
+      end
+
+      private
+      def app(&block)
+        @env = nil
+        lambda { |env| @env = env }
+      end
+    end
+  end
+end
diff --git a/actionpack/test/dispatch/url_generation_test.rb b/actionpack/test/dispatch/url_generation_test.rb
index 985ff2e81a..e56e8ddc57 100644
--- a/actionpack/test/dispatch/url_generation_test.rb
+++ b/actionpack/test/dispatch/url_generation_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
 module TestUrlGeneration
   class WithMountPoint < ActionDispatch::IntegrationTest
     Routes = ActionDispatch::Routing::RouteSet.new
-    Routes.draw { get "/foo", :to => "my_route_generating#index", :as => :foo }
+    include Routes.url_helpers
 
     class ::MyRouteGeneratingController < ActionController::Base
       include Routes.url_helpers
@@ -12,7 +12,11 @@ module TestUrlGeneration
       end
     end
 
-    include Routes.url_helpers
+    Routes.draw do
+      get "/foo", :to => "my_route_generating#index", :as => :foo
+
+      mount MyRouteGeneratingController.action(:index), at: '/bar'
+    end
 
     def _routes
       Routes
@@ -30,11 +34,16 @@ module TestUrlGeneration
       assert_equal "/bar/foo", foo_path(:script_name => "/bar")
     end
 
-    test "the request's SCRIPT_NAME takes precedence over the routes'" do
+    test "the request's SCRIPT_NAME takes precedence over the route" do
       get "/foo", {}, 'SCRIPT_NAME' => "/new", 'action_dispatch.routes' => Routes
       assert_equal "/new/foo", response.body
     end
 
+    test "the request's SCRIPT_NAME wraps the mounted app's" do
+      get '/new/bar/foo', {}, 'SCRIPT_NAME' => '/new', 'PATH_INFO' => '/bar/foo', 'action_dispatch.routes' => Routes
+      assert_equal "/new/bar/foo", response.body
+    end
+
     test "handling http protocol with https set" do
       https!
       assert_equal "http://www.example.com/foo", foo_url(:protocol => "http")