Merge pull request #27089 from erickueen/erickueen_fix_26606
Fix incorrect output from rails routes when using singular resources …
This commit is contained in:
commit
ff2fe014d9
@ -1,11 +1,17 @@
|
||||
* Fixes multiple calls to `logger.fatal` instead of a single call,
|
||||
for every line in an exception backtrace, when printing trace
|
||||
* Fixes incorrect output from rails routes when using singular resources.
|
||||
|
||||
Fixes #26606.
|
||||
|
||||
*Erick Reyna*
|
||||
|
||||
* Fixes multiple calls to `logger.fatal` instead of a single call,
|
||||
for every line in an exception backtrace, when printing trace
|
||||
from `DebugExceptions` middleware.
|
||||
|
||||
Fixes #26134
|
||||
|
||||
Fixes #26134.
|
||||
|
||||
*Vipul A M*
|
||||
|
||||
|
||||
* Add support for arbitrary hashes in strong parameters:
|
||||
|
||||
```ruby
|
||||
|
@ -1244,11 +1244,11 @@ def resources_path_names(options)
|
||||
# the plural):
|
||||
#
|
||||
# GET /profile/new
|
||||
# POST /profile
|
||||
# GET /profile
|
||||
# GET /profile/edit
|
||||
# PATCH/PUT /profile
|
||||
# DELETE /profile
|
||||
# POST /profile
|
||||
#
|
||||
# === Options
|
||||
# Takes same options as +resources+.
|
||||
@ -1266,15 +1266,15 @@ def resource(*resources, &block)
|
||||
|
||||
concerns(options[:concerns]) if options[:concerns]
|
||||
|
||||
collection do
|
||||
post :create
|
||||
end if parent_resource.actions.include?(:create)
|
||||
|
||||
new do
|
||||
get :new
|
||||
end if parent_resource.actions.include?(:new)
|
||||
|
||||
set_member_mappings_for_resource
|
||||
|
||||
collection do
|
||||
post :create
|
||||
end if parent_resource.actions.include?(:create)
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -159,13 +159,13 @@ def test_rails_routes_with_namespaced_controller_environment
|
||||
end
|
||||
RUBY
|
||||
expected_output = [" Prefix Verb URI Pattern Controller#Action",
|
||||
" admin_post POST /admin/post(.:format) admin/posts#create",
|
||||
" new_admin_post GET /admin/post/new(.:format) admin/posts#new",
|
||||
"edit_admin_post GET /admin/post/edit(.:format) admin/posts#edit",
|
||||
" GET /admin/post(.:format) admin/posts#show",
|
||||
" admin_post GET /admin/post(.:format) admin/posts#show",
|
||||
" PATCH /admin/post(.:format) admin/posts#update",
|
||||
" PUT /admin/post(.:format) admin/posts#update",
|
||||
" DELETE /admin/post(.:format) admin/posts#destroy\n"].join("\n")
|
||||
" DELETE /admin/post(.:format) admin/posts#destroy",
|
||||
" POST /admin/post(.:format) admin/posts#create\n"].join("\n")
|
||||
|
||||
output = Dir.chdir(app_path) { `bin/rails routes -c Admin::PostController` }
|
||||
assert_equal expected_output, output
|
||||
|
Loading…
Reference in New Issue
Block a user