aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | Merge pull request #21384 from ↵Yves Senn2015-08-273-2/+17
|\ \ \ | | | | | | | | | | | | | | | | jeremyf/updating-ActionController-TestSession-to-behave-as-a-hash-with-indifferent Updating TestSession to access with indifference
| * | | Updating TestSession to access with indifferenceJeremy Friesen2015-08-263-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following Rails code failed (with a `KeyError` exception) under test: ```ruby class ApplicationController < ActionController::Base def user_strategy # At this point: # ```ruby # session == { # "user_strategy"=>"email", # "user_identifying_value"=>"hello@world.com" # } # ``` if session.key?(:user_strategy) session.fetch(:user_strategy) end end end ``` When I checked the session's keys (`session.keys`), I got an array of strings. If I accessed `session[:user_strategy]` I got the expected `'email'` value. However if I used `session.fetch(:user_strategy)` I got a `KeyError` exception. This appears to be a Rails 4.2.4 regression (as the code works under Rails 4.2.3). Closes #21383
* | | | Merge pull request #21392 from y-yagi/rm_require_support_filesYves Senn2015-08-271-3/+0
|\ \ \ \ | | | | | | | | | | remove require of files under support that do not use
| * | | | remove require of files under support that do not useyuuji.yaginuma2015-08-271-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I do not know why files under the support has been require. However, under the support even rails application does not use. In addition, since the default under the support file nor is generated, it requires I think not necessary
* | | | | Merge pull request #21389 from Gaurav2728/gaurav-unused_require_fileYves Senn2015-08-274-4/+0
|\ \ \ \ \ | |_|_|/ / |/| | | | no more require minitest mock here
| * | | | no more require minitest mockGaurav Sharma2015-08-274-4/+0
| | | | |
* | | | | remove redefined methodAaron Patterson2015-08-261-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Rack::Response::Helpers implements this method, so we can safely remove it
* | | | | Remove useless conditionalAaron Patterson2015-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | If the response method is defined, then calling `response` will return a response.
* | | | | remove useless codeAaron Patterson2015-08-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If AV::Rendering is mixed in, then `rendered_format` will be calculated based on the current `lookup_context`, but calling `_process_format` will set the `rendered_format` back on to the same lookup context where we got the information in the first place! Instead of getting information from an object, then setting the same information back on to that object, lets just do nothing instead!
* | | | | only call self.content_type= when there is a responseAaron Patterson2015-08-263-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Apparently the AbstractController (whatever "abstract" means) is expected to work without a request and response.
* | | | | Pull `plain` content type handling up to `render`Aaron Patterson2015-08-263-9/+6
| | | | | | | | | | | | | | | | | | | | | | | | | `render` is the only possible source for the `plain` option. Pulling the conditional up to the `render` method removes far away conditionals
* | | | | stop passing the options hash to `_process_format`Aaron Patterson2015-08-263-5/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | We don't need to pass the full hash just to pull one value out. It's better to just pass the value that the method needs to know about so that we can abstract it away from "options"
* | | | remove RackDelegation moduleAaron Patterson2015-08-2614-74/+16
| | | | | | | | | | | | | | | | | | | | | | | | Since all controller instances are required to have a request and response object, RackDelegation is no longer needed (we always have to delegate to the response)
* | | | remove useless methodAaron Patterson2015-08-261-5/+0
| | | | | | | | | | | | | | | | | | | | the subclass sets the body on the response object, so we don't need the superclass doing it too
* | | | include ActionView::Rendering in the minimal controllerAaron Patterson2015-08-262-1/+2
| | | | | | | | | | | | | | | | without this module, the content type is not set correctly
* | | | Merge pull request #21387 from ronakjangir47/remove_dup_minitestKasper Timm Hansen2015-08-265-7/+0
|\ \ \ \ | | | | | | | | | | Removed duplicate require 'minitest/mock'
| * | | | Removed duplicate requiring minitest/mock as it is already required in ↵Ronak Jangir2015-08-265-7/+0
| | | | | | | | | | | | | | | | | | | | method_call_assertions
* | | | | `headers` should delegate to the response objectAaron Patterson2015-08-261-1/+2
| | | | |
* | | | | remove useless status setAaron Patterson2015-08-261-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that `Controller#status=` just delegates to the response object, we don't need to set the response on the controller and the response. We can just set it in one place.
* | | | | remove useless conditionalAaron Patterson2015-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | we always have a response object, so there is no reason to test it
* | | | | remove ivars from the "protected" listAaron Patterson2015-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | these ivars don't exist anymore, so we can remove them from the list
* | | | | use the content_type method on the request objectAaron Patterson2015-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | since the controller always has a request on it, we can just ask the request for the content type.
* | | | | ask the response for the statusAaron Patterson2015-08-261-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The controller instance always has an instance of a response object. We should store the status code on the response object so that it's only store in one place.
* | | | | remove useless conditionalAaron Patterson2015-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | We always have a response object in controller instances, so we can remove this conditional
* | | | | remove useless conditionalAaron Patterson2015-08-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | controller instances always have a response object, so we don't need to test to see if there is one, just always call to_a on the response.
* | | | | Merge pull request #21386 from ronakjangir47/remove_dupsRafael Mendonça França2015-08-264-4/+0
|\ \ \ \ \ | | | | | | | | | | | | Removed duplicate requires
| * | | | | Removed duplicate require ‘models/computer’Ronak Jangir2015-08-264-4/+0
| |/ / / /
* | | | | Merge pull request #21336 from yui-knk/refactor/to_use_getterRafael Mendonça França2015-08-261-7/+7
|\ \ \ \ \ | | | | | | | | | | | | Use `ActiveRecord::Migration#connection` instead of `@connection`
| * | | | | Use `ActiveRecord::Migration#connection` instead of `@connection`yui-knk2015-08-231-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `ActiveRecord::Migration` has `connetion` method so replace to use `connection` method to get `@connection` as much as possible
* | | | | | Merge pull request #21382 from akihiro17/fix-testYves Senn2015-08-261-1/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix the unused variable warning
| * | | | | Fix the unused variable warningakihiro172015-08-261-1/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes the following warning. ```ruby warning: assigned but unused variable - index_definition ```
* | | | | Merge pull request #21380 from ronakjangir47/fix_docsYves Senn2015-08-261-2/+3
|\ \ \ \ \ | |_|/ / / |/| | | | Fixed to_datetime docs [ci skip]
| * | | | Fixed to_datetime docs [ci skip]Ronak Jangir2015-08-261-2/+3
|/ / / /
* | | | provide a request and response to all controllersAaron Patterson2015-08-2510-39/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Controllers should always have a request and response when responding. Since we make this The Rule(tm), then controllers don't need to be somewhere in limbo between "asking a response object for a rack response" or "I, myself contain a rack response". This duality leads to conditionals spread through the codebase that we can delete: * https://github.com/rails/rails/blob/85a78d9358aa728298cd020cdc842b55c16f9549/actionpack/lib/action_controller/metal.rb#L221-L223
* | | | :snip: whitespaceAaron Patterson2015-08-251-2/+2
| | | |
* | | | Fix another rack SPEC violationAaron Patterson2015-08-251-1/+1
| | | |
* | | | rack SPEC doesn't allow `first` on the bodyAaron Patterson2015-08-251-8/+12
| | | | | | | | | | | | | | | | collect the body and make assert against the collected body
* | | | move response allocation to the class levelAaron Patterson2015-08-252-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | we don't need an instance to figure out what type of response to allocate. Later we'll pull this up the stack and pass the response object down
* | | | adding a direct dispatch method to controller classesAaron Patterson2015-08-253-9/+13
| | | | | | | | | | | | | | | | This saves a lambda and request allocation on each request.
* | | | always dispatch to controllers the same wayAaron Patterson2015-08-253-7/+26
| | | | | | | | | | | | | | | | | | | | controllers should always go through the `action` class method so that their middleware is respected.
* | | | always return a controller class from the `controller_class` methodAaron Patterson2015-08-252-9/+14
| |/ / |/| | | | | | | | | | | now the caller can just treat it like a regular controller even though it will return a 404
* | | Merge pull request #21377 from ronakjangir47/remove_mocha_active_recordKasper Timm Hansen2015-08-2512-119/+153
|\ \ \ | | | | | | | | Removed mocha from Active Record Part 1
| * | | Removed mocha from Active Record Part 1Ronak Jangir2015-08-2512-119/+153
| | | |
* | | | Merge pull request #21368 from rodzyn/remove_mochaKasper Timm Hansen2015-08-255-163/+209
|\ \ \ \ | | | | | | | | | | Get rid of mocha tests in actionpack - part 2
| * | | | Get rid of mocha tests - part 2Marcin Olichwirowicz2015-08-255-163/+209
| | | | |
* | | | | Merge pull request #21257 from jdantonio/async-jobKasper Timm Hansen2015-08-2513-4/+183
|\ \ \ \ \ | | | | | | | | | | | | Initial implementation of ActiveJob AsyncAdapter.
| * | | | | Initial implementation of ActiveJob AsyncAdapter.Jerry D'Antonio2015-08-2513-4/+183
| | | | | |
* | | | | | Merge pull request #21281 from ronakjangir47/added_docsRafael Mendonça França2015-08-251-1/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Added docs for TimeWithZone [ci skip]
| * | | | | Added docs for TimeWithZone [ci skip]Ronak Jangir2015-08-181-1/+10
| | | | | |
* | | | | | Merge pull request #21324 from Gaurav2728/gaurav-xml_serialization_doc_fixRafael Mendonça França2015-08-251-5/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | discard xml Serialization documentation that is no longer available […