aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | 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-175-20/+13
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | 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-175-20/+13
| | | | | | | | | | | | | | | | | | | | | 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-103-1/+17
| | | | | | | | | | | | | | | | | | :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.
* | | Added data for permit array into scalar valueRahul P. Chaudhari2013-08-051-0/+1
| | |
* | | Pass assert_dom_equal message arg to underlying assertionRyan McGeary2013-08-042-4/+11
| | | | | | | | | | | | | | | #assert_dom_equal and #assert_dom_not_equal both take a "failure" message argument, but this argument was not utilized.
* | | Merge pull request #11721 from gaurish/join-timeoutGuillermo Iguaran2013-08-021-1/+1
|\ \ \ | | | | | | | | Add timeout to test_async_stream
| * | | 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
* | | | fix a gramatical mistakeRajeev N Bharshetty2013-08-021-1/+1
| | | |
* | | | Moved README into action_view [ci skip]Arun Agrawal2013-07-311-5/+0
|/ / /
* | / Improve documentation for controller how to get included helpers [ci skip]Paul Nikitochkin2013-07-301-1/+1
| |/ |/| | | | | Closes #11671
* | grab executable from rubygemsArun Agrawal2013-07-261-2/+1
|/ | | As done here d7fc97d3f90c0e30865d32ce202658f03248cacc
* Refactor handling of action normalizationMax Shytikov2013-07-261-11/+13
| | | | | | Reference: Bloody mess internals http://gusiev.com/slides/rails_contribution/static/#40
* 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)
* Typo fixAnkit Gupta2013-07-251-1/+1
| | | | | [skip ci] Fixing the typo which is formed a not required link. Check here http://api.rubyonrails.org/classes/ActionController/Base.html under paramters section keeping it under tt tag
* Allow overriding of all headers from passed environment hashAndrew White2013-07-253-5/+42
| | | | | | | Allow REMOTE_ADDR, HTTP_HOST and HTTP_USER_AGENT to be overridden from the environment passed into `ActionDispatch::TestRequest.new`. Fixes #11590
* Removed random dot in code sample [ci skip]Max Vasiliev2013-07-221-1/+1
|
* Clear named routes when routes.rb is reloadedAndrew White2013-07-212-0/+9
| | | | | | | | Fix an issue where Journey was failing to clear the named routes hash when the routes were reloaded and since it doesn't overwrite existing routes then if a route changed but wasn't renamed it kept the old definition. This was being masked by the optimised url helpers so it only became apparent when passing an options hash to the url helper.
* Refactor to reduce number of loopsAndrew White2013-07-171-15/+25
| | | | | | Only build the missing_keys array once we have detected that there actually are missing keys by moving the check to be part of the block that performs the path substitution.
* Fix failing test missed for the past year :(Andrew White2013-07-172-3/+18
| | | | | | | | | When optimized path helpers were re-introduced in d7014bc the test added in a328f2f broke but no-one noticed because it wasn't being run by the test suite. Fix the test by checking for nil values or empty strings after the args have been parameterized.
* Added routing in test for actionpackArun Agrawal2013-07-171-2/+4
|
* Skip Rack applications and redirects when generating urlsAndrew White2013-07-166-13/+93
| | | | | | | | | | 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
* Removed unused file! Moved to actionviewArun Agrawal2013-07-131-91/+0
| | | | Removed unused file as this has been moved to actionview
* add test-case to verify `error.path` when a helper was not found.Yves Senn2013-07-121-0/+5
| | | | | This verifies the code added with: https://github.com/rails/rails/commit/99c9d18601539c7e7e87f26bb047add1f93072af
* move `MissingHelperError` out of the `ClassMethods` module.Yves Senn2013-07-123-16/+23
|
* Add documentation for add_flash_types [ci skip]Robin Dupret2013-07-101-0/+17
| | | | | Document a little bit the ActionController::Flash::add_flash_types class method.
* Remove accidentally committed vi .swp file.Marc Schütz2013-07-101-0/+0
|
* Show real LoadError on helpers requirePiotr Niełacny2013-07-105-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When helper try to require missing file rails will throw exception about missing helper. # app/helpers/my_helper.rb require 'missing' module MyHelper end And when we try do load helper class ApplicationController helper :my end Rails will throw exception. This is wrong because there is a helper file. Missing helper file helpers/my_helper.rb Now when helper try to require non-existed file rails will throw proper exception. No such file to load -- missing
* Merge pull request #11351 from jetthoughts/cleanup_requestRafael Mendonça França2013-07-091-1/+1
|\ | | | | Use content_length method instead of ENV['CONTENT_LENGTH'].to_i
| * Use helper method to get ENV['CONTENT_LENGTH']Paul Nikitochkin2013-07-081-1/+1
| |
* | Use Request#raw_post instead Request#bodyPaul Nikitochkin2013-07-083-1/+15
|/ | | | | | | | In order to get raw_post to be not empty after ParamsParser#parse_formatted_parameters, added rewinding of body stream input on parsing json params. Closes #11345
* Merge pull request #11313 from gsamokovarov/url-encoded-params-testRafael Mendonça França2013-07-061-25/+27
|\ | | | | Cleanup ul_encoded_params_parsing_test
| * Cleanup ul_encoded_params_parsing_testGenadi Samokovarov2013-07-051-25/+27
| |
* | Running isolated test for assertions and journeyArun Agrawal2013-07-061-1/+1
| | | | | | | | in actionpack
* | actionpack not having activerecord tests [ci skip]Arun Agrawal2013-07-061-10/+0
| |
* | Space is not required for Set-Cookie headerYamagishi Kazutoshi2013-07-053-1/+34
|/
* remove useless `env.merge!(env)` from ActionDispatch::IntegrationTest`Yves Senn2013-07-041-2/+0
|
* Missing closing + in documentation [ci skip]Edho Arief2013-07-041-1/+1
|
* Remove deprecated Rails application fallback for integration testingCarlos Antonio da Silva2013-07-022-4/+5
| | | | Set ActionDispatch.test_app instead.
* Remove deprecated constants autoloadCarlos Antonio da Silva2013-07-021-3/+0
| | | | | These constants were removed in 4b97ce5eb16cc20207516387fba98bf577e2e281, but I forgot to remove the autoload calls :sparkles:.
* use extract_options!Neeraj Singh2013-07-021-1/+1
|
* Remove `page_cache_extension` deprecated methodFrancesco Rodriguez2013-07-013-25/+4
|
* Remove deprecated constants from Action ControllerCarlos Antonio da Silva2013-07-013-12/+12
| | | | | | | | | | ActionController::AbstractRequest => ActionDispatch::Request ActionController::Request => ActionDispatch::Request ActionController::AbstractResponse => ActionDispatch::Response ActionController::Response => ActionDispatch::Response ActionController::Routing => ActionDispatch::Routing ActionController::Integration => ActionDispatch::Integration ActionController::IntegrationTest => ActionDispatch::IntegrationTest
* store a symbol directly inside DISPATCH_CACHE for extra roflscaleCharlie Somerville2013-06-301-1/+1
|
* use bytesize rather than force encodingAaron Patterson2013-06-281-2/+1
|
* writing the new body can cause the response to be committed and theAaron Patterson2013-06-281-1/+3
| | | | | | | | request thread to return up the stack before the instance variable is assigned. Synchronize so that the ivar is assigned before the other thread can activate. fixes #10984
* Re-remove deprecated API.kennyj2013-06-282-19/+0
|
* Minor changes to actionpack/actionview RakefileArun Agrawal2013-06-261-5/+1
|