aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* added examples to DateAndTime::Calculations [ci skip]Julio Lopez2015-07-181-9/+34
|
* drop runtime conditionals in parameter parsingAaron Patterson2015-07-091-13/+9
| | | | | If we only deal with proc objects, then we can eliminate type checking in the parameter parsing middleware
* Merge pull request #20457 from ronakjangir47/remove_mocha_activesupportKasper Timm Hansen2015-07-098-65/+87
|\ | | | | Removed use of mocha in Active Support
| * Removed use of mocha in active_supportRonak Jangir2015-07-108-65/+87
| |
* | Merge pull request #20813 from noniq/locale-argument-for-pluralize-helperKasper Timm Hansen2015-07-092-2/+22
|\ \ | | | | | | Allow `pluralize` helper to take a locale.
| * | Allow `pluralize` helper to take a locale.Stefan Daschek2015-07-092-2/+22
| | | | | | | | | | | | This is already supported in `ActiveSupport::Inflector#pluralize` and `String#pluralize`, so we just forward the locale.
* | | use `Rack::Test::UploadedFile` when uploading filesAaron Patterson2015-07-091-2/+2
| | | | | | | | | | | | | | | We should use rack-test's upload file objects on the test side so that we will be able to correctly generate mime blob posts in the future
* | | set parameters as a query stringAaron Patterson2015-07-092-7/+10
| | | | | | | | | | | | | | | | | | We should convert request parameters to a query string, then let the request object parse that query string. This should give us results that are more similar to the real-world
* | | use JSON to communicate between the controller and the testsAaron Patterson2015-07-091-12/+12
| | |
* | | Merge pull request #20765 from maurogeorge/activejob-exceptionRobin Dupret2015-07-091-0/+7
|\ \ \ | |_|/ |/| | Add Deserialization section on guides at ActiveJob Exception [ci skip]
| * | Add Deserialization section on guides at ActiveJob ExceptionMauro George2015-07-081-0/+7
| | | | | | | | | | | | [ci skip]
* | | build and assign parameters rather than rely on mutationsAaron Patterson2015-07-082-4/+18
| | | | | | | | | | | | | | | We should assign parameters to the request object rather than mutate the hash that is returned by `query_parameters` or `request_parameters`
* | | use new constructor. (Oops! :bomb:)Aaron Patterson2015-07-082-2/+2
| | |
* | | assign the cookie hash on request allocationAaron Patterson2015-07-082-2/+2
| | | | | | | | | | | | this prevents mutations from being available globally
* | | request objects are no longer recycledAaron Patterson2015-07-082-16/+8
| | | | | | | | | | | | | | | | | | Instead of trying to manually clear out a request object, lets just allocate a new one. The rack ENV is reused and cleaned (still), but the request object is not.
* | | pass the variant as a parameter to more reflect real world appsAaron Patterson2015-07-081-3/+3
| | |
* | | add a new constructor for allocating test requestsAaron Patterson2015-07-084-29/+31
| | |
* | | make `env` a required parameterAaron Patterson2015-07-082-7/+7
| | |
* | | pass the starting env and session to build_requestAaron Patterson2015-07-082-4/+4
| | |
* | | remove call to build_requestAaron Patterson2015-07-081-1/+0
| | |
* | | pass the session and env in to the test requestAaron Patterson2015-07-081-4/+8
| | |
* | | let the superclass build the request and responseAaron Patterson2015-07-0811-48/+14
| | | | | | | | | | | | | | | We should leverage the request / response objects that the superclass has already allocated for us.
* | | Merge pull request #20781 from dubek/collection-cache-explicitKasper Timm Hansen2015-07-085-9/+47
|\ \ \ | | | | | | | | Support explicit defintion of resource name for collection caching.
| * | | Support explicit defintion of resouce name for collection caching.Dov Murik2015-07-075-9/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a template includes `# Template Collection: ...` anywhere in its source, that name will be used as the cache name for the partial that is rendered for the collection. This allows users to enable collection caching even if the template doesn't start with `<% cache ... do %>`. Moreover, the `# Template Collection: ...` notation is recognized in all template types (and template types other than ERB can define a resource_cache_call_pattern method to allow the `cache ... do` pattern to be recognized too).
* | | | Merge pull request #20784 from kaspth/great-expectationsKasper Timm Hansen2015-07-082-0/+121
|\ \ \ \ | | | | | | | | | | Add method call assertions for internal use.
| * | | | Add method call assertions for internal use.Kasper Timm Hansen2015-07-082-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | | Add `assert_called` and `assert_not_called` to boil down the boilerplate we need to write to assert methods are called certain number of times.
* | | | | remove useless `new` implementationAaron Patterson2015-07-081-4/+0
| | | | |
* | | | | allocate new responses rather than recycling themAaron Patterson2015-07-081-12/+5
| |_|_|/ |/| | | | | | | | | | | | | | | There is no reason to "recycle" response objects when we can just allocate a new one.
* | | | Merge pull request #20805 from yui-knk/fix/how_to_run_testYves Senn2015-07-081-1/+1
|\ \ \ \ | | | | | | | | | | [ci skip] Add `bundle exec` to Running a Single Test
| * | | | [ci skip] Add `bundle exec` to Running a Single Testyui-knk2015-07-081-1/+1
|/ / / /
* | | | Merge pull request #20803 from TheBlasfem/marking_serialization_classRafael Mendonça França2015-07-081-1/+1
|\ \ \ \ | | | | | | | | | | marking serialization class in Readme
| * | | | marking serialization classJulio Lopez2015-07-071-1/+1
| | | | |
* | | | | Merge pull request #20804 from TheBlasfem/adding_brackets_to_array_in_docsRafael Mendonça França2015-07-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Adding brackets to array in docs
| * | | | | adding brackets to array in docsJulio Lopez2015-07-071-1/+1
|/ / / / /
* | | | | pass variants in rather than mutating the request.Aaron Patterson2015-07-071-48/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Variants are typically set in the controller based on some attribute of the request that the browser sent. We should make our tests more in line with reality by doing the same and not mutating the request object.
* | | | | pass cookies from the jar in the HTTP_COOKIE headereileencodes2015-07-073-19/+11
| | | | | | | | | | | | | | | | | | | | | | | | | we should be pushing the cookies in via headers rather than maintaining some object and "recycling" it.
* | | | | Send cookies with requesteileencodes2015-07-073-2/+9
| |_|/ / |/| | |
* | | | Revert "Merge pull request #20758 from ↵Kasper Timm Hansen2015-07-074-25/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | xijo/action_mailer_message_delivery_respects_i18n_locale" This reverts commit f2a8c23654d69dd8f294971487b5abf0e5d891c3, reversing changes made to 3046c9bbe154aa717a5147091be8b495ed8969c4.
* | | | Fix regression caused by a01d164bRafael Mendonça França2015-07-073-2/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When preload is used in a default scope the preload_values were returning nested arrays and causing the preloader to fail because it doesn't know how to deal with nested arrays. So before calling preload! we need to splat the arguments. This is not needed to includes because it flatten its arguments.
* | | | docs, clarify the meanaing of return values from validation methods.Yves Senn2015-07-072-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Closes #20792. Custom validation methods are implemented in terms of callbacks. The `validate` callback chain can't be halted using return values of individual callbacks.
* | | | docs, remove accidental :nodoc: of ActiveModel::Validations::ClassMethods ↵Yves Senn2015-07-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | methods. [ci skip] While this :nodoc: did hide the constant it also removed the following methods from the API docs: - #attribute_method? - #clear_validators! - #validate - #validators - #validators_on Those are public API and should be visible. Issue was caused by dee4fbc /cc @zzak
* | | | Merge pull request #20794 from vredniy/patch-1Robin Dupret2015-07-071-1/+1
|\ \ \ \ | | | | | | | | | | Update CHANGELOG.md [ci skip]
| * | | | Update CHANGELOG.mdDmitry Zudochkin2015-07-071-1/+1
|/ / / /
* | | | Merge pull request #20793 from pwnall/nested_testYves Senn2015-07-071-0/+10
|\ \ \ \ | |/ / / |/| | | Test proving that accepts_nested_attributes_for is secure against ID tampering attacks
| * | | Add test proving that accepts_nested_attributes_for is secure against ID ↵Victor Costan2015-07-071-0/+10
|/ / / | | | | | | | | | tampering attacks.
* | | Merge pull request #13897 from gmalette/nested-parameter-filtering-2Arthur Nogueira Neves2015-07-063-7/+28
|\ \ \ | | | | | | | | Allow filtering params based on parent keys
| * | | Allow filtering params based on parent keysGuillaume Malette2015-06-223-7/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the possibility to only filter parameters based on their full path instead of relying on the immediate key. config.filter_parameters += ['credit_card.code'] { 'credit_card' => { 'code' => '[FILTERED]' }, 'source' => { 'code' => '<%= puts 5 %>' } }
* | | | Merge pull request #20779 from maurogeorge/secrets-guidesRobin Dupret2015-07-061-0/+23
|\ \ \ \ | | | | | | | | | | Add to Security guides the secrets.yml [ci skip]
| * | | | Add to Security guides the secrets.ymlMauro George2015-07-061-0/+23
| | | | | | | | | | | | | | | | | | | | [ci skip]
* | | | | Merge pull request #20778 from maurogeorge/ordered_options_bang_docRobin Dupret2015-07-061-0/+8
|\ \ \ \ \ | | | | | | | | | | | | Add to RDoc of OrderedOptions the bang info [ci skip]