aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
Commit message (Collapse)AuthorAgeFilesLines
* generate environment dependent asset digestsIlya Grigorik2011-08-041-0/+13
| | | | | | If two different environments are configured to use the pipeline, but one has an extra step (such as compression) then without taking the environment into account you may end up serving wrong assets
* Merge pull request #2421 from pivotal-casebook/masterSantiago Pastorino2011-08-041-2/+2
|\ | | | | Simple_format should not edit it in place. (Fixes https://github.com/rails/rails/issues/1980)
| * ActionView::Helpers::TextHelper#simple_format should not change the text in ↵Casebook Developer2011-08-041-2/+2
| | | | | | | | place. Now it duplicates it.
* | Merge pull request #2356 from waynn/fix_symbolSantiago Pastorino2011-08-041-0/+24
|\ \ | |/ |/| fix stringify_keys destructive behavior for most FormTagHelper functions
| * fix stringify_keys destructive behavior for most FormTagHelper functionsWaynn Lue2011-08-031-0/+24
| | | | | | | | add four new tests to verify that the other three methods that called stringify_keys! are fixed. verified that the tests break in master without the code patch. Closes #2355
* | Fix the issue where default_url_options is being cached on test cases. ↵thoefer2011-08-011-0/+29
| | | | | | | | | | | | Closes #1872. Closes #2031. Signed-off-by: José Valim <jose.valim@gmail.com>
* | Rename new method to_path to to_partial_path to avoid conflicts with ↵José Valim2011-08-012-3/+3
| | | | | | | | File#to_path and similar.
* | Merge pull request #2379 from arunagw/extra_require_removalSantiago Pastorino2011-07-311-1/+0
|\ \ | | | | | | Removing extra requires from the test. Already loaded in abstract_unit.
| * | Removing extra requires from the test. Already loaded in abstract_unit.Arun Agrawal2011-07-311-1/+0
| |/
* / remove extra require for 'active_support/dependencies' as it is required in ↵Vishnu Atrai2011-07-311-1/+0
|/ | | | abstract_unit.rb
* Instead of removing the instance variable just set it to nil, resolves the ↵Brian Cardarella2011-07-291-2/+2
| | | | warnings because of a missing instance variable
* Merge pull request #2330 from thedarkone/resources-router-fixJosé Valim2011-07-281-0/+9
|\ | | | | Inline resources router fix
| * There is no need to be destructive with the passed-in options.thedarkone2011-07-281-0/+9
| | | | | | | | This fixes a bug that is caused by Resource/SingletonResource mangling resource options when using inline "multi"-resource declarations.
* | Merge pull request #2034 from Casecommons/to_pathJosé Valim2011-07-282-0/+41
|\ \ | | | | | | Allow ActiveModel-compatible instances to define their own partial paths
| * | Let ActiveModel instances define partial paths.Grant Hutchins & Peter Jaros2011-07-252-0/+41
| | | | | | | | | | | | | | | | | | Deprecate ActiveModel::Name#partial_path. Now you should call #to_path directly on ActiveModel instances.
* | | fixing wildcard path matching when wildcard is inside parenthesisAaron Patterson2011-07-261-0/+7
| | |
* | | Merge pull request #2095 from dgeb/issue-2094Aaron Patterson2011-07-261-0/+17
|\ \ \ | | | | | | | | Fixes overriding of options[:html][:remote] in form_for() (Issue #2094)
| * | | added test case for fix to issue #2094Dan Gebhardt2011-07-161-0/+17
| | | |
* | | | use sprocket's append_path and assert_matchDamien Mathieu2011-07-261-26/+26
| | | |
* | | | Allow a route to have :format => trueErik Michaels-Ober2011-07-251-0/+7
| |/ / |/| | | | | | | | | | | | | | When format is true, it is mandatory (as opposed to :format => false). This is currently not possible with resource routes, which automatically make format optional by default.
* | | Merge pull request #2245 from ↵Santiago Pastorino2011-07-251-0/+20
|\ \ \ | | | | | | | | | | | | | | | | davidtrogers/constraints_block_passed_to_following_routes_in_same_scope Memoizing @blocks & disposing of constraints options properly
| * | | Ensure the constraints block is only applied to the correct routeDave Rogers2011-07-251-0/+20
| | |/ | |/| | | | | | | | | | addresses issue #1907 - any routes that follow a route with a constraints block are inheriting the previous route's constraints.
* | | no need for an anonymous class on every setup callAaron Patterson2011-07-251-10/+9
| | |
* | | Merge pull request #2258 from thedarkone/no-file-statJosé Valim2011-07-251-2/+2
|\ \ \ | | | | | | | | Use shorter class-level File methods instead of going through File.stat
| * | | Use shorter class-level File methods instead of going through File.stat.thedarkone2011-07-251-2/+2
| |/ /
* / / Make polymorphic_url calls go through application helpers again.thedarkone2011-07-252-1/+13
|/ / | | | | | | This brings back the ability to overwrite/extend url generating methods in application heleprs.
* | Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-07-241-1/+1
|\ \
| * | Changed a few instances of of words in the API docs written in British ↵Oemuer Oezkir2011-07-241-1/+1
| | | | | | | | | | | | | | | | | | English to American English(according to Weber)
* | | Merge pull request #2233 from gramos/fix-issue-1951-masterAaron Patterson2011-07-231-0/+14
|\ \ \ | | | | | | | | Fix issue 1951 master Namespaced model partial_path is wrong in namespaced controllers
| * | | - added ActionView::PartialRenderer#merge_path_into_partial(path, partial)Gaston Ramos2011-07-241-1/+1
| | | | | | | | | | | | | | | | fix issues/1951
| * | | - added test case for issue:Gaston Ramos2011-07-241-0/+14
| | | | | | | | | | | | | | | | | | | | https://github.com/rails/rails/issues/1951 Namespaced model partial_path is wrong in namespaced controllers
* | | | just use normal ruby for stubbingAaron Patterson2011-07-231-5/+3
|/ / /
* / / Simple fix to the NoMethodError noted in #2177.Ben Woosley2011-07-231-1/+0
|/ / | | | | Unfortunately #respond_to?(:controller) won't work as suggested, nor will respond_to?(:params), as #controller is present and #params is delegated to #controller. #delegate makes respond_to? return true regardless whether the target responds to it.
* | Check Accept and Content-Type headers before evaluating them in xhr ↵ogeidix2011-07-191-0/+6
| | | | | | | | | | | | requests. Closes #2119 An xhr request must have an "Accept" or "Content-type" header in order to be considered a request with valid_accept_header.
* | Ensure that status codes are logged properlyJesse Storimer2011-07-181-0/+19
| | | | | | | | | | | | Needed to move AC::Metal::Instrumentation before AM::Metal::Rescue so that status codes rendered from rescue_from blocks are logged properly.
* | Merge pull request #2046 from sikachu/master-test_fixSantiago Pastorino2011-07-171-2/+6
|\ \ | | | | | | Fix a wrong assertion on url_helper_test, and add missing `#html_safe?` a
| * | Fix a wrong assertion on url_helper_test, and refactor `html_safe` test to ↵Prem Sichanugrist2011-07-171-2/+6
| |/ | | | | | | be in its method
* | Merge pull request #2018 from bhus/render_partial_invalid_checkSantiago Pastorino2011-07-172-0/+10
|\ \ | |/ |/| Render partial invalid check
| * Added view template invalid name check, along with tests. No merges in commit.huskins2011-07-132-0/+10
| |
* | assert nothing raised for setting a cookie value to nil in ActionDispatchBradford Folkens2011-07-141-0/+5
|/
* Fixed session ID fixation for ActiveRecord::SessionStoreJoseph Wong2011-07-121-0/+31
| | | | | | | | | | | | | | | | | I have found that Rails will take an invalid session ID specified by the client and materialize a session based on that session ID. This means that it is possible, among other things, for a client to use an arbitrarily weak session ID or for a client to resurrect a previous used session ID. In other words, we cannot guarantee that all session IDs are generated by the server and that they are (statistically) unique through time. The fix is to always generate a new session ID in #get_session if an existing session cannot be found under the incoming session ID. Also added new tests that make sure that an invalid session ID is never materialized into a new session, regardless of whether it comes in via a cookie or a URL parameter (when :cookie_only => false).
* Grouped select helperAndrew Radev2011-07-111-0/+36
| | | | FormBuilder#select now works with a nested data structure.
* config should always be an AS::InheritableOptions object. Closes #1992Santiago Pastorino2011-07-081-0/+4
|
* use Zlib.crc2 rather that bytes.sum, as per Aaron's suggestionXavier Noria2011-07-081-1/+2
| | | | | | That integer is rather irrelevant, the only thing that matters is that it is consistent and with no apparent bias. Zlib.crc32 is 8-10 times faster than bytes.sum, so use that.
* removing brittle assertionAaron Patterson2011-07-071-1/+0
|
* Using the sum of bytes instead the hash of the path when replacing the ↵Albert Callarisa Roca2011-07-081-2/+3
| | | | wildcard of the assets path because in ruby 1.9 is not consistent
* Remove stream at the class level.José Valim2011-07-061-1/+1
| | | | | | This is because only template rendering works with streaming. Setting it at the class level was also changing the behavior of JSON and XML responses, closes #1337.
* Merge pull request #1925 from spohlenz/refactor-asset-pathsJosé Valim2011-07-022-0/+13
|\ | | | | Refactor sprockets asset paths to allow for alternate asset environments
| * Add tests for alternate asset prefix/environmentSam Pohlenz2011-07-012-0/+13
| |
* | provide a more explicit message when using url_for with nilDamien Mathieu2011-07-022-0/+15
| | | | | | This fixes the problem of having a non-explicit message when the :location option is not provided in respond_with.