aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
Commit message (Collapse)AuthorAgeFilesLines
* 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-0124-181/+600
| |\
| * | fixed test case test_render_json_with_callback to use content_type ↵Olli Jokinen2011-07-281-1/+1
| | | | | | | | | | | | application/javascript
* | | 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 default match without specified methodJose and Yehuda2012-04-2421-240/+240
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | 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 #5783 from rafaelfranca/default_url_optionsSantiago Pastorino2012-04-081-1/+1
|\ \ \ | | | | | | | | 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-081-1/+1
| | | |
* | | | 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-081-2/+2
|\ \ \ | | | | | | | | Remove unnecessary in HTML 5 type attribute with default value
| * | | Remove unnecessary in HTML 5 type attribute with default valueAndrey A.I. Sitnik2012-04-051-2/+2
| | | |
* | | | 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
| | | |
* | | | Tests :if option of force_ssl methodAlexey Vakhov2012-04-011-0/+23
| | | |
* | | | 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-0/+7
| | | | | | | | | | | | | | | If embedding auth_token in remote forms is off and we pass a value for auth_token it should respect it.
* | | config.action_view.embed_authenticity_token_in_remote_forms is true by defaultPiotr Sarnacki2012-03-281-19/+14
| | | | | | | | | | | | | | | | | | | | | Changed default value for `config.action_view.embed_authenticity_token_in_remote_forms` to `false`. This change breaks remote forms that need to work also without javascript, so if you need such behavior, you can either set it to `true` or explicitly pass `:authenticity_token => true` in form options
* | | Added config.action_view.embed_authenticity_token_in_remote_formsPiotr Sarnacki2012-03-281-2/+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) Conflicts: actionpack/CHANGELOG.md
* | | Add test for default_url_options[:port]Aaron Suggs2012-03-281-0/+12
| | |
* | | If partial is rendered in controller, grab format from templatePiotr Sarnacki2012-03-271-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge pull request #5480 from drogus/rendering-issuesJosé Valim2012-03-171-0/+39
| | | | | | | | | | | | Fix for #5440
* | | Should use an argument in http_digest_authentication_test.rbkennyj2012-03-171-1/+1
| | |
* | | fixed - warning: ambiguous first argument; put parentheses or even spacesSandeep2012-03-161-1/+1
| | |
* | | fix typo in redirect testBrian Lopez2012-03-151-1/+1
| | |
* | | strip null bytes from Location header as wellBrian Lopez2012-03-151-0/+20
| | | | | | | | | | | | add tests for stripping \r\n chars since that's already happening
* | | Remove ActionController::TestCase#rescue_action_in_public!Piotr Sarnacki2012-03-151-5/+0
| | | | | | | | | | | | | | | | | | This method has no effect since exception handling was moved to middlewares and ActionController tests do not use any middlewares.
* | | Allow you to force the authenticity_token to be rendered even on remote ↵David Heinemeier Hansson2012-03-141-0/+11
| | | | | | | | | | | | forms if you pass true
* | | Do not include the authenticity token in forms where remote: true as ajax ↵David Heinemeier Hansson2012-03-141-0/+13
| | | | | | | | | | | | forms use the meta-tag value
* | | Remove --http.José Valim2012-03-147-197/+0
| | |
* | | Merge pull request #5357 from bagilevi/sweeper-undefined-method-ignoredPiotr Sarnacki2012-03-141-0/+16
|\ \ \ | | | | | | | | Don't ignore call to undefined method in Sweeper
| * | | Don't ignore call to undefined method in SweeperLevente Bagi2012-03-061-0/+16
| | | |
* | | | Add ActionController::HTTPSantiago Pastorino2012-03-147-0/+197
| | | | | | | | | | | | | | | | | | | | | | | | More info http://edgeguides.rubyonrails.org/api_app.html [Carlos Antonio da Silva & Santiago Pastorino]
* | | | Remove unused methodSantiago Pastorino2012-03-121-4/+0
| | | |
* | | | Merge pull request #5326 from lest/patch-2Michael Koziarski2012-03-101-2/+2
|\ \ \ \ | | | | | | | | | | configure how unverified request will be handled
| * | | | configure how unverified request will be handledSergey Nartimov2012-03-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | can be configured using `:with` option in `protect_from_forgery` method or `request_forgery_protection_method` config option possible values: - :reset_session (default) - :exception new applications are generated with: protect_from_forgery :with => :exception
* | | | | @controller already includes url_helpers in with_routing methodSantiago Pastorino2012-03-101-1/+0
|/ / / /
* / / / Add test case for #5307Carlos Antonio da Silva2012-03-071-2/+6
|/ / /
* | | Failing test for mime responder respond_with using a block.Mario Visic2012-03-051-0/+36
| | |
* | | force response body to be read in assert_templateSergey Nartimov2012-03-051-0/+13
| | |
* | | Route root helper shortcutBrian Cardarella2012-03-031-0/+9
| | | | | | | | | | | | Allow the root route helper to accept just a string
* | | Merge pull request #5242 from rails/opt_routesJosé Valim2012-03-022-7/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Optimize routes generation in simple cases. If you pass to the route helper the same amount of arguments as the required segments, route generation will be optimized as a string interpolation. After this commit, `post_path(post)` is about 6.5 times faster, `post_url(post)` is about 5 times.
| * | | Optimize url helpers.Sergey Nartimov + José Valim2012-03-022-7/+7
| | | |
* | | | Fix #5238, rendered_format is not set when template is not renderedPiotr Sarnacki2012-03-021-2/+6
|/ / /
* | | Adding tests for non-optional glob parametersAndrew White2012-02-261-2/+27
| | |