aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/controller
Commit message (Collapse)AuthorAgeFilesLines
* Fix incorrect assert_redirected_to failure messageDerek Prior2013-09-191-0/+18
| | | | | | | | | | | | | | | In some instances, `assert_redirected_to` assertion was returning an incorrect and misleading failure message when the assertion failed. This was due to a disconnect in how the assertion computes the redirect string for the failure message and how `redirect_to` computes the string that is actually used for redirection. I made the `_compute_redirect_to_loaction` method used by `redirect_to` public and call that from the method `assert_redirect_to` uses to calculate the URL. The reveals a new test failure due to the regex used by `_compute_redirect_to_location` allow `_` in the URL scheme.
* NullSessionHash#destroy should be a no-opJonathan Baudanza2013-09-181-0/+10
| | | | Previously it was raising a NilException
* Fix an issue where router can't recognize downcased url encoding path.kennyj2013-09-191-0/+4
|
* Custom flash should be defined only for the class that defines it and it's ↵Ricardo de Cillo2013-09-131-0/+12
| | | | subclasses.
* Merge pull request #12159 from nashby/issue-12149Rafael Mendonça França2013-09-121-0/+9
|\ | | | | do not break params filtering on nil values
| * do not break params filtering on nil valuesVasiliy Ermolovich2013-09-071-0/+9
| | | | | | | | closes #12149
* | Removed semicolon and added spaceAnupam Choudhury2013-09-131-2/+2
| |
* | Reset ActionView::Base.logger instead of AC::Base.loggerAkira Matsuda2013-09-101-1/+1
| | | | | | | | see: 9b0ac0bc74569db460f87ea6888b3847be0ff5be
* | Make AC standalone rendering workSantiago Pastorino2013-09-101-0/+15
|/
* Revert "Port all remaining self.protected_instance_variables to class methods"Łukasz Strzałkowski2013-09-021-1/+1
| | | | This reverts commit 7de994fa215e9f4c2856d85034bc4dd7b65d0c01.
* Port all remaining self.protected_instance_variables to class methodsŁukasz Strzałkowski2013-08-291-1/+1
|
* Extend basic rendering, test it in railtiesŁukasz Strzałkowski2013-08-251-19/+0
|
* Basic rendering testŁukasz Strzałkowski2013-08-251-0/+19
|
* Move AP's capture tests to AVŁukasz Strzałkowski2013-08-251-79/+0
|
* Move remaining layouts tests to AVŁukasz Strzałkowski2013-08-251-262/+0
|
* Move render_test to AVŁukasz Strzałkowski2013-08-251-1298/+106
|
* Load AV::Layout to AM::Base in railtiesŁukasz Strzałkowski2013-08-251-0/+3
|
* Create AbstractController::Rendering interfaceŁukasz Strzałkowski2013-08-252-0/+3
| | | | This interface should be use when implementing renderers.
* 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
| |