aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
Commit message (Collapse)AuthorAgeFilesLines
* Duplicate tests removed.Arun Agrawal2012-06-091-16/+0
|
* Fix asset tags for files with more than one dotPiotr Sarnacki2012-06-073-0/+6
| | | | | | | | | | | | | | | After the fix done in 39f9f02a, there are cases that will not work correctly. If you have file with "2 extensions", like foo.min.js and you reference the file without extension, like: javascript_include_tag "foo.min" it will fail because sprockets finds foo.min.js with foo.min argument. This commit fixes this case and will get the right file even when referrencing it without extension. (closes #6598)
* Add test to flash sweep after two redirectsRafael Mendonça França2012-06-051-0/+20
| | | | | This test is needed to avoid regressions in the way that flash works now (swept in every request).
* Deprecate `:confirm` in favor of `:data => { :confirm => 'Text' }` optionCarlos Galdino2012-06-052-19/+110
| | | | | | | | | | | | This deprecation applies to: `button_to` `button_tag` `image_submit_tag` `link_to` `submit_tag` As :confirm is an UI specific option is better to use the data attributes, teaching users about unobtrusive JavaScript and how Rails works with it.
* 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
| * Use to_model delegates for polymorphic route generationNathaniel Bibler2012-06-011-1/+27
| |
* | 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)
* Strip [nil] from parameters hash.Aaron Patterson2012-05-301-1/+6
| | | | | | Thanks to Ben Murphy for reporting this! CVE-2012-2660
* Assets: don't add extension if other given and file existsSergey Nartimov2012-05-212-0/+3
| | | | | | | | | | | | | | We should lookup if asset without appended extension exists. When sprockets are disabled the asset tag helpers incorporate this logic. When sprockets are enabled we should have the same logic. For example, we have style.ext file in app/assets/stylesheets and we use stylesheet_link_tag in the layout. In this case we should have /assets/style.ext instead of /assets/style.ext.css in the output. Closes #6310
* Fixed tag_helper data-attribute bug with BigDecimalsBodacious2012-05-201-2/+2
|
* Use right option for excerpt text helper in tests, fix buildCarlos Antonio da Silva2012-05-191-8/+8
| | | | | | | `excerpt` text helper uses `:radius`, not `line_width` (that is used by `word_wrap` helper). Also cleanup some whitespaces.
* Merge pull request #5020 from KL-7/fix-blank-image_tag-sourceJosé Valim2012-05-181-0/+1
| | | | Render img tag with empty src if empty string is passed to image_tag.
* Deprecate old APIs for highlight, excerpt and word_wrapJeremy Walker2012-05-181-36/+45
|
* Deprecate `:disable_with` for `button_tag` tooCarlos Galdino + Rafael Mendonça França2012-05-142-6/+15
|
* Fix typoCarlos Galdino + Rafael Mendonça França2012-05-141-8/+8
|
* Deprecate `:disable_with` in favor of `'data-disable-with'` option for ↵Carlos Galdino + Rafael Mendonça França2012-05-142-25/+37
| | | | `button_to` and `submit_tag` helpers.
* Deprecate `:mouseover` options for `image_tag` helper.Rafael Mendonça França2012-05-131-8/+40
|
* Merge pull request #3237 from sakuro/data-url-schemeRafael Mendonça França2012-05-131-1/+2
| | | | Support data: url scheme
* Don't ignore nil positional arguments for url helpers - fixes #6196.Andrew White2012-05-101-0/+34
|
* Refactor the handling of default_url_options in integration testsAndrew White2012-05-101-0/+80
| | | | | | | | | | | | This commit improves the handling of default_url_options in integration tests by making behave closer to how a real application operates. Specifically the following issues have been addressed: * Options specified in routes.rb are used (fixes #546) * Options specified in controllers are used * Request parameters are recalled correctly * Tests can override default_url_options directly
* Merge pull request #6149 from jmbejar/javascript_include_tag_with_not_duplicatesSantiago Pastorino2012-05-091-0/+6
|\ | | | | Make sure that javascript_include_tag/stylesheet_link_tag methods don't consider duplicated assets
| * Make sure that javascript_include_tag/stylesheet_link_tag methods inJorge Bejar2012-05-031-0/+6
| | | | | | | | sprockets/helpers/rails_helper.rb discard duplicated assets
* | Add failing test re #3436 which demonstrates content_type is not respected ↵Kunal Shah2012-05-071-0/+21
| | | | | | | | when using the :head method/shortcut
* | Add a role option to wrap_parameters.Nick Ragaz2012-05-041-2/+15
|/ | | | The role option identifies which parameters are accessible and should be wrapped. The default role is :default.
* Reset the request parameters after a constraints checkAndrew White2012-05-031-0/+19
| | | | | | | | | | | | | | A callable object passed as a constraint for a route may access the request parameters as part of its check. This causes the combined parameters hash to be cached in the environment hash. If the constraint fails then any subsequent access of the request parameters will be against that stale hash. To fix this we delete the cache after every call to `matches?`. This may have a negative performance impact if the contraint wraps a large number of routes as the parameters hash is built by merging GET, POST and path parameters. Fixes #2510. (cherry picked from commit 56030506563352944fed12a6bb4793bb2462094b)
* Deprecate link_to_function and button_to_function helpersRafael Mendonça França2012-04-301-12/+24
|
* Restore interpolation of path option in redirect routesAndrew White2012-04-291-1/+40
|
* Escape interpolated params when redirecting - fixes #5688Andrew White2012-04-291-0/+28
|
* Remove warning of unused variableRafael Mendonça França2012-04-291-1/+1
|
* Fix the build.Rafael Mendonça França2012-04-291-2/+2
| | | | | * The method for persisted records in 3-2-branch is 'PUT' * size is generated by default in inputs
* Don't convert params if the request isn't HTML - fixes #5341Andrew White2012-04-291-2/+40
| | | | | | | | (cherry picked from commit 7a80b69e00f68e673c6ceb5cc684aa9196ed3d9f) Conflicts: actionpack/test/controller/test_test.rb
* Lazy load `default_form_builder` if it's passed as a stringPiotr Sarnacki2012-04-281-0/+17
| | | | closes #3341
* Do not mutate options hashCarlos Antonio da Silva2012-04-271-0/+6
|
* Fix broken test from the earlier merge conflictPrem Sichanugrist2012-04-231-9/+11
| | | | Seriously people, please run the test before submitting pull request.
* converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-161-46/+22
| | | | | | Conflicts: actionpack/test/template/render_test.rb
* catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-161-0/+9
|
* default_url_options does not receive one argument anymoreRafael Mendonça França2012-04-082-2/+2
|
* Fix the redirect when it receive blocks with arity of 1.Rafael Mendonça França2012-03-311-0/+15
| | | | Closes #5677
* Remove the leading \n added by textarea on assert_selectSantiago Pastorino2012-03-301-0/+7
|
* Set proper rendered_format when doing render :inlineSantiago Pastorino2012-03-281-0/+1
| | | | Closes #5632
* Cover one more case in auth_token and remote formsPiotr Sarnacki2012-03-281-16/+22
| | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it.
* Added config.action_view.embed_authenticity_token_in_remote_formsPiotr Sarnacki2012-03-281-6/+48
| | | | | | | | There is a regression introduced in 16ee611fa, which breaks remote forms that should also work without javascript. This commit introduces config option that allows to configure this behavior defaulting to the old behavior (ie. include authenticity token in remote forms by default)
* Merge pull request #5622 from rafaelfranca/fix-2492-3-2Jeremy Kemper2012-03-271-0/+35
|\ | | | | [3-2-stable] Fix label_tag to merge the options hash with the object hash
| * Check if the options hash already exists and merge it with the anotherRafael Mendonça França2012-03-271-6/+19
| | | | | | | | | | | | hash. Closes #2492 and #5614
| * Fixing issue #2492. ActionView::Base.field_error_proc doesn't call for label.Andrey Samsonov2012-03-271-0/+22
| | | | | | | | | | | | objectify_options method should be applied to the proper options arg. See explanation and example of the bug - https://github.com/kryzhovnik/rails_field_error_proc_bug_example
* | Merge pull request #5619 from jcoleman/textarea-newline-fix-breaks-hamlSantiago Pastorino2012-03-271-6/+6
|\ \ | |/ |/| Textarea newline fix breaks haml (3-2-stable)
| * Don't break Haml with textarea newline fix.James Coleman2012-03-271-6/+6
| | | | | | | | | | | | See issue #393, issue #4000, issue #5190, and issue #5191. Adds a newline after the textarea opening tag based on @codykrieger's original patch so that we don't cause regressions in Haml-using apps. The regression caused textarea tags to add newlines to the field unintentionally (each update/save added an extra newline.) Also fix 6 more tests that didn't yet have the newline expectation.
* | If partial is rendered in controller, grab format from templatePiotr Sarnacki2012-03-272-0/+14
|/ | | | | | | | | Previously `rendered_format` was set only based on mime types passed in Accept header, which was wrong if first type from Accept was different than rendered partial. The fix is to simply move setting rendered_format to the place where template is available and grab format from the template. If it fails we can fallback to formats passed by Accept header.
* apply form_for namespace option to date_selectSergey Nartimov2012-03-261-0/+8
|