aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Fix typo in Action Pack changelog. [ci skip]Mike Naberezny2015-03-141-1/+1
|
* Merge pull request #19291 from hired/return-truthy-value-from-headRafael Mendonça França2015-03-132-0/+13
|\ | | | | Return truthy value from head method
| * Return true from head methodJoel Hayhurst2015-03-122-0/+13
| | | | | | | | | | | | It was returning false in normal circumstances. This broke the `head :ok and return if` construct. Add appropriate test.
* | Merge pull request #19309 from f1sherman/dont-set-session-options-idGuillermo Iguaran2015-03-125-13/+5
|\ \ | | | | | | Use request.session.id instead of request.session_options[:id]
| * | Use request.session.id instead of request.session_options[:id]Brian John2015-03-125-13/+5
| |/ | | | | | | | | | | | | | | | | As of the upgrade to Rack 1.5, request.session_options[:id] is no longer populated. Reflect this change in the tests by using request.session.id instead. Related change in Rack: https://github.com/rack/rack/commit/83a270d6
* | Merge pull request #19271 from eagletmt/304-content-typeArthur Nogueira Neves2015-03-122-0/+13
|\ \ | |/ |/| 304 response should not include Content-Type header
| * Also skip Content-Encoding and Vary header if 304Kohei Suzuki2015-03-122-4/+6
| |
| * 304 response should not include Content-Type headerKohei Suzuki2015-03-102-1/+12
| | | | | | | | | | Rack::Lint raises an error saying "Content-Type header found in 304 response, not allowed".
* | Merge pull request #19252 from kaspth/single-escaping-strip-tagsRafael Mendonça França2015-03-101-1/+1
|\ \ | |/ |/| Let strip_tags leave HTML escaping to Rails.
| * Let strip_tags leave HTML escaping to Rails.Kasper Timm Hansen2015-03-101-1/+1
| | | | | | | | Prevents double escaping errors, such as "&" becoming "&".
* | Call super last in before_setupeileencodes2015-03-092-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the reasons 4cf3b8a, 303567e, and fa63448 needed to be reverted in 7142059. The revert has been reverted and this fixes the issues caused previously. If we call `super` first we will end up nuking the session settings in the application tests that do `setup do` - so any session login or cookie settings will not be persisted thoughout the test sessions. Calling `super` last prevents `@integration_session` from getting nuked and set to nil if it's already set. Test added to prevent regression of this behavior in the future.
* | Revert "Revert integration test refactoring that caused app test regressions"eileencodes2015-03-092-18/+10
| | | | | | | | This reverts commit 714205988315d2f98aa3e749747c44470e18676b.
* | Target Ruby 2.2.1 in gemspecsPeter Suschlik2015-03-091-1/+1
|/ | | | This is a follow-up to #19257
* update integration test example as is not output deprecation warning [ci skip]yuuji.yaginuma2015-03-071-7/+8
|
* Merge pull request #19231 from prathamesh-sonpatki/fix-url-for-documentationGuillermo Iguaran2015-03-061-1/+4
|\ | | | | Fix documentation of url_for module [ci skip]
| * Fix documentation of url_for module [ci skip]Prathamesh Sonpatki2015-03-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | - The request needs to be instance of ActionDispatch::Request or an object that responds to host, optional_port, protocol and symbolized_path_parameter. - This documentation was correctly added in https://github.com/rails/rails/commit/e3b3f416b57f5642ea25078485f7e9394ad04526 but was changed to https://github.com/rails/rails/commit/e1ceae576e3911f3e6708b5d19a0e3ef63769eb7. - Fixes #16160.
* | Merge pull request #19221 from matthewd/random-testsMatthew Draper2015-03-061-4/+1
|\ \ | |/ |/| Run all our tests in random order
| * Revert "For now, we will keep sorting the tests."Matthew Draper2015-03-061-4/+1
| | | | | | | | This reverts commit 7025d7769dc53f0a3ffab8b537727ef3fee367fc.
* | pass a config to the route setAaron Patterson2015-03-053-11/+29
|/ | | | | This way we can get the relative_url_root from the application without setting another global value
* Merge pull request #19215 from ↵Sean Griffin2015-03-052-4/+2
|\ | | | | | | | | gsamokovarov/revert-ruby-2-2-0-kwarg-crash-workarounds Revert work arounds for upstream Ruby 2.2.0 kwargs bug
| * Revert work arounds for upstream Ruby 2.2.0 kwargs bugGenadi Samokovarov2015-03-052-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The bug caused a segfault and you can find more info about it at: https://bugs.ruby-lang.org/issues/10685. We did a couple of work arounds, but 2.2.1 rolled out and those aren't needed anymore. Here are the reverted commits: - Revert "Work around for upstream Ruby bug #10685", commit 707a433870e9e06af688f85a4aedc64a90791a64. - Revert "Fix segmentation fault in ActionPack tests", commit 22e0a22d5f98e162290d9820891d8191e720ad3b. I'm also bumping the Ruby version check to 2.2.1 to prevent future segfaults.
* | Merge pull request #19218 from sivsushruth/doc_fixKasper Timm Hansen2015-03-051-1/+1
|\ \ | | | | | | Added doc [ci skip]
| * | nodoc filtered_location [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
| | |
* | | Run ActionPack test cases in random order.Guo Xiang Tan2015-03-061-5/+0
|/ /
* / Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
|/
* Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
|
* Doc fix [ci skip]Sushruth Sivaramakrishnan2015-03-051-1/+1
|
* Drop request class from RouteSet constructor.Aaron Patterson2015-03-043-5/+19
| | | | | If you would like to use a custom request class, please subclass and implemet the `request_class` method.
* Tiny documentation edits [ci skip]Robin Dupret2015-03-031-1/+1
|
* Merge pull request #18775 from yasyf/issue_5122Rafael Mendonça França2015-03-034-1/+25
|\ | | | | | | Fallback to RAILS_RELATIVE_URL_ROOT in `url_for`
| * Fallback to RAILS_RELATIVE_URL_ROOT in `url_for`.Yasyf Mohamedali2015-02-244-1/+25
| | | | | | | | | | | | Fixed an issue where the `RAILS_RELATIVE_URL_ROOT` environment variable is not prepended to the path when `url_for` is called. If `SCRIPT_NAME` (used by Rack) is set, it takes precedence.
* | Merge pull request #19147 from gsamokovarov/work-around-ruby-10695Eileen M. Uchitelle2015-03-023-3/+5
|\ \ | | | | | | Work around for upstream Ruby bug #10685
| * | Work around for upstream Ruby bug #10685Genadi Samokovarov2015-03-013-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In f6e293ec54f02f83cdb37502bea117f66f87bcae we avoided a segfault in the tests, however I think we should try to avoid the crash, as it may happen in user code as well. Here is what I distiled the bug down to: ```ruby # Rails case - works on 2.0, 2.1; crashes on 2.2 require 'action_dispatch' ActionDispatch::Response.new(200, "Content-Type" => "text/xml") # General case - works on 2.0, 2.1; crashes on 2.2 def foo(optional = {}, default_argument: nil) end foo('quux' => 'bar') ```
* | | Merge pull request #15806 from tgxworld/partition_routes_during_setupAaron Patterson2015-03-024-8/+39
|\ \ \ | | | | | | | | Partition routes during setup.
| * | | Partition routes during setup.Guo Xiang Tan2015-02-264-8/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Partitioning of all the routes is currently being done during the first request. Since there is no need to clear the cache for `partitioned_routes` when adding a new route. We can move the partitioning of the routes during setup time.
* | | | Merge pull request #19181 from davydovanton/update-helper-docsZachary Scott2015-03-021-0/+4
|\ \ \ \ | | | | | | | | | | [ci skip] Add documentation for Helpers#all_helpers_from_path
| * | | | [ci skip] Add documentation for Helpers#all_helpers_from_pathAnton Davydov2015-03-031-0/+4
| | | | |
* | | | | be optimistic about missing route keysAaron Patterson2015-03-021-13/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this patch makes errors slightly more expensive when someone is missing a route key, but in exchange it drops 4 allocations per `url_for` call. Since missing a route key is an error, optimizing for the non-error path seems like a good trade off
* | | | | use arg size for parallel iterationAaron Patterson2015-03-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | we already know the length of the args, so we can use that length for parallel iteration and cut down on allocations for `url_for` calls.
* | | | | ask the routes objects for its Rack env keyAaron Patterson2015-03-022-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this centralizes the logic for determining the script name key and drops object allocations when calling `engine_script_name` (which is called on each `url_for`).
* | | | | Remove unneeded comment. [ci skip]Zoltan Kiss2015-03-021-1/+0
| | | | |
* | | | | Skip the failing tests on Rubinius for nowRobin Dupret2015-03-021-0/+2
| | | | |
* | | | | Avoid accurate assertions on error messagesRobin Dupret2015-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Since there are disparities between the raised error messages on the different implementations, let's avoid being too accurate.
* | | | | Avoid parallelizing Action Pack's tests on RubiniusRobin Dupret2015-03-021-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the `ForkingExecutor` class seems to be pretty slow on Rubinius due to DRb (c.f. http://git.io/xIVg), let's avoid running tests with it on this platform. Also, the `parallelize_me!` call make the suite to output a bunch of errors due to rubinius/rubinius#2934 since there are thread-safety problems with autoloading.
* | | | refactor `handle_model` to use private helper methods for generationAaron Patterson2015-03-011-8/+6
| | | |
* | | | drop allocations for string and class polymorphic routesAaron Patterson2015-03-011-3/+3
| | | |
* | | | drop string allocations per model url_for call in viewsAaron Patterson2015-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ```ruby article = Article.new.tap(&:save!) view.url_for article result = ObjectSpace::AllocationTracer.trace do 3000.times { view.url_for article } end p ObjectSpace::AllocationTracer.allocated_count_table[:T_STRING] / 3000 ```
* | | | Bump rack-test to fix nil values being sent to `parse_nested_query`eileencodes2015-03-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I found that nil values were being incorrectly sent to `parse_nested_query` in Rack. Originally it was thought that Rails was doing something incorrect but it was actually rack-test. This was fixed in brynary/rack-test@4a4b2c1 and is no longer an issue. This commit bumps rack-test in Rails so changes to Rack don't cause failures. See rack/rack#813 for more information.
* | | | move _generate_paths_by_default to where it is usedAaron Patterson2015-03-011-6/+0
| | | | | | | | | | | | | | | | | | | | _generate_paths_by_default wasn't used in AD::Routing::UrlFor, so we should be able to move it where it is used in AV::Routing
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2015-03-013-3/+20
|\ \ \ \ | |_|/ / |/| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 00:11:03 +0000