Merge branch 'master' into adequaterecord

* master: (108 commits)
  make tests pass on Ruby 2.2
  Use Sqlite3 adapter in examples
  use the body proxy to freeze headers
  just ask the response for the commit status, we do not need to ask the jar
  only write the jar if the response isn't committed
  Fix a grammatical error in the i18n guide [ci skip]
  use method_defined? to check whether or not a method is defined
  Enhance docs for update_attribute [ci-skip]
  Change usec to 0 on tests that compare seconds
  Unit test for mysql quote time usec
  Changelog entry for mysql56 microseconds
  Test microsecond on mysql 5.6
  MySQL 5.6 and later supports microsecond precision in datetime.
  [ci skip] Add documentation for original_fullpath.
  Remove mocking on save, when not necessary
  comment why we are modifying global state. [ci skip]
  `change_table` supports `citext`. Follow up to #12523.
  Removed unnecessary command "application"
  register OID for PostgreSQL citex datatype [Troy Kruthoff & Lachlan Sylvester]
  Fixes STI when 2+ levels deep.
  ...

1 files changed, 238 insertions, 0 deletions

diff --git a/actionpack/test/dispatch/routing_test.rb b/actionpack/test/dispatch/routing_test.rb
index 1fa2cc6cf2..a47050adce 100644
--- a/actionpack/test/dispatch/routing_test.rb
+++ b/actionpack/test/dispatch/routing_test.rb
@@ -1031,6 +1031,136 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal 'users/home#index', @response.body
   end
 
+  def test_namespaced_shallow_routes_with_module_option
+    draw do
+      namespace :foo, module: 'bar' do
+        resources :posts, only: [:index, :show] do
+          resources :comments, only: [:index, :show], shallow: true
+        end
+      end
+    end
+
+    get '/foo/posts'
+    assert_equal '/foo/posts', foo_posts_path
+    assert_equal 'bar/posts#index', @response.body
+
+    get '/foo/posts/1'
+    assert_equal '/foo/posts/1', foo_post_path('1')
+    assert_equal 'bar/posts#show', @response.body
+
+    get '/foo/posts/1/comments'
+    assert_equal '/foo/posts/1/comments', foo_post_comments_path('1')
+    assert_equal 'bar/comments#index', @response.body
+
+    get '/foo/comments/2'
+    assert_equal '/foo/comments/2', foo_comment_path('2')
+    assert_equal 'bar/comments#show', @response.body
+  end
+
+  def test_namespaced_shallow_routes_with_path_option
+    draw do
+      namespace :foo, path: 'bar' do
+        resources :posts, only: [:index, :show] do
+          resources :comments, only: [:index, :show], shallow: true
+        end
+      end
+    end
+
+    get '/bar/posts'
+    assert_equal '/bar/posts', foo_posts_path
+    assert_equal 'foo/posts#index', @response.body
+
+    get '/bar/posts/1'
+    assert_equal '/bar/posts/1', foo_post_path('1')
+    assert_equal 'foo/posts#show', @response.body
+
+    get '/bar/posts/1/comments'
+    assert_equal '/bar/posts/1/comments', foo_post_comments_path('1')
+    assert_equal 'foo/comments#index', @response.body
+
+    get '/bar/comments/2'
+    assert_equal '/bar/comments/2', foo_comment_path('2')
+    assert_equal 'foo/comments#show', @response.body
+  end
+
+  def test_namespaced_shallow_routes_with_as_option
+    draw do
+      namespace :foo, as: 'bar' do
+        resources :posts, only: [:index, :show] do
+          resources :comments, only: [:index, :show], shallow: true
+        end
+      end
+    end
+
+    get '/foo/posts'
+    assert_equal '/foo/posts', bar_posts_path
+    assert_equal 'foo/posts#index', @response.body
+
+    get '/foo/posts/1'
+    assert_equal '/foo/posts/1', bar_post_path('1')
+    assert_equal 'foo/posts#show', @response.body
+
+    get '/foo/posts/1/comments'
+    assert_equal '/foo/posts/1/comments', bar_post_comments_path('1')
+    assert_equal 'foo/comments#index', @response.body
+
+    get '/foo/comments/2'
+    assert_equal '/foo/comments/2', bar_comment_path('2')
+    assert_equal 'foo/comments#show', @response.body
+  end
+
+  def test_namespaced_shallow_routes_with_shallow_path_option
+    draw do
+      namespace :foo, shallow_path: 'bar' do
+        resources :posts, only: [:index, :show] do
+          resources :comments, only: [:index, :show], shallow: true
+        end
+      end
+    end
+
+    get '/foo/posts'
+    assert_equal '/foo/posts', foo_posts_path
+    assert_equal 'foo/posts#index', @response.body
+
+    get '/foo/posts/1'
+    assert_equal '/foo/posts/1', foo_post_path('1')
+    assert_equal 'foo/posts#show', @response.body
+
+    get '/foo/posts/1/comments'
+    assert_equal '/foo/posts/1/comments', foo_post_comments_path('1')
+    assert_equal 'foo/comments#index', @response.body
+
+    get '/bar/comments/2'
+    assert_equal '/bar/comments/2', foo_comment_path('2')
+    assert_equal 'foo/comments#show', @response.body
+  end
+
+  def test_namespaced_shallow_routes_with_shallow_prefix_option
+    draw do
+      namespace :foo, shallow_prefix: 'bar' do
+        resources :posts, only: [:index, :show] do
+          resources :comments, only: [:index, :show], shallow: true
+        end
+      end
+    end
+
+    get '/foo/posts'
+    assert_equal '/foo/posts', foo_posts_path
+    assert_equal 'foo/posts#index', @response.body
+
+    get '/foo/posts/1'
+    assert_equal '/foo/posts/1', foo_post_path('1')
+    assert_equal 'foo/posts#show', @response.body
+
+    get '/foo/posts/1/comments'
+    assert_equal '/foo/posts/1/comments', foo_post_comments_path('1')
+    assert_equal 'foo/comments#index', @response.body
+
+    get '/foo/comments/2'
+    assert_equal '/foo/comments/2', bar_comment_path('2')
+    assert_equal 'foo/comments#show', @response.body
+  end
+
   def test_namespace_containing_numbers
     draw do
       namespace :v2 do
@@ -3033,6 +3163,114 @@ class TestRoutingMapper < ActionDispatch::IntegrationTest
     assert_equal '/admin/posts/1/comments', admin_post_comments_path('1')
   end
 
+  def test_shallow_path_and_prefix_are_not_added_to_non_shallow_routes
+    draw do
+      scope shallow_path: 'projects', shallow_prefix: 'project' do
+        resources :projects do
+          resources :files, controller: 'project_files', shallow: true
+        end
+      end
+    end
+
+    get '/projects'
+    assert_equal 'projects#index', @response.body
+    assert_equal '/projects', projects_path
+
+    get '/projects/new'
+    assert_equal 'projects#new', @response.body
+    assert_equal '/projects/new', new_project_path
+
+    post '/projects'
+    assert_equal 'projects#create', @response.body
+
+    get '/projects/1'
+    assert_equal 'projects#show', @response.body
+    assert_equal '/projects/1', project_path('1')
+
+    get '/projects/1/edit'
+    assert_equal 'projects#edit', @response.body
+    assert_equal '/projects/1/edit', edit_project_path('1')
+
+    patch '/projects/1'
+    assert_equal 'projects#update', @response.body
+
+    delete '/projects/1'
+    assert_equal 'projects#destroy', @response.body
+
+    get '/projects/1/files'
+    assert_equal 'project_files#index', @response.body
+    assert_equal '/projects/1/files', project_files_path('1')
+
+    get '/projects/1/files/new'
+    assert_equal 'project_files#new', @response.body
+    assert_equal '/projects/1/files/new', new_project_file_path('1')
+
+    post '/projects/1/files'
+    assert_equal 'project_files#create', @response.body
+
+    get '/projects/files/2'
+    assert_equal 'project_files#show', @response.body
+    assert_equal '/projects/files/2', project_file_path('2')
+
+    get '/projects/files/2/edit'
+    assert_equal 'project_files#edit', @response.body
+    assert_equal '/projects/files/2/edit', edit_project_file_path('2')
+
+    patch '/projects/files/2'
+    assert_equal 'project_files#update', @response.body
+
+    delete '/projects/files/2'
+    assert_equal 'project_files#destroy', @response.body
+  end
+
+  def test_scope_path_is_copied_to_shallow_path
+    draw do
+      scope path: 'foo' do
+        resources :posts do
+          resources :comments, shallow: true
+        end
+      end
+    end
+
+    assert_equal '/foo/comments/1', comment_path('1')
+  end
+
+  def test_scope_as_is_copied_to_shallow_prefix
+    draw do
+      scope as: 'foo' do
+        resources :posts do
+          resources :comments, shallow: true
+        end
+      end
+    end
+
+    assert_equal '/comments/1', foo_comment_path('1')
+  end
+
+  def test_scope_shallow_prefix_is_not_overwritten_by_as
+    draw do
+      scope as: 'foo', shallow_prefix: 'bar' do
+        resources :posts do
+          resources :comments, shallow: true
+        end
+      end
+    end
+
+    assert_equal '/comments/1', bar_comment_path('1')
+  end
+
+  def test_scope_shallow_path_is_not_overwritten_by_path
+    draw do
+      scope path: 'foo', shallow_path: 'bar' do
+        resources :posts do
+          resources :comments, shallow: true
+        end
+      end
+    end
+
+    assert_equal '/bar/comments/1', comment_path('1')
+  end
+
 private
 
   def draw(&block)