aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #6077 from ↵José Valim2012-04-302-37/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | dmitriy-kiriyenko/improve_signature_of_time_in_words_helper Replace boolean argument with an options hash.
| * | | | Replace boolean argument with an options hash.Dmitriy Kiriyenko2012-04-302-37/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This replaces `include_seconds` argument with an option key `include_seconds => true` in options hash. Also `time_ago_in_words` now passes options hash, including a `locale` key, which makes in compatible with `distance_of_time_in_words`.
* | | | | Merge pull request #6078 from lest/patch-4José Valim2012-04-301-0/+11
|\ \ \ \ \ | | | | | | | | | | | | allow send_file/send_data to skip disposition header, closes #2973
| * | | | | allow send_file/send_data to skip disposition header, closes #2973Sergey Nartimov2012-04-301-0/+11
| |/ / / /
* / / / / wrap translate defaults to use translate helper features, closes #1102Sergey Nartimov2012-04-302-1/+25
|/ / / /
* | | | Remove `button_to_function` and `link_to_function` helpersRafael Mendonça França2012-04-301-30/+0
| | | |
* | | | Merge pull request #6074 from mark-rushakoff/unused-variablesJeremy Kemper2012-04-291-1/+1
|\ \ \ \ | | | | | | | | | | Remove some unused variable assignments
| * | | | Remove unused assignment in actionpack date helper testMark Rushakoff2012-04-291-1/+1
| | | | |
* | | | | Restore interpolation of path option in redirect routesAndrew White2012-04-291-1/+32
| | | | |
* | | | | Escape interpolated params when redirecting - fixes #5688Andrew White2012-04-291-0/+29
| | | | |
* | | | | Add failing test case for #6053Andrew White2012-04-291-0/+21
| | | | |
* | | | | Merge pull request #6059 from rafaelfranca/check_box_invertedJosé Valim2012-04-291-2/+98
|\ \ \ \ \ | | | | | | | | | | | | Change check_box to work inverting the checked and unchecked value
| * | | | | Change check_box to work inverting the checked and unchecked valueRafael Mendonça França2012-04-291-2/+98
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes: * Boolean with inverted logic * Integer with inverted logic * BigDecimal with inverted logic Fixes #3995
* | | | | Allow access to current object_counter variable from layout when rendering ↵Carlos Antonio da Silva2012-04-292-4/+12
| | | | | | | | | | | | | | | | | | | | with partial + collection
* | | | | Allow layout to access current object being rendered when using render ↵Carlos Antonio da Silva2012-04-291-0/+4
| | | | | | | | | | | | | | | | | | | | partial + object
* | | | | Allow layout rendering to access current object being rendered when using ↵Carlos Antonio da Silva2012-04-292-2/+7
|/ / / / | | | | | | | | | | | | partial + collection
* | / / Add changelog entry for jsonp mimetype change, fix failing testCarlos Antonio da Silva2012-04-291-1/+1
| |/ / |/| | | | | | | | Fix failing test: Mime::JS generates "text/javascript"
* | | Don't convert params if the request isn't HTML - fixes #5341Andrew White2012-04-291-2/+40
| | |
* | | Merge pull request #2321 from omjokine/masterJosé Valim2012-04-291-1/+1
|\ \ \ | | | | | | | | JSONP should use mimetype application/javascript
| * \ \ Merge remote-tracking branch 'upstream/master'Olli Jokinen2011-12-0174-429/+1708
| |\ \ \
| * | | | fixed test case test_render_json_with_callback to use content_type ↵Olli Jokinen2011-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | application/javascript
* | | | | Lazy load `default_form_builder` if it's passed as a stringPiotr Sarnacki2012-04-281-0/+17
| | | | | | | | | | | | | | | | | | | | closes #3341
* | | | | Merge session arg with existing session instead of overwritingAndrew White2012-04-281-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may break existing tests that are asserting the whole session contents but should not break existing tests that are asserting individual keys - e.g: class SomeControllerTest < ActionController::TestCase setup do session['user_id'] = 1 end test "some test" do get :some_action, nil, { 'another_var' => 2 } # This assertion will now fail assert_equal({ 'another_var' => 2 }, session) # This assertion will still pass assert_equal 2, session['another_var] end end Fixes #1529.
* | | | | remove calls to deprecated find(:first) in actionpack test suiteSergey Nartimov2012-04-261-2/+2
| | | | |
* | | | | Fix the buildYehuda Katz2012-04-251-1/+2
| | | | |
* | | | | Merge pull request #5980 from gazay/valid_ipsJeremy Kemper2012-04-251-20/+114
|\ \ \ \ \ | | | | | | | | | | | | Remote ip logic and validation. IPv6 support.
| * | | | | Valid ips v4 and v6. Right logic for working with X-FORWARDED-FOR header and ↵Alexey Gaziev2012-04-251-20/+114
| | | | | | | | | | | | | | | | | | | | | | | | tests.
* | | | | | Remove default match without specified methodJose and Yehuda2012-04-2439-341/+341
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the current router DSL, using the +match+ DSL method will match all verbs for the path to the specified endpoint. In the vast majority of cases, people are currently using +match+ when they actually mean +get+. This introduces security implications. This commit disallows calling +match+ without an HTTP verb constraint by default. To explicitly match all verbs, this commit also adds a :via => :all option to +match+. Closes #5964
* | | | | | Use leap years trick in distance_of_time_in_words only for distances between ↵Alexey Vakhov2012-04-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | real date points
* | | | | | fixed non matching documentation behaviour with method semantics on ↵Marcelo Casiraghi2012-04-241-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | distance_of_time_in_words
* | | | | | Distance of time in words should work correct if from time > to_timeAlexey Vakhov2012-04-241-0/+1
|/ / / / /
* | | | | Merge pull request #5865 from tiegz/minor_fixesAaron Patterson2012-04-201-34/+21
|\ \ \ \ \ | | | | | | | | | | | | Catch nil.to_sym errors in partial_renderer, and raise ArgumentError instead
| * | | | | converting some tests to assert_raises, and DRY'ing retrieve_variable changesTieg Zaharia2012-04-161-39/+17
| | | | | |
| * | | | | catch nil.to_sym errors in partial_renderer, and raise ArgumentError insteadTieg Zaharia2012-04-161-0/+9
| | | | | |
* | | | | | Remove unused test code.Rafael Mendonça França2012-04-161-5/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | ActionController::RoutingError are raised in router execution time and can not be rescued in a controller.
* | | | | Merge pull request #5746 from jmbejar/index_method_form_builderSantiago Pastorino2012-04-111-0/+50
|\ \ \ \ \ | | | | | | | | | | | | Add method FormBuilder#index
| * | | | | Add index method to FormBuilder. Useful when you use field_for and need to ↵Jorge Bejar2012-04-111-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | know the index number into the iteration.
* | | | | | Adding itemscope to list of boolean attributes.Frankie Roberto2012-04-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'itemscope' is defined within HTML5 for use in microdata markup. See http://www.whatwg.org/specs/web-apps/current-work/multipage/microdata.ht ml#attr-itemscope
* | | | | | Merge pull request #5783 from rafaelfranca/default_url_optionsSantiago Pastorino2012-04-082-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Document that default_url_options must return a hash with symbolized keys
| * | | | | | default_url_options does not receive one argument anymoreRafael Mendonça França2012-04-082-2/+2
| | | | | | |
* | | | | | | Revert "Merge pull request #5750 from ahoward/master"Santiago Pastorino2012-04-081-18/+0
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 174cf8b22064c3999dfa685014d5b31ac993bb54, reversing changes made to 7ecd6a731bd60665bc6de94095137f0b2c4ada2a. The reverted commit improved the performance in the wrong place, now we have added this 6ddbd1844a6fd6aca2992f5f75c9f605cf89808f improvement.
* | | | | | Merge pull request #5748 from ai/no_type_in_html5Jeremy Kemper2012-04-085-104/+104
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove unnecessary in HTML 5 type attribute with default value
| * | | | | | Remove unnecessary in HTML 5 type attribute with default valueAndrey A.I. Sitnik2012-04-055-104/+104
| | | | | | |
* | | | | | | Make url_for work when option is nil and default_url_options hasRafael Mendonça França2012-04-051-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | stringified keys
* | | | | | | Merge pull request #5750 from ahoward/masterAaron Patterson2012-04-051-0/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | mo fasta and mo betta the url_for
| * | | | | | carefully and quickly merge url_for optionsara.t.howard2012-04-041-0/+9
| |/ / / / /
* | | | | | Merge pull request #4446 from ayamomiji/patch-1José Valim2012-04-051-0/+7
|\ \ \ \ \ \ | |/ / / / / |/| | | | | prevent the cache sweeper ignores NoMethodError
| * | | | | prevent the cache sweeper ignores NoMethodErrorayaya2012-03-291-0/+7
| | | | | |
* | | | | | add type option to atom feed entry builderSergey Nartimov2012-04-011-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | closes #5672
* | | | | | Merge pull request #5691 from avakhov/form-label-blockJosé Valim2012-04-011-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | Block version of label should wrapped in field_with_errors in case of error