aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
Commit message (Collapse)AuthorAgeFilesLines
* stop `to_s`ing method namesAkira Matsuda2012-06-061-16/+16
| | | | Module#methods are Symbols in Ruby >= 1.9
* fix meaningless test caseAkira Matsuda2012-06-061-1/+1
| | | | | Module#instance_methods returns an Array of Symbols in Ruby >= 1.9 So this was not actually testing anything
* accept a block in button helper.Yuki Nishijima2012-06-051-1/+5
|
* Allow to use mounted helpers in ActionView::TestCasePiotr Sarnacki2012-06-012-0/+20
| | | | | Similarly to 6525002, this allows to use routes helpers for mounted helpers, but this time in ActionView::TestCase
* Merge pull request #6588 from nbibler/polymorphic_to_modelJosé Valim2012-06-011-1/+27
| | | | Correct the use of to_model in polymorphic routing
* Include routes.mounted_helpers into integration testsPiotr Sarnacki2012-06-011-0/+19
| | | | | | | | | | | | | | | In integration tests, you might want to use helpers from engines that you mounted in your application. It's not hard to add it by yourself, but it's unneeded boilerplate. mounted_helpers are now included by default. That means that given engine mounted like: mount Foo::Engine => "/foo", :as => "foo" you will be able to use paths from this engine in tests this way: foo.root_path #=> "/foo" (closes #6573)
* Merge branch 'master-sec'Aaron Patterson2012-05-311-1/+6
|\ | | | | | | | | | | * master-sec: Strip [nil] from parameters hash. Thanks to Ben Murphy for reporting this! predicate builder should not recurse for determining where columns. Thanks to Ben Murphy for reporting this
| * Strip [nil] from parameters hash.Aaron Patterson2012-05-301-1/+6
| | | | | | | | | | | | Thanks to Ben Murphy for reporting this! CVE-2012-2660
* | Extracted redirect logic from ActionController::Force::ClassMethods.force_sslJeremy Friesen2012-05-311-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this patch the existing .force_ssl method handles both defining the filter and handling the logic for performing the redirect. With this patch the logic for redirecting to the HTTPS protocol is separated from the filter logic that determines if a redirect should occur. By separating the two levels of behavior, an instance method for ActionController (i.e. #force_ssl_redirect) is exposed and available for more granular SSL enforcement. Cleaned up indentation.
* | Simplify link_to using content_tagCarlos Antonio da Silva2012-05-311-0/+20
| | | | | | | | Add some tests for link_to with blocks and escaping content.
* | accept a block in button_to helperSergey Nartimov2012-05-301-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make possible to use a block in button_to helper if button text is hard to fit into the name parameter, e.g.: <%= button_to [:make_happy, @user] do %> Make happy <strong><%= @user.name %></strong> <% end %> # => "<form method="post" action="/users/1/make_happy" class="button_to"> # <div> # <button type="submit"> # Make happy <strong>Name</strong> # </button> # </div> # </form>"
* | no need to pass an empty block to button_to helperSergey Nartimov2012-05-301-2/+2
| |
* | Merge pull request #6315 from ↵José Valim2012-05-281-0/+11
|\ \ | | | | | | | | | | | | appfolio/moving_number_helper_methods_to_active_support Moving number helper from ActionView to Active Support
| * | Moving NumberHelpers from ActionView to ActiveSupportAndrew Mutz2012-05-271-0/+11
| | |
* | | Fix sorting of helpers from different pathsPiotr Sarnacki2012-05-283-0/+40
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When more than one directory for helpers is provided to a controller, it should preserver the order of directories. Given 2 paths: MyController.helpers_paths = ["dir1/helpers", "dir2/helpers"] helpers from dir1 should be loaded first. Before this commit, all helpers were mixed and then sorted alphabetically, which essentially would require to rename helpers to get desired order. This is a problem especially for engines, where you would like to be able to predict accurately which engine helpers will load first. (closes #6496)
* | Add `:escape` option for `truncate`Rafael Mendonça França2012-05-261-0/+19
| | | | | | | | This options can be used to not escape the result by default.
* | Test that the block used in truncate is escaped if it is not HTML safeRafael Mendonça França2012-05-261-12/+11
| | | | | | | | Refactoring the truncate method to not do a sort-circuit return
* | Truncate now has the ability to receive a html option that allows it to call ↵Li Ellis Gallardo2012-05-261-8/+29
| | | | | | | | | | | | | | | | | | | | | | | | rails helpers. This way if my text is long I don't have to do something like this: .text = truncate(@text, :length => 27) if @text.size >= 27 = link_to "continue", notes_path, ....."")
* | Remove implicit dependency on pathnameJosé Valim2012-05-251-1/+1
| |
* | Merge pull request #6453 from parndt/session_keysJosé Valim2012-05-221-0/+16
|\ \ | | | | | | Added session.keys and session.values back to ActionDispatch::Request::Session
| * | Added ActionDispatch::Request::Session#keys and ↵Philip Arndt2012-05-231-0/+16
| | | | | | | | | | | | ActionDispatch::Request::Session#values
* | | Add tests for time_field and date_field helpersCarlos Galdino2012-05-221-0/+18
|/ / | | | | | | These tests check the values of 'min' and 'max' input attrs
* | Merge pull request #6359 from carlosgaldino/add-html5-inputsJeremy Kemper2012-05-223-0/+181
|\ \ | | | | | | Add HTML5 color and date/time inputs
| * | Add several HTML5 input helpersCarlos Galdino2012-05-212-0/+160
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The input types added are: - input[type="month"] - input[type="week"] - input[type="datetime"] - input[type="datetime-local"]
| * | Add HTML5 input[type="color"] helperCarlos Galdino2012-05-213-0/+21
| | |
* | | Fixed typo new_defautls -> new_defaults.Philip Arndt2012-05-231-3/+13
| |/ |/| | | | | | | * Added tests for 'else' case in ActionView::Helpers::TranslationHelper#wrap_translate_defaults * Also updated the testing syntax of translation.html_safe? asserts to provide better output upon failure.
* | Fix bug when Rails.application is defined but is nil. See #881Marc-Andre Lafortune2012-05-211-0/+7
| |
* | Revert "Merge pull request #6425 from pinetops/resolver_concurrency_fix"José Valim2012-05-211-4/+4
| | | | | | | | | | This reverts commit 254c04286c5916ae7f91eb6e173b312e7a74e364, reversing changes made to 513a0525c24c2944630acfa465b22cd2f4601adf.
* | Merge pull request #6425 from pinetops/resolver_concurrency_fixAaron Patterson2012-05-211-4/+4
|\ \ | |/ |/| Resolver concurrency fix
| * Make the Resolver template cache threadsafe - closes #6404Tom Clarke2012-05-211-4/+4
| | | | | | | | | | | | | | | | | | The Template cache in the Resolver can be accessed by multiple threads similtaneously in multi-threaded environments. The cache is implemented using a Hash, which isn't threadsafe in all VMs (notably JRuby). This commit extracts the cache to a new Cache class and adds mutexes to prevent concurrent access.
* | Merge pull request #2549 from trek/RoutingErrorForMissingControllersAaron Patterson2012-05-211-0/+10
|\ \ | | | | | | When a route references a missing controller, raise ActionController::RoutingError with clearer message
| * | When a route references a missing controller, raise ↵Trek Glowacki2011-08-161-0/+10
| | | | | | | | | | | | ActionController::RoutingError with a clearer message
* | | Escape the extension when normalizing the action cache path.Andrew White2012-05-201-1/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | Although no recognized formats use non-ASCII characters, sometimes they can be included in the :format parameter because of invalid URLS. To prevent encoding incompatibility errors we need to escape them before passing the path to URI.unescape. Closes #4379
* | | Return 400 Bad Request for URL paths with invalid encoding.Andrew White2012-05-201-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | Passing path parameters with invalid encoding is likely to trigger errors further on like `ArgumentError (invalid byte sequence in UTF-8)`. This will result in a 500 error whereas the better error to return is a 400 error which allows exception notification libraries to filter it out if they wish. Closes #4450
* | | Raise ActionController::BadRequest for malformed parameter hashes.Andrew White2012-05-204-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently Rack raises a TypeError when it encounters a malformed or ambiguous hash like `foo[]=bar&foo[4]=bar`. Rather than pass this through to the application this commit captures the exception and re-raises it using a new ActionController::BadRequest exception. The new ActionController::BadRequest exception returns a 400 error instead of the 500 error that would've been returned by the original TypeError. This allows exception notification libraries to ignore these errors if so desired. Closes #3051
* | | Raise Assertion instead of RoutingError for routing assertion failures.David Chelimsky2012-05-202-11/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before this change, assert_recognizes, assert_generates, and assert_routing raised ActionController::RoutingError when they failed to recognize the route. This commit changes them to raise Assertion instead. This aligns with convention for logical failures, and supports reporting tools that care about the difference between logical failures and errors e.g. the summary at the end of a test run. - Fixes #5899
* | | Show in log correct wrapped keysDmitry Vorotilin2012-05-201-0/+8
| | |
* | | Don't use assert_block method. It will be deprecated.kennyj2012-05-201-1/+1
| | |
* | | Clarify grouped_options_for_select method API, add changelog entryCarlos Antonio da Silva2012-05-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the method API more clear by explicitly showing the expected arguments. This means that the options cannot be passed as second argument because we are not relying on extract_options! anymore, you are expected to give a selected key or `nil` if you want to pass options, as it is the last argument. Notice that this does not change the current method arguments contract available in 3.2, it just brings back the same functionality with the divider addition.
* | | Merge pull request #6384 from ihid/tidy_text_helpersJeremy Kemper2012-05-181-0/+42
|\ \ \ | | | | | | | | Tidied and standardised text_helper implementations.
| * | | Tidied and standardised text_helper implementations.Jeremy Walker2012-05-191-0/+42
| | | |
* | | | Fix build: can't convert Regexp to Stringkennyj2012-05-191-1/+1
| | | |
* | | | reverting decoupling of NumberHelper from safe_join and adding tests for ↵Andrew Mutz2012-05-181-0/+2
|/ / / | | | | | | | | | escaping of delimiters and separators
* | | Merge pull request #6372 from richo/bugs/middleware_stack_as_arrayJosé Valim2012-05-171-2/+7
|\ \ \ | | | | | | | | Add some common Array methods to the middleware stack
| * | | Add the #unshift method to the middleware stackRich Healey2012-05-181-2/+7
| | |/ | |/| | | | | | | | | | | | | The docs suggest that the middleware stack is an Array, so I've added the unshift method to it. Originally I added some more Array methods, but it was agreed that they lacked usecases.
* | | Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-171-0/+1
|\ \ \ | | | | | | | | Render img tag with empty src if empty string is passed to image_tag.
| * | | Render img tag with empty src if empty string is passed to image_tag.Kirill Lashuk2012-05-181-0/+1
| |/ /
* / / Add HTML5 input[type="time"] helperAlex Soulim2012-05-182-0/+31
|/ /
* | Removed old text_helper apis for highlight, excerpt and word_wrapJeremy Walker2012-05-171-34/+22
| |
* | Merge pull request #2036 from Bodacious/tag_helper_data_fixRafael Mendonça França2012-05-171-2/+2
|\ \ | | | | | | TagHelper creates invalid data attributes when value is a BigDecimal
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 05:48:07 +0000