aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #18022 from agrobbin/url-helpers-optional-scopesSantiago Pastorino2014-12-131-0/+12
|\ | | | | Allow URL helpers to work with optional scopes
| * allow URL helpers to work with optional scopesAlex Robbin2014-12-131-0/+12
| |
* | ParameterFilter shouldn't try to dup symbol keysNate Berkopec2014-12-131-2/+2
|/
* Fix handling of positional url helper arguments when format is falseTatiana Soukiassian2014-12-131-0/+28
| | | | | | | There is no need to subtract one from the path_params size when there is no format parameter because it is not present in the path_params array. Fixes #17819.
* Add AC::Parameters#to_unsafe_hPrem Sichanugrist2014-12-121-0/+6
| | | | | | | | | As suggested in #16299([1]), this method should be a new public API for retrieving unfiltered parameters from `ActionController::Parameters` object, given that `Parameters#to_hash` will no longer work in Rails 5.0+ as we stop inheriting `Parameters` from `Hash`. [1]: https://github.com/rails/rails/pull/16299#issuecomment-50220919
* Mounted Rack apps should have default named routes based on app nameT.J. Schuck2014-12-061-11/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a regression in 4.2.0 from 4.1.8. https://github.com/rails/rails/pull/17823 fixed a similar regression regarding _explicitly_ named routes for a mounted Rack app, but there was another regression for the default value. With a route like: Rails.application.routes.draw do mount Mountable::Web, at: 'some_route' end The "Prefix" column of rake routes gives the following: - 4.1.8: mountable_web - 4.2.0.beta1-4: [nothing] - 4.2.0.rc1: [nothing] - 4.2.0.rc2: some_route <- regression This fixes the default to go back to being based off the name of the class like the docs specify: https://github.com/rails/rails/blob/785d04e3109f69d0b9b9f4732179592f0ef04e52/actionpack/lib/action_dispatch/routing/mapper.rb#L558-L560 Explicitly named routes still work correctly per https://github.com/rails/rails/pull/17823: Rails.application.routes.draw do mount Mountable::Web, at: 'some_route', as: 'named' end - 4.1.8: named - 4.2.0.beta1-4: [nothing] - 4.2.0.rc1: [nothing] - 4.2.0.rc2: named
* Typo: Hello = Guten Tag (in German)Tu Hoang2014-12-052-3/+3
|
* Merge pull request #17792 from rockrep/masterRafael Mendonça França2014-12-041-0/+10
|\ | | | | | | allow 'all' for :domain option in addition to :all
| * allow 'all' for :domain option in addition to :allrockrep2014-11-261-0/+10
| |
* | Remove "rescue" clause around "require 'openssl'"claudiob2014-12-031-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some `require 'openssl'` statements were surrounded by `rescue` blocks to deal with Ruby versions that did not support `OpenSSL::Digest::SHA1` or `OpenSSL::PKCS5`. [As @jeremy explains](https://github.com/rails/rails/commit/a6a0904fcb12b876469c48b1c885aadafe9188cf#commitcomment-8826666) in the original commit: > If jruby didn't have jruby-openssl gem, the require wouldn't work. Not sure whether either of these are still relevant today. According to the [release notes for JRuby 1.7.13](http://www.jruby.org/2014/06/24/jruby-1-7-13.html): > jruby-openssl 0.9.5 bundled which means the above `rescue` block is not needed anymore. All the Ruby versions supported by the current version of Rails provide those OpenSSL libraries, so Travis CI should also be happy by removing the `rescue` blocks. --- Just to confirm, with JRuby: $ ruby --version #=> jruby 1.7.16.1 (1.9.3p392) 2014-10-28 4e93f31 on Java HotSpot(TM) 64-Bit Server VM 1.8.0_20-b26 +jit [darwin-x86_64] $ irb irb(main):001:0> require 'openssl' #=> true irb(main):002:0> OpenSSL::Digest::SHA1 #=> OpenSSL::Digest::SHA1 irb(main):003:0> OpenSSL::PKCS5 # => OpenSSL::PKCS5 And with Ruby 2.1: $ ruby --version #=> ruby 2.1.2p95 (2014-05-08 revision 45877) [x86_64-darwin13.0] $ irb irb(main):001:0> require 'openssl' #=> true irb(main):002:0> OpenSSL::Digest::SHA1 #=> OpenSSL::Digest::SHA1 irb(main):003:0> OpenSSL::PKCS5 #=> OpenSSL::PKCS5
* | Fix "nonexistent" typo in testsMelissa Xie2014-12-021-2/+2
| |
* | Merge pull request #17873 from kirs/refactor-debug-erbRafael Mendonça França2014-12-021-0/+23
|\ \ | | | | | | Refactor debug view
| * | Refactor debug viewKir Shatrov2014-12-021-0/+23
| | | | | | | | | Avoid logic in ERB and use helpers
* | | Merge pull request #17862 from lucasmazza/lm-hide-actionRafael Mendonça França2014-12-021-1/+2
|/ / | | | | | | `_generate_paths_by_default` should always be private.
* | Merge pull request #17827 from rkh/rkh-fix-or-patternAaron Patterson2014-12-011-0/+2
|\ \ | | | | | | Fix OR in Journey patterns
| * | make OR in journey patterns compile to a valid regular expressionKonstantin Haase2014-11-291-0/+2
| | |
* | | Merge pull request #17823 from byroot/fix-mount-rack-apps-with-asSean Griffin2014-11-291-1/+1
|\ \ \ | | | | | | | | Pure rack apps can be mounted with a name
| * | | Pure rack apps can be mounted with a nameJean Boussier2014-11-291-1/+1
| |/ / | | | | | | | | | See https://github.com/rails/rails/commit/9b15828b5c347395b42066a588c88e5eb4e72279#commitcomment-8764492
* / / Pass symbol as an argument instead of a blockErik Michaels-Ober2014-11-294-8/+8
|/ /
* | Merge pull request #17186 from tgxworld/header_authentication_tokenMatthew Draper2014-11-271-2/+21
|\ \ | | | | | | | | | Allow authentication header to not have to specify 'token=' key.
| * | Allow authentication header to not have to specify 'token=' key.Guo Xiang Tan2014-10-101-2/+21
| | | | | | | | | | | | Fixes: https://github.com/rails/rails/issues/17108.
* | | Merge pull request #17733 from yuki24/do-not-rescue-exception-in-params-parserRafael Mendonça França2014-11-251-0/+10
|\ \ \ | | | | | | | | Do not rescue Exception in ActionDispatch::ParamsParser
| * | | Do not rescue Exception in ParamsParserYuki Nishijima2014-11-231-0/+10
| | | | | | | | | | | | | | | | | | | | Unlike ShowExceptions or PublicExceptions, ParamsParser shouldn't transform exceptions like Interrupt and NoMemoryError into ParserError.
* | | | Merge branch 'nil_script_name'Santiago Pastorino2014-11-251-0/+7
|\ \ \ \
| * | | | Add regression test case to ensure script_name as nil is not used anymore in ↵Santiago Pastorino2014-11-251-0/+7
|/ / / / | | | | | | | | | | | | url_for
* | | | Merge branch 'deprecate-string-options-in-url-helpers'Sean Griffin2014-11-241-0/+20
|\ \ \ \
| * | | | Deprecate string options in URL helpersMelanie Gilman2014-11-241-0/+20
| |/ / / | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/16958 [Byron Bischoff & Melanie Gilman]
* | | | Merge pull request #17747 from gsamokovarov/missing-template-backtraceDavid Heinemeier Hansson2014-11-241-0/+27
|\ \ \ \ | | | | | | | | | | Show source view and backtrace on missing template errors
| * | | | Show source view and backtrace on missing template errorsGenadi Samokovarov2014-11-241-0/+27
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will help you debug missing template errors, especially if they come from a programmatic template selection. Thanks to @dhh for suggesting that. As a bonus, also show request and response info on the routing error page for consistency.
* | | | Deprecate `use_route` in controller testsGodfrey Chan2014-11-231-2/+2
| | | | | | | | | | | | | | | | Reference #17453
* | | | Fix cases where the wrong name is passed to `Formatter#generate`Godfrey Chan2014-11-232-2/+2
|/ / / | | | | | | | | | | | | These are currently working "by accident" because `match_route` does not check that the name is valid.
* | | Test using `ActionController::TestCase` with enginesGodfrey Chan2014-11-231-0/+52
| | | | | | | | | | | | | | | | | | Reference #17453 [Godfrey Chan, Washington Luiz]
* | | Anchor should not be appended when set to nil/false.Guo Xiang Tan2014-11-232-0/+17
| | | | | | | | | | | | Fixes https://github.com/rails/rails/issues/17714.
* | | Make sure assert_select can assert body tagRafael Mendonça França2014-11-182-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f93df52845766216f0fe36a4586f8abad505cac4, reversing changes made to a455e3f4e9dbfb9630d47878e1239bc424fb7d13. Conflicts: actionpack/lib/action_controller/test_case.rb actionview/lib/action_view/test_case.rb
* | | Merge pull request #17642 from tgxworld/fix_template_assertion_on_assignsRafael Mendonça França2014-11-171-1/+13
|\ \ \ | | | | | | | | Fix for assigns(:..) resetting template assertions
| * | | Fix for assigns(:..) resetting template assertionsCalvin Correli2014-11-171-1/+13
| | | | | | | | | | | | | | | | When calling assigns(:...) or cookies(:...), template assertions would be reset, which they obviously shouldn't be.
* | | | Rename #source_extract to #source_extracts in ExceptionWrapperGenadi Samokovarov2014-11-161-2/+2
| | | | | | | | | | | | | | | | | | | | It returns multiple source extracts since 1ed264bc. Also cleaned its result structure, as we no longer need the file in a code extract.
* | | | Don't let #{application,framework,full}_trace be nilGenadi Samokovarov2014-11-161-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | Those three can be nil when exception backtrace is nil. This happens and that forced a couple of nil guards in the code. I'm proposing to make those always return an array, even on nil backtrace.
* | | | Merge pull request #17614 from gsamokovarov/exception-wrapper-basic-testsSantiago Pastorino2014-11-141-0/+66
|\ \ \ \ | |/ / / |/| | | Add basic tests for ActionDispatch::ExceptionWrapper
| * | | Add basic tests for ActionDispatch::ExceptionWrapperGenadi Samokovarov2014-11-131-0/+66
| | | |
* | | | Make FlashHash#key? work with symbol and stringRafael Mendonça França2014-11-111-0/+9
| | | | | | | | | | | | | | | | Closes #17586
* | | | Remove useless `only_path: true` in path helpersGodfrey Chan2014-11-101-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | We added a deprecation warning for these cases in aa1fadd, so these are now causing deprecation warnings in the test output. AFAICT, in these two cases, the option is not integral to the purpose of the test, so they can be safely removed
* | | | Pass the route name explicitlyGodfrey Chan2014-11-101-0/+12
|/ / / | | | | | | | | | | | | | | | Follow up to 212057b9. Since that commit, we need to pass the `route_name` explicitly. This is one of the left-over cases that was not handled in that commit, which was causing `use_route` to be ignored in functional tests.
* | | Remove session to allow `with_routing` to be called twice.Guo Xiang Tan2014-11-052-0/+37
| | | | | | | | | | | | Fixes: https://github.com/rails/rails/issues/16814
* | | Merge pull request #17440 from claudiob/remove-yet-another-redundant-to-sXavier Noria2014-10-301-2/+2
|\ \ \ | | | | | | | | Remove redundant `to_s` in interpolation
| * | | Remove redundant `to_s` in interpolationclaudiob2014-10-301-2/+2
| | | |
* | | | Merge branch 'master-sec'Aaron Patterson2014-10-301-2/+20
|\ \ \ \ | |/ / / |/| | | | | | | | | | | * master-sec: FileHandler should not be called for files outside the root
| * | | FileHandler should not be called for files outside the rootAaron Patterson2014-10-101-2/+20
| |/ / | | | | | | | | | | | | FileHandler#matches? should return false for files that are outside the "root" path.
* | | Deprecate the `only_path` option on `*_path` helpers.Godfrey Chan2014-10-281-0/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cases where this option is set to `true`, the option is redundant and can be safely removed; otherwise, the corresponding `*_url` helper should be used instead. Fixes #17294. See also #17363. [Dan Olson, Godfrey Chan]
* | | Merge pull request #17362 from bronzle/fix_debug_exceptions_appRafael Mendonça França2014-10-261-1/+41
|\ \ \ | | | | | | | | Show the user’s application in the source window and select the correct ...
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 07:40:39 +0000