From da290fae09086f864e59ba43b4a0c4f3d8661da1 Mon Sep 17 00:00:00 2001 From: Guo Xiang Tan Date: Sun, 11 May 2014 15:41:23 -0700 Subject: Remove unnecessary include for integration tests. --- actionpack/lib/action_dispatch/testing/integration.rb | 6 ------ 1 file changed, 6 deletions(-) (limited to 'actionpack/lib/action_dispatch') diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index cc6b763093..789aa608a4 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -270,12 +270,6 @@ module ActionDispatch path = location.query ? "#{location.path}?#{location.query}" : location.path end - unless ActionController::Base < ActionController::Testing - ActionController::Base.class_eval do - include ActionController::Testing - end - end - hostname, port = host.split(':') env = { -- cgit v1.2.3 From 3b606a32595bf3547dbe74a2304d048c2dd2f6b1 Mon Sep 17 00:00:00 2001 From: Zachary Scott Date: Thu, 29 May 2014 00:24:06 -0700 Subject: Add missing `:param` option from the docs for Mapper#match [ci skip] Option discovered by @zackperdue in #14741, implemented in #5581. --- actionpack/lib/action_dispatch/routing/mapper.rb | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'actionpack/lib/action_dispatch') diff --git a/actionpack/lib/action_dispatch/routing/mapper.rb b/actionpack/lib/action_dispatch/routing/mapper.rb index 84a08770f5..4cf7adfb3c 100644 --- a/actionpack/lib/action_dispatch/routing/mapper.rb +++ b/actionpack/lib/action_dispatch/routing/mapper.rb @@ -422,6 +422,12 @@ module ActionDispatch # [:action] # The route's action. # + # [:param] + # Overrides the default resource identifier `:id` (name of the + # dynamic segment used to generate the routes). + # You can access that segment from your controller using + # params[<:param>]. + # # [:path] # The path prefix for the routes. # -- cgit v1.2.3