Andrew White 622e4ab424 Fix shorthand routes where controller and action are in the scope ...

Merge `:action` from routing scope and assign endpoint if both `:controller`
and `:action` are present. The endpoint assignment only occurs if there is
no `:to` present in the options hash so should only affect routes using the
shorthand syntax (i.e. endpoint is inferred from the the path).

Fixes #9856

Backport of 37b4276

2013-06-25 11:00:19 +01:00

..

middleware_stack

make sure string keys are always looked up from the class cache

2011-03-02 10:11:28 -08:00

request

Fix JSON params parsing regression for non-object JSON content.

2013-01-11 00:14:49 -05:00

routing

Don't use 1.9 hash syntax on 3-2-stable

2012-12-14 14:52:24 +00:00

session

Add ActionDispatch::Session::CacheStore as a generic way of storing sessions in a cache.

2011-10-21 13:13:29 -05:00

best_standards_support_test.rb

Merge pull request #8914 from nilbus/fix-header-bloat

2013-01-15 23:29:45 -02:00

callbacks_test.rb

Don't deprecate to_prepare.

2010-12-23 19:21:14 +01:00

cookies_test.rb

Test actual content of permanent cookie

2012-08-10 10:00:27 +04:00

debug_exceptions_test.rb

Deprecate AC::UnknownError and AC::DoubleRenderError

2012-01-17 18:07:08 -02:00

header_test.rb

Move dispatch related tests into test/dispatch

2009-01-28 22:50:46 -06:00

mapper_test.rb

all routes can be stored in the Journey Routes object

2011-09-12 16:50:48 -07:00

middleware_stack_test.rb

Merge pull request #4879 from kennyj/fix_4873

2012-02-04 15:32:40 +01:00

mime_type_test.rb

backporting #4918 to 3.2 stable; adding extra test for accept header given by googlebot

2012-02-17 15:10:52 +05:30

mount_test.rb

adding tests for #4029

2011-12-19 13:34:54 -08:00

prefix_generation_test.rb

backport, handle trailing slash with engines

2012-11-08 21:26:26 +01:00

rack_cache_test.rb

Dump and load rack-cache stuff.

2011-05-17 17:33:17 -04:00

rack_test.rb

* Change the object used in routing constraints to be an instance of

2010-04-03 20:24:30 -07:00

reloader_test.rb

Use a BodyProxy instead of including a Module that responds to close.

2012-01-13 19:44:44 -02:00

request_id_test.rb

Warnings removed from RequestIdTest

2011-10-22 16:30:48 +05:30

request_test.rb

Backport fixes about #7774 to 3-2-stable

2013-03-05 12:53:10 +01:00

response_test.rb

use Array#join so that file encoding doesn't impact returned string.

2011-12-12 19:45:16 -08:00

routing_assertions_test.rb

Fix assert_recognizes with block constraints [#5805 state:resolved]

2011-02-13 23:24:46 +00:00

routing_test.rb

Fix shorthand routes where controller and action are in the scope

2013-06-25 11:00:19 +01:00

show_exceptions_test.rb

Deprecate AC::UnknownError and AC::DoubleRenderError

2012-01-17 18:07:08 -02:00

static_test.rb

fix ArgumentError being raised in case of invalid byte sequences

2012-03-08 20:44:28 +09:00

test_request_test.rb

Fix bug when Rails.application is defined but is nil. See #881

2012-08-28 21:06:58 -07:00

test_response_test.rb

Add ActionDispatch::TestResponse tests.

2010-09-25 10:52:57 +02:00

uploaded_file_test.rb

Since File instance doesn't respond to #open use a double to test the

2012-09-30 22:59:23 -03:00

url_generation_test.rb

Extended url_for to handle specifying which router should be used.

2010-09-03 22:59:06 +02:00