aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
Commit message (Collapse)AuthorAgeFilesLines
* Fix explicit names on multiple file fieldsRyan McGeary2013-04-051-0/+10
| | | | | | | | If a file field tag is passed the multiple option, it is turned into an array field (appending "[]"), but if the file field is passed an explicit name as an option, leave the name alone (do not append "[]"). Fixes #9830
* Fix indent and remove extra white spacesCarlos Antonio da Silva2013-04-051-15/+17
|
* Ensure mail_to helper does not modify the given html options hashCarlos Antonio da Silva2013-04-041-1/+7
|
* Merge pull request #10065 from spohlenz/mail_to_blockCarlos Antonio da Silva2013-04-041-0/+10
|\ | | | | Add block support for the mail_to helper
| * Add block support for the helperSam Pohlenz2013-04-031-0/+10
| |
* | Fix typo in view nameCarlos Antonio da Silva2013-04-032-1/+1
| | | | | | | | Introduced in 2c22376fe04b89e8f34620139720b85a85ce3428
* | Merge pull request #10074 from ↵Rafael Mendonça França2013-04-034-4/+0
|\ \ | | | | | | | | | | | | trevorturk/remove-fixme-comments-about-legacy-key-generator Remove comments about removing LegacyKeyGenerator in 4.1
| * | Remove comments about removing LegacyKeyGenerator in 4.1Trevor Turk2013-04-034-4/+0
| | |
* | | Merge pull request #9932 from senny/9913_routing_problemAndrew White2013-04-031-0/+29
|\ \ \ | | | | | | | | routing bugfixes when matching multiple paths
| * | | routing shorthand syntax works with multiple pathsYves Senn2013-03-261-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | Closes #9913. We need to expand the match shorthand syntax for every path.
| * | | bugfix, when matching multiple paths with `get`, `post`, ...Yves Senn2013-03-261-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | This problem was introduced with: https://github.com/rails/rails/commit/d03aa104e069be4e301efa8cefb90a2a785a7bff
* | | | fix regression in Mapper when `format:` was used in a `scope`.Yves Senn2013-04-031-0/+22
| |_|/ |/| | | | | | | | | | | | | | | | | Closes #10071 `#normalize_path!` depends on the options so we need to call `#normalize_options!` first to make sure everything is set correctly.
* | | Getting rid of a few other vestiges of rails.png.Steve Klabnik2013-04-021-0/+0
| |/ |/| | | | | | | | | | | | | | | | | We don't actually need a rails.png in the AP fixtures, the tests that use it don't actually try to load the file. We also don't need to get rid of it with the dummy reset either. Finally, it's not needed in the sample application that's included with the Rails Guides.
* | Merge pull request #10061 from trevorturk/dummy-key-generator-renameSantiago Pastorino2013-04-024-12/+12
|\ \ | | | | | | Rename DummyKeyGenerator -> LegacyKeyGenerator
| * | Rename DummyKeyGenerator -> LegacyKeyGeneratorTrevor Turk2013-04-024-12/+12
| | |
* | | Fix permanent cookie jar accessor typoTrevor Turk2013-04-021-1/+6
|/ /
* | each_with_index => each as we dont use indexVipul A M2013-04-031-1/+1
| |
* | Fixed typo on AP dispatch Mime::Type testKalabiYau2013-04-011-1/+1
| |
* | Merge pull request #9978 from trevorturk/cookie-store-auto-upgradeSantiago Pastorino2013-04-011-2/+73
|\ \ | | | | | | Cookie-base session store auto-upgrade
| * | Allow transparent upgrading of legacy signed cookies to encrypted cookies; ↵Trevor Turk2013-03-281-2/+73
| | | | | | | | | | | | Automatically configure cookie-based sessions to use the best cookie jar given the app's config
* | | Merge pull request #9680 from bdmac/time-zone-options-revert-grep-to-selectCarlos Antonio da Silva2013-03-311-3/+22
|\ \ \ | | | | | | | | Revert grep to select since they are not the same
| * | | Add regression test for TZ grepBrian McManus2013-03-271-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | Added a regression test that will fail if anyone tries to change time_zone_select to use grep again thinking it will work when it does not.
| * | | Revert grep to select since they are not the sameBrian McManus2013-03-271-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A previous commit swapped out a call to select for a call to grep in time_zone_options_for_select. This behavior actually causes the regexp priority option to stop working. ActiveSupport::TimeZone overrides the =~ operator which is what the select block was using previously. Enumerable#grep checks pattern === element and in this case that would be /US/ === ActiveSupport::TimeZone which does not work because ActiveSupport::TimeZone does not supply an implicit converting to_str method, only an explicit to_s method. It would be impossible to provide a to_str method that behaves identically to the =~ method provided on ActiveSupport::TimeZone so the only option is to revert back to using select with =~.
* | | | Merge pull request #10013 from vipulnsward/fix_request_method_testSantiago Pastorino2013-03-311-6/+2
|\ \ \ \ | | | | | | | | | | fix request methods test
| * | | | fix request methods testVipul A M2013-03-311-6/+2
| | | | |
* | | | | remove unused variable and assignmentVipul A M2013-03-311-1/+1
|/ / / /
* | / / Fix typos in AP: "overriden" => "overridden"Carlos Antonio da Silva2013-03-304-35/+35
| |/ / |/| |
* | | Refactored to remove unused variableAnupam Choudhury2013-03-282-3/+3
|/ /
* | Merge pull request #8458 from ↵Rafael Mendonça França2013-03-272-0/+38
|\ \ | |/ |/| | | | | | | | | | | | | 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-272-0/+38
| | | | | | | | | | | | | | 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.
* | Skipping test for OpenSSL::PKCS5 JRubyArun Agrawal2013-03-251-0/+10
| |
* | Update tests for #9704, named route collisionsJeremy Kemper2013-03-242-6/+7
| | | | | | | | | | * Fix named route collision in mount test fixture * Update controller named route precedence test
* | Introduce UpgradeLegacySignedCookieJar to transparently upgrade existing ↵Trevor Turk2013-03-241-0/+55
| | | | | | | | signed cookies generated by Rails 3 to avoid invalidating them when upgrading to Rails 4
* | Merge pull request #9704 from trevorturk/warn-about-skipped-routesJeremy Kemper2013-03-241-19/+18
|\ \ | | | | | | Raise an ArgumentError when a clashing named route is defined
| * | Raise an ArgumentError when a clashing named route is definedTrevor Turk2013-03-191-19/+18
| | |
* | | Changed 'args' to 'arguments' in test descriptionPrathamesh Sonpatki2013-03-242-2/+2
| | |
* | | Merge pull request #9802 from newsline/fix-broken-action-missingRafael Mendonça França2013-03-201-0/+12
|\ \ \ | |/ / |/| | | | | | | | | | | | | | Fix missing action_missing Conflicts: actionpack/CHANGELOG.md
| * | 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.
* | | Fix improperly configured host in generated urlsschneems2013-03-191-0/+8
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the host in `default_url_options` is accidentally set with a protocol such as ``` host: "http://example.com" ``` then the generated url will have the protocol twice `http://http://example.com` which is not what the user intended. Likely they wanted to define a host `host: "example.com"` and a `protocol: "http://"` but did not know the convention. This may not the most common problem, but when it happens it can go undetected for a while. I accidentally added `http://` out of habit recently only to find all the links in my emails were broken after deploying a demo site to production. Rather than allow this accident go undetected, we can fix the problem in line by properly setting the protocol and host. I was able to find this related question on stack overflow: http://stackoverflow.com/questions/5878329/rails-3-devise-how-do-i-make-the-email-confirmation-links-use-secure-https-n where the answer was highly upvoted. This is based off of work in #7415 cc/ @pixeltrix ATP Action Mailer and Action Pack
* | Digest auth should not 500 when given a basic header.Brad Dunbar2013-03-181-0/+8
| |
* | Merge branch 'master-sec'Aaron Patterson2013-03-181-0/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | * master-sec: fix protocol checking in sanitization [CVE-2013-1857] JDOM XXE Protection [CVE-2013-1856] fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855] stop calling to_sym when building arel nodes [CVE-2013-1854]
| * | fix protocol checking in sanitization [CVE-2013-1857]Aaron Patterson2013-03-151-0/+10
| | |
| * | fix incorrect ^$ usage leading to XSS in sanitize_css [CVE-2013-1855]Charlie Somerville2013-03-151-0/+5
| | |
* | | 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-182-3/+0
| | | |
* | | | Merge pull request #9754 from macksmind/fix_actionpack_warningsRafael Mendonça França2013-03-171-1/+1
|\ \ \ \ | | | | | | | | | | Fix rake test warnings in actionpack
| * | | | Fix rake test warnings in actionpackMack Earnhardt2013-03-171-1/+1
| |/ / /
* / / / Allow pass multipart option to form_forGrzegorz Derebecki2013-03-171-2/+2
|/ / /
* | | Merge pull request #5606 from teohm/multipart_unicode_param_nameSteve Klabnik2013-03-153-1/+30
|\ \ \ | | | | | | | | multipart POST - utf8 param name not encoded