aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
Commit message (Collapse)AuthorAgeFilesLines
...
* Fix named routing regression from 3.2.13schneems2013-05-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | When named route that is nested is used in 3.2.13 Example `routes.rb`: ``` resources :nested do resources :builder, :controller => 'nested/builder' end ``` In 3.2.12 and 3.2.12 this named route would work: ``` nested_builder_path(:last_step, :nested_id => "foo") ``` Generating a url that looks like `/nested/foo/builder/last_step`. This PR fixes the regression when building urls via the optimized helper. Any explicit keys set in the options are removed from the list of implicitly mapped keys. Not sure if this is exactly how the original version worked, but this fixes this use case regression.
* Revert "Integration tests support the OPTIONS http method"Rafael Mendonça França2013-05-161-17/+1
| | | | | | | | | | | | | | This reverts commit ad46884af567d6f8d6d8d777f372c39e81a560ba. Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/testing/integration.rb actionpack/test/controller/integration_test.rb Reason: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638.
* Merge pull request #10636 from seanwalbran/fix-asset-host-proc-returning-nilRafael Mendonça França2013-05-161-0/+11
|\ | | | | fix rails4 regression with asset_host Proc returning nil
| * restore ability to return nil from asset_host proc, add testSean Walbran2013-05-151-0/+11
| |
* | Revert "Add the options method to action_controller testcase."Rafael Mendonça França2013-05-161-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 0303c2325fab253adf5e4a0b738cb469c048f008. Conflicts: actionpack/lib/action_controller/test_case.rb REASON: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638.
* | Merge pull request #10591 from acapilleri/cond_callback_testAaron Patterson2013-05-151-0/+13
|\ \ | |/ |/| add test for skip_before_filter with condition
| * add test for skip_before_filter with conditionAngelo capilleri2013-05-131-0/+13
| |
* | use public api for testing rather than grabbing instance variablesAaron Patterson2013-05-141-1/+1
|/
* Replace multi_json with jsonErik Michaels-Ober2013-05-111-1/+1
|
* Fix that JSON and XML exception responses should give the HTTP error message ↵Jeremy Kemper2013-05-081-2/+2
| | | | for their status, by default, not the message from the underlying exception
* Test that #fresh_when accepts an arrayBrandon Keepers2013-05-071-2/+19
| | | | https://github.com/rails/etagger/pull/3
* Allow numbers in partial name for digestingBryan Ricker2013-05-062-1/+8
| | | | | | | | | | Add failing test for template with number at the end Use \w for RENDER_DEPENDENCY regex Spacing Add CHANGELOG entry
* Fix failing AP testCarlos Antonio da Silva2013-05-011-1/+1
|
* Merge pull request #9857 from yyyc514/bad_params_should_400Aaron Patterson2013-04-302-0/+7
|\ | | | | failure to parse params should trigger a 400 Bad Request
| * failure to parse params should trigger a 400 Bad RequestJosh Goebel2013-03-212-0/+7
| |
* | Revert "Merge pull request #10337 from eimermusic/fix_template_digestor_lookup"Rafael Mendonça França2013-04-251-1/+1
| | | | | | | | | | | | | | | | This reverts commit b4239622afc4f3f73808fd0c97512f3a534e07dd, reversing changes made to f99ce3c188f5dde57e2ff63e6a22363c62f0a4cd. Reason: This broke the build https://travis-ci.org/rails/rails/jobs/6629894
* | Merge pull request #10337 from eimermusic/fix_template_digestor_lookupRafael Mendonça França2013-04-251-1/+1
|\ \ | | | | | | | | | | | | | | | | | | Fix ActionView::Digestor to correctly pass format to LookupContext Conflicts: actionpack/CHANGELOG.md
| * | AV Digestor correctly passes format to LookupContextMartin Westin2013-04-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | ActionView::Digestor now passes arguments correctly to LookupContext::find method. This makes cache digests respect the format option correctly. FixtureFinder in tests also changed to reflect this.
* | | Add support for extra options to `force_ssl`Andrew White2013-04-251-14/+106
| | | | | | | | | | | | | | | | | | | | | | | | This commit adds support for passing additional url options along with a :status option and any of the flash-related options to `redirect_to` (i.e. :flash, :alert & :notice). Closes #7570.
* | | Use `request.fullpath` to build redirect url in `force_ssl`Andrew White2013-04-251-0/+63
|/ / | | | | | | | | | | | | | | | | | | | | The `force_ssl` command now builds the redirect url from `request.fullpath`. This ensures that the format is maintained and it doesn't redirect to a route that has the same parameters but is defined earlier in `routes.rb`. Also any optional segments are maintained. Fixes #7528. Fixes #9061. Fixes #10305.
* | Add test for `format: false` with resources - closes #10323Andrew White2013-04-241-0/+29
| |
* | Return a 405 response for unknown HTTP methodsLewis Marshall2013-04-222-0/+12
| |
* | Removing tests for deprecated options in active support. Thewangjohn2013-04-211-8/+0
| | | | | | | | | | +use_full_path+ option was removed in 3b3790a4 and passing the template handler to render was deprecated in 43d27e91.
* | Refactor ActionDispatch::Http::URL.build_host_urlAndrew White2013-04-181-0/+41
| | | | | | | | | | Add support for extracting the port from the :host option and for removing the subdomain by using nil, false or ''.
* | Add url generation tests for #10185Andrew White2013-04-181-0/+2
| |
* | Passing subdomain: '' to url_for removes the subdomain (instead of adding a ↵Derek Watson2013-04-182-0/+27
| | | | | | | | | | | | leading .) Adding a boolean route constraint checks for presence/absence of request property
* | Avoid leak into controller's action_methodsprintercu2013-04-181-0/+6
| |
* | options_from_collection_for_select helper takes html attributesVasiliy Ermolovich2013-04-111-0/+7
| | | | | | | | as the last element of the array
* | Merge pull request #9604 from sgrif/live_streaming_exceptionsRafael Mendonça França2013-04-081-1/+75
|\ \ | | | | | | Exceptions raised when using ActionController::Live cause server crash
| * | Exception handling for controllers using ActionController::LiveSean Griffin2013-03-181-1/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | Any exceptions that occured at the view or controller level for a controller using ActionController::Live would cause the server to either hang with an open socket indefinitely, or immediately crash (depending on whether the server was launched with rails s or directly). Changed the behavior of exceptions to act the same as streaming templates for html requests, and allow for an on_error callback if needed.
* | | Fix explicit names on multiple file fieldsRyan McGeary2013-04-051-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | If a file field tag is passed the multiple option, it is turned into an array field (appending "[]"), but if the file field is passed an explicit name as an option, leave the name alone (do not append "[]"). Fixes #9830
* | | Fix indent and remove extra white spacesCarlos Antonio da Silva2013-04-051-15/+17
| | |
* | | Ensure mail_to helper does not modify the given html options hashCarlos Antonio da Silva2013-04-041-1/+7
| | |
* | | Merge pull request #10065 from spohlenz/mail_to_blockCarlos Antonio da Silva2013-04-041-0/+10
|\ \ \ | | | | | | | | Add block support for the mail_to helper
| * | | Add block support for the helperSam Pohlenz2013-04-031-0/+10
| | | |
* | | | Fix typo in view nameCarlos Antonio da Silva2013-04-032-1/+1
| | | | | | | | | | | | | | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
* | | | Merge pull request #10074 from ↵Rafael Mendonça França2013-04-034-4/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | trevorturk/remove-fixme-comments-about-legacy-key-generator Remove comments about removing LegacyKeyGenerator in 4.1
| * | | | Remove comments about removing LegacyKeyGenerator in 4.1Trevor Turk2013-04-034-4/+0
| | | | |
* | | | | Merge pull request #9932 from senny/9913_routing_problemAndrew White2013-04-031-0/+29
|\ \ \ \ \ | | | | | | | | | | | | routing bugfixes when matching multiple paths
| * | | | | routing shorthand syntax works with multiple pathsYves Senn2013-03-261-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #9913. We need to expand the match shorthand syntax for every path.
| * | | | | bugfix, when matching multiple paths with `get`, `post`, ...Yves Senn2013-03-261-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This problem was introduced with: https://github.com/rails/rails/commit/d03aa104e069be4e301efa8cefb90a2a785a7bff
* | | | | | fix regression in Mapper when `format:` was used in a `scope`.Yves Senn2013-04-031-0/+22
| |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Closes #10071 `#normalize_path!` depends on the options so we need to call `#normalize_options!` first to make sure everything is set correctly.
* | | | | Getting rid of a few other vestiges of rails.png.Steve Klabnik2013-04-021-0/+0
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We don't actually need a rails.png in the AP fixtures, the tests that use it don't actually try to load the file. We also don't need to get rid of it with the dummy reset either. Finally, it's not needed in the sample application that's included with the Rails Guides.
* | | | Merge pull request #10061 from trevorturk/dummy-key-generator-renameSantiago Pastorino2013-04-024-12/+12
|\ \ \ \ | | | | | | | | | | Rename DummyKeyGenerator -> LegacyKeyGenerator
| * | | | Rename DummyKeyGenerator -> LegacyKeyGeneratorTrevor Turk2013-04-024-12/+12
| | | | |
* | | | | Fix permanent cookie jar accessor typoTrevor Turk2013-04-021-1/+6
|/ / / /
* | | | each_with_index => each as we dont use indexVipul A M2013-04-031-1/+1
| | | |
* | | | Fixed typo on AP dispatch Mime::Type testKalabiYau2013-04-011-1/+1
| | | |
* | | | Merge pull request #9978 from trevorturk/cookie-store-auto-upgradeSantiago Pastorino2013-04-011-2/+73
|\ \ \ \ | | | | | | | | | | Cookie-base session store auto-upgrade
| * | | | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵Trevor Turk2013-03-281-2/+73
| | | | | | | | | | | | | | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config