aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
Commit message (Collapse)AuthorAgeFilesLines
* Move view_paths from AP to AVŁukasz Strzałkowski2013-08-251-174/+0
|
* Merge pull request #11443 from wangjohn/sse_reloader_classSantiago Pastorino2013-08-191-0/+88
|\ | | | | SSE class for ActionController::Live
| * Creating an SSE class to be used with ActionController::Live.wangjohn2013-07-301-0/+88
| |
* | Fail informatively in #respond_with when no appropriate #api_behavior ↵Ben Woosley2013-08-171-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | renderer is available. Currently if a user calls #respond_with(csvable), but has not csv renderer available, Responder will just run through the default render behavior twice, raising ActionView::MissingTemplate both times. This changes ActionController::Metal::Responder#api_behavior to check in advance whether there is a renderer available, and raise ActionController::MissingRenderer if not.
* | Split the 1200+ line mime_responds_test into 3 more focused and manageable ↵Ben Woosley2013-08-173-587/+587
| | | | | | | | test files.
* | Merge branch 'master' of github.com:rails/docrailsVijay Dev2013-08-173-6/+1
|\ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: actionview/README.rdoc activerecord/lib/active_record/migration.rb guides/source/development_dependencies_install.md guides/source/getting_started.md
| * | Revert "Merge branch 'master' of github.com:rails/docrails"Vijay Dev2013-08-173-6/+1
| |/ | | | | | | | | | | | | This reverts commit 70d6e16fbad75b89dd1798ed697e7732b8606fa3, reversing changes made to ea4db3bc078fb3093ecdddffdf4f2f4ff3e1e8f9. Seems to be a code merge done by mistake.
* | Execute conditional procs on controller filters only for current action.Nicholas Jakobsen2013-08-101-0/+9
| | | | | | | | | | | | :only and :except options for controller filters are now added before :if and :unless. This prevents running :if and :unless procs when not on the specified. Closes #11786.
* | Add timeout to test_async_streamGaurish Sharma2013-08-021-1/+1
|/ | | | | | | | | | Without timeout: this test executed infinitely on JRuby Passes on MRI With Timeout: this test gracefully fails on JRuby Passes on MRI, tested on v2.0 & v1.9.3
* Reset ActionView::Base.logger instead of AC::Base.loggerAkira Matsuda2013-07-261-1/+1
| | | | see: 9b0ac0bc74569db460f87ea6888b3847be0ff5be
* Fix order dependent testsAkira Matsuda2013-07-261-0/+4
| | | | Reset ActionView::Base.logger after tests
* Fix order dependent AP testAkira Matsuda2013-07-261-0/+1
| | | | | | | | | | | | | | | | | | | | | | any_instance.stubs + unstub with Mocha doesn't restore the original status in the following case, so we need to undef Customer#to_json before every test require 'test/unit' require 'mocha/setup' module M def foo() :foo; end end class C include M undef_method :foo end C.any_instance.stubs(:foo).returns(:mocha) C.any_instance.unstub(:foo)
* Skip Rack applications and redirects when generating urlsAndrew White2013-07-161-3/+3
| | | | | | | | | | When generating an unnamed url (i.e. using `url_for` with an options hash) we should skip anything other than standard Rails routes otherwise it will match the first mounted application or redirect and generate a url with query parameters rather than raising an error if the options hash doesn't match any defined routes. Fixes #8018
* Remove `page_cache_extension` deprecated methodFrancesco Rodriguez2013-07-011-15/+0
|
* Re-remove deprecated API.kennyj2013-06-281-7/+0
|
* Merge pull request #11000 from sbeckeriv/accept_headerCarlos Antonio da Silva2013-06-251-0/+6
|\ | | | | | | Fix undefined method `ref' for nil:NilClass for bad accept headers
| * Fix undefined method `ref' for nil:NilClass for bad accept headersStephen Becker IV2013-06-191-0/+6
| |
* | Remove unneeded filesPiotr Sarnacki2013-06-201-1/+0
|/
* Remove ActionController::RecordIdentifier was deprecated.kennyj2013-06-012-63/+3
|
* Revert "Integration tests support the OPTIONS http method"Rafael Mendonça França2013-05-161-17/+1
| | | | | | | | | | | | | | This reverts commit ad46884af567d6f8d6d8d777f372c39e81a560ba. Conflicts: actionpack/CHANGELOG.md actionpack/lib/action_dispatch/testing/integration.rb actionpack/test/controller/integration_test.rb Reason: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638.
* Revert "Add the options method to action_controller testcase."Rafael Mendonça França2013-05-161-5/+0
| | | | | | | | | | | | This reverts commit 0303c2325fab253adf5e4a0b738cb469c048f008. Conflicts: actionpack/lib/action_controller/test_case.rb REASON: It will conflict with a lot of test cases. Better to call `process` directly since this is a very uncommon HTTP method. Fixes #10638.
* Merge pull request #10591 from acapilleri/cond_callback_testAaron Patterson2013-05-151-0/+13
|\ | | | | add test for skip_before_filter with condition
| * add test for skip_before_filter with conditionAngelo capilleri2013-05-131-0/+13
| |
* | use public api for testing rather than grabbing instance variablesAaron Patterson2013-05-141-1/+1
|/
* Fix that JSON and XML exception responses should give the HTTP error message ↵Jeremy Kemper2013-05-081-2/+2
| | | | for their status, by default, not the message from the underlying exception
* Test that #fresh_when accepts an arrayBrandon Keepers2013-05-071-2/+19
| | | | https://github.com/rails/etagger/pull/3
* Add support for extra options to `force_ssl`Andrew White2013-04-251-14/+106
| | | | | | | | This commit adds support for passing additional url options along with a :status option and any of the flash-related options to `redirect_to` (i.e. :flash, :alert & :notice). Closes #7570.
* Use `request.fullpath` to build redirect url in `force_ssl`Andrew White2013-04-251-0/+63
| | | | | | | | | | | The `force_ssl` command now builds the redirect url from `request.fullpath`. This ensures that the format is maintained and it doesn't redirect to a route that has the same parameters but is defined earlier in `routes.rb`. Also any optional segments are maintained. Fixes #7528. Fixes #9061. Fixes #10305.
* Passing subdomain: '' to url_for removes the subdomain (instead of adding a ↵Derek Watson2013-04-181-0/+7
| | | | | | leading .) Adding a boolean route constraint checks for presence/absence of request property
* Merge pull request #9604 from sgrif/live_streaming_exceptionsRafael Mendonça França2013-04-081-1/+75
|\ | | | | Exceptions raised when using ActionController::Live cause server crash
| * Exception handling for controllers using ActionController::LiveSean Griffin2013-03-181-1/+75
| | | | | | | | | | | | | | | | | | Any exceptions that occured at the view or controller level for a controller using ActionController::Live would cause the server to either hang with an open socket indefinitely, or immediately crash (depending on whether the server was launched with rails s or directly). Changed the behavior of exceptions to act the same as streaming templates for html requests, and allow for an on_error callback if needed.
* | Remove comments about removing LegacyKeyGenerator in 4.1Trevor Turk2013-04-032-2/+0
| |
* | Rename DummyKeyGenerator -> LegacyKeyGeneratorTrevor Turk2013-04-022-4/+4
| |
* | fix request methods testVipul A M2013-03-311-6/+2
| |
* | Fix typos in AP: "overriden" => "overridden"Carlos Antonio da Silva2013-03-303-31/+31
| |
* | Refactored to remove unused variableAnupam Choudhury2013-03-281-1/+1
| |
* | Merge pull request #8458 from ↵Rafael Mendonça França2013-03-271-0/+24
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | lucisferre/improve-layout-override-fallback-behavior Provides standard layout lookup behavior for method and proc cases Conflicts: actionpack/CHANGELOG.md
| * | Provides standard layout lookup behavior for method and proc casesChris Nicola2013-03-271-0/+24
| | | | | | | | | | | | | | | | | | | | | When setting the layout either by referencing a method or supplying a Proc there is no way to fall back to the default lookup behavior if desired. This patch allows fallback to the layout lookup behavior when returning nil from the proc or method.
* | | Update tests for #9704, named route collisionsJeremy Kemper2013-03-241-5/+6
| | | | | | | | | | | | | | | * Fix named route collision in mount test fixture * Update controller named route precedence test
* | | Fix broken ActionController#action_missingJanko Luin2013-03-201-0/+12
| | | | | | | | | | | | | | | A recent change introduced the assumption that all controller actions are known beforehand, which is not true when using action_missing.
* | | Digest auth should not 500 when given a basic header.Brad Dunbar2013-03-181-0/+8
| |/ |/|
* | Merge pull request #9753 from jbarreneche/bug/render-locale-fallbacksCarlos Antonio da Silva2013-03-181-0/+9
|\ \ | | | | | | i18n locale fallback for localized views
| * | Include I18n fallbacks in :locale lookup contextJuan Barreneche2013-03-161-0/+9
| | |
* | | remove ancient TODOs [ci skip].Yves Senn2013-03-181-2/+0
| | |
* | | Fix rake test warnings in actionpackMack Earnhardt2013-03-171-1/+1
|/ /
* | `Http::Headers` directly modifies the passed environment.Yves Senn2013-03-151-0/+22
| | | | | | | | | | | | | | | | | | The env hash passed to `Http::Headers#new` must be in env format. Also be aware that the passed hash is modified directly. docs and test-cases for setting headers/env in functional tests. Follow up to #9700.
* | Handle conditional get in live requests - this will prevent error when using ↵Bernard Potocki2013-03-141-0/+15
| | | | | | | | stale on live streams(issue #9636)
* | allow headers and env to be passed in `IntegrationTest`.Yves Senn2013-03-131-0/+15
| | | | | | | | Closes #6513.
* | Fix warningsCarlos Antonio da Silva2013-03-071-2/+2
| |
* | Allow use of assert_template with the :file option.Justin Coyne2013-03-011-0/+35
| | | | | | | | This worked in Rails 3.2, but was a regression in 4.0.0.beta1