aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
Commit message (Collapse)AuthorAgeFilesLines
* Add support for other types of routing constraintsAndrew White2013-01-151-0/+48
| | | | | | | | | | | | | | This now allows the use of arrays like this: get '/foo/:action', to: 'foo', constraints: { subdomain: %w[www admin] } or constraints where the request method returns an Fixnum like this: get '/foo', to: 'foo#index', constraints: { port: 8080 } Note that this only applies to constraints on the request - path constraints still need to be specified as Regexps as the various constraints are compiled into a single Regexp.
* Ensure port is set when passed via the process methodAndrew White2013-01-151-0/+52
|
* Raise correct exception now Journey is integrated.Andrew White2013-01-151-4/+4
| | | | | | | Now that Journey has been integrated into ActionDispatch we can raise the exception ActionController::UrlGenerationError directly rather than raising the internal Journey::Router::RoutingError and then have ActionDispatch::Routing::RouteSet#generate re-raise the exception.
* Merge pull request #8938 from colinbm/date_select_valueSteve Klabnik2013-01-141-2/+50
|\ | | | | Rename :value to :selected for date_select, and add missing tests/docs
| * Rename :value option to :selected, in line with other select helpersColin Burn-Murdoch2013-01-141-2/+50
| | | | | | | | | | Add tests for time & datetime. Add documentation.
* | Revert benchmark helper regression. Use a #capture within a #benchmarkJeremy Kemper2013-01-141-24/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | block. Breaks benchmark calls that return non-String values otherwise. Revert "add benchmark helper that works in erb" This reverts commit 904e544cc8f5846de7c31827bb5556c6a238c0de. Conflicts: actionpack/lib/action_view/helpers.rb actionpack/lib/action_view/helpers/benchmark_helper.rb actionpack/test/template/benchmark_helper_test.rb
* | Merge pull request #8916 from josemota/collection-with-blockRafael Mendonça França2013-01-131-0/+49
|\ \ | |/ |/| | | | | Collection radio buttons and collection check boxes through FormBuilder render the provided block. Closes #8897
| * Collection radio buttons and collection check boxes through FormBuilder renderJosé Mota2013-01-121-0/+49
| | | | | | | | | | | | | | | | the provided block. In the case of having a form_for method being called, the block for each collection would not be passed and thus the result expected was always the same. This patch passes the block to the original method like it would be assumed.
* | Allow value to be set on date_selectColin Burn-Murdoch2013-01-131-0/+21
| |
* | Associaton -> AssociationSteve Klabnik2013-01-131-2/+2
|/
* Merge pull request #8623 from virusman/form_helpers_collectionproxy_fixJon Leighton2013-01-111-0/+23
|\ | | | | Fixed nested fields bug when called with AssociationProxy
| * Test nested fields with AssociationProxy mockup & fix AssociationProxy ↵virusman2012-12-271-0/+23
| | | | | | | | support in form helper
* | Fix json params parsing regression for non-object JSON content.Dylan Smith2013-01-111-0/+7
| | | | | | | | Fixes #8845.
* | Merge pull request #8821 from jamis/masterRafael Mendonça França2013-01-101-2/+2
|\ \ | | | | | | | | | | | | | | | | | | Evaluate view_cache_dependencies at the instance level Conflicts: actionpack/lib/action_controller/caching.rb
| * | evaluate the dependency blocks at the instance level, not class levelJamis Buck2013-01-081-2/+2
| | |
* | | Remove :yaml related tests and fix other related to parsing empty arraysCarlos Antonio da Silva2013-01-082-45/+2
| | | | | | | | | | | | All Action Pack tests are green.
* | | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.Jeremy Kemper2013-01-081-0/+13
| | |
* | | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * ↵Aaron Patterson2013-01-082-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dealing with empty hashes. Thanks Damien Mathieu Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_dispatch/middleware/params_parser.rb activerecord/CHANGELOG.md activerecord/lib/active_record/relation/predicate_builder.rb activerecord/test/cases/relation/where_test.rb
* | | Revert "Merge branch 'master-sec'"Jeremy Kemper2013-01-083-45/+0
| | | | | | | | | | | | | | | This reverts commit 88cc1688d0cb828c17706b41a8bd27870f2a2beb, reversing changes made to f049016cd348627bf8db0d72382d7580bf802a79.
* | | Merge branch 'master-sec'Aaron Patterson2013-01-083-0/+45
|\ \ \ | |/ / |/| | | | | | | | | | | * master-sec: CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml. * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * dealing with empty hashes. Thanks Damien Mathieu
| * | CVE-2013-0156: Safe XML params parsing. Doesn't allow symbols or yaml.Jeremy Kemper2013-01-081-0/+13
| | |
| * | * Strip nils from collections on JSON and XML posts. [CVE-2013-0155] * ↵Aaron Patterson2013-01-072-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dealing with empty hashes. Thanks Damien Mathieu Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_dispatch/middleware/params_parser.rb activerecord/CHANGELOG.md activerecord/lib/active_record/relation/predicate_builder.rb activerecord/test/cases/relation/where_test.rb
* | | view_cache_dependency APIJamis Buck2013-01-082-2/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A declarative API for specifying dependencies that affect template cache digest computation. In your controller, specify any of said dependencies: view_cache_dependency { "phone" if using_phone? } When the block is evaluated, the resulting value is included in the cache digest calculation, allowing you to generate different digests for effectively the same template. (Mostly useful if you're mucking with template load paths.)
* | | Merge pull request #8810 from NARKOZ/image-submit-tagSteve Klabnik2013-01-081-2/+2
|\ \ \ | | | | | | | | set 'alt' attribute for image_submit_tag
| * | | set 'alt' attribute for image_submit_tagNihad Abbasov2013-01-081-2/+2
| | | |
* | | | Revert "unpermitted params" exception -- it's just not going to work. See ↵David Heinemeier Hansson2013-01-081-43/+0
| | | | | | | | | | | | | | | | the discussion on https://github.com/rails/strong_parameters/pull/75.
* | | | Never treat action or controller as unpermitted paramsDavid Heinemeier Hansson2013-01-081-0/+10
|/ / /
* / / Do not generate local vars for partials without object or collectionCarlos Antonio da Silva2013-01-082-0/+8
|/ / | | | | | | | | | | | | | | | | Previously rendering a partial without giving :object or :collection would generate a local variable with the partial name by default. This was noticed due to warnings in Ruby 2.0 of not used variables, which turned out to be the generation of not used variables inside partials that do not contain objects related to them.
* | Namespace HashWithIndifferentAccessAkira Matsuda2013-01-071-3/+2
| |
* | Needless requiresAkira Matsuda2013-01-061-2/+0
| |
* | Missing requiresAkira Matsuda2013-01-061-0/+1
| |
* | Do not call fields_for from form_for, to avoid instantiating two buildersCarlos Antonio da Silva2013-01-061-1/+13
| |
* | Remove unnecessary begin..rescue..end, use only rescueAkira Matsuda2013-01-064-25/+17
| |
* | deprecate `assert_blank` and `assert_present`.Yves Senn2013-01-056-16/+16
| | | | | | | | | | They don't add any benefits over `assert object.blank?` and `assert object.present?`
* | display mountable engine routes on RoutingError.Yves Senn2013-01-051-2/+20
| |
* | split formatting concerns from RoutesInspectorYves Senn2013-01-051-4/+21
| |
* | Rename the last occurrence of UnexpectedParametersRafael Mendonça França2013-01-051-2/+2
| |
* | Rename the configuration to raise_on_unpermitted_parametersRafael Mendonça França2013-01-051-4/+4
| | | | | | | | Also changed the exception to UnpermittedParameters
* | Merge pull request #8752 from thomasfedb/masterRafael Mendonça França2013-01-051-0/+33
|\ \ | | | | | | Exception on unexpected params when enabled.
| * | Allow developers to enable raising of exception when unexpected params are ↵Thomas Drake-Brockman2013-01-051-0/+33
| | | | | | | | | | | | provided.
* | | Allow use of durations for ActionDispatch::SSL configurationAndrew White2013-01-041-0/+7
|/ /
* | Restore original remote_ip algorithm.Andre Arko2013-01-021-58/+44
| | | | | | | | | | | | | | | | | | | | | | Proxy servers add X-Forwarded-For headers, resulting in a list of IPs. We remove trusted IP values, and then take the last given value, assuming that it is the most likely to be the correct, unfaked value. See [1] for a very thorough discussion of why that is the best option we have at the moment. [1]: http://blog.gingerlime.com/2012/rails-ip-spoofing-vulnerabilities-and-protection/ Fixes #7979
* | do not append a second slash when usingYves Senn2013-01-021-6/+16
| |
* | No need to pass a empty block to content_tag_for anymoreRafael Mendonça França2013-01-021-11/+11
| |
* | Make content_tag_for work without blockRafael Mendonça França2013-01-021-0/+8
| | | | | | | | This is version of #8640 for master
* | Fix test for DebugExceptions due to template changeGuillermo Iguaran2012-12-311-1/+1
| |
* | Use ActiveSupport::TestCase in the journey testsRafael Mendonça França2012-12-3113-13/+13
| |
* | Alias refute methods to assert_not and perfer assert_not on testsRafael Mendonça França2012-12-3112-22/+22
| |
* | Do not use the same tests descriptionRafael Mendonça França2012-12-311-3/+3
| |
* | Remove unneeded testsRafael Mendonça França2012-12-315-381/+0
| | | | | | | | These tests are needed only if we are using MiniTest::Spec