Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' | Yehuda Katz + Carl Lerche | 2009-05-14 | 1 | -0/+1 |
|\ | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/base.rb actionpack/lib/action_controller/routing.rb | ||||
* | | Got new base to pass controller/base_test.rb, implemented method_missing ↵ | Yehuda Katz + Carl Lerche | 2009-05-14 | 2 | -2/+2 |
| | | | | | | | | action semantics in compatibility mode, and fixed a few action_missing bugs. | ||||
* | | Cleaning up more render tests | Yehuda Katz + Carl Lerche | 2009-05-14 | 7 | -32/+108 |
|/ | |||||
* | Ported over render :file tests. | Yehuda Katz + Carl Lerche | 2009-05-13 | 8 | -321/+585 |
| | |||||
* | Cherry-pick core extensions | Jeremy Kemper | 2009-05-13 | 6 | -4/+7 |
| | |||||
* | Implemented redirects and partial rendering in new base. | Yehuda Katz + Carl Lerche | 2009-05-12 | 4 | -37/+41 |
| | |||||
* | Fixed new callbacks to not call the action when a callback sets the response ↵ | Yehuda Katz + Carl Lerche | 2009-05-12 | 1 | -0/+19 |
| | | | | body | ||||
* | Merge branch 'master' into wip_abstract_controller | Yehuda Katz + Carl Lerche | 2009-05-11 | 21 | -383/+231 |
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/callbacks.rb actionpack/lib/action_controller/abstract/renderer.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_controller/dispatch/dispatcher.rb actionpack/lib/action_controller/routing/route_set.rb actionpack/lib/action_controller/testing/process.rb actionpack/test/abstract_controller/layouts_test.rb actionpack/test/controller/filters_test.rb actionpack/test/controller/helper_test.rb actionpack/test/controller/render_test.rb actionpack/test/new_base/test_helper.rb | ||||
| * | Make module dependency DSL opt in | Joshua Peek | 2009-05-07 | 3 | -11/+11 |
| | | |||||
| * | assert_redirect_to's partial hash matching was deprecated in 2-3 stable ↵ | Joshua Peek | 2009-05-04 | 1 | -7/+0 |
| | | | | | | | | 7f1f16c01 | ||||
| * | Extract ActionController rescue templates into Rescue and ShowExceptions ↵ | Joshua Peek | 2009-05-02 | 9 | -326/+164 |
| | | | | | | | | | | middleware. This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public. | ||||
| * | Fix implicit ordering expectation | Jeremy Kemper | 2009-05-02 | 1 | -1/+1 |
| | | |||||
| * | Deprecate Controller.process interface | Joshua Peek | 2009-05-02 | 2 | -10/+12 |
| | | |||||
| * | Switch functional tests to run through the rack interface instead of process | Joshua Peek | 2009-05-02 | 1 | -1/+1 |
| | | |||||
| * | Functional test runner finalizes response just like the integration test ↵ | Joshua Peek | 2009-05-02 | 6 | -44/+55 |
| | | | | | | | | | | runner. In both runners, the @response object will now behave the same. Some functional tests will need to be updated if they are relying on preprocessed data on the response. | ||||
| * | Deprecate assert_redirect_to's partial hash matching | Joshua Peek | 2009-05-02 | 2 | -5/+9 |
| | | |||||
* | | Fixed a bug with handling render options | Yehuda Katz + Carl Lerche | 2009-05-11 | 1 | -64/+1 |
| | | |||||
* | | Aliased AbstractController::ActionNotFound to ActionController::UnknownAction | Yehuda Katz + Carl Lerche | 2009-05-11 | 2 | -5/+3 |
| | | |||||
* | | Ported ConditionalGet to new Base | Yehuda Katz + Carl Lerche | 2009-05-11 | 1 | -4/+4 |
| | | |||||
* | | Ported fresh_when into a ConditionalGet module | Yehuda Katz + Carl Lerche | 2009-05-11 | 1 | -0/+47 |
| | | |||||
* | | More community code review :) | Yehuda Katz | 2009-05-11 | 4 | -31/+31 |
| | | |||||
* | | Fix implicit ordering expectation | Jeremy Kemper | 2009-05-02 | 1 | -1/+1 |
| | | |||||
* | | Implement FooController.action(:name) | Yehuda Katz | 2009-05-02 | 3 | -14/+31 |
| | | | | | | | | | | | | * Rails actions are now Rack endpoints, and can be retrieved via FooController.action(name) and called with an env * Updated some tests that relied on the old internal #process/#call implementation | ||||
* | | A few more tweaks to get new Base running old render tests again | Yehuda Katz + Carl Lerche | 2009-05-01 | 1 | -13/+2 |
| | | |||||
* | | Renamed Base2 to Base and don't require old action_controller for new Base | Yehuda Katz + Carl Lerche | 2009-05-01 | 8 | -94/+21 |
| | | |||||
* | | Starting to get new_base to run on old tests | Yehuda Katz + Carl Lerche | 2009-05-01 | 4 | -3/+218 |
| | | |||||
* | | Modify new_base to use String action_names for back-compat | Yehuda Katz + Carl Lerche | 2009-05-01 | 1 | -1/+1 |
| | | |||||
* | | Committing the last changes before we start trying to get the old tests to ↵ | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -7/+70 |
| | | | | | | | | pass on the new base | ||||
* | | Ported over the concept of public instance methods on controller child ↵ | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -5/+22 |
| | | | | | | | | classes as callable action methods | ||||
* | | Move ContentType inline for now. | Yehuda Katz + Carl Lerche | 2009-05-01 | 1 | -1/+0 |
| | | | | | | | | Trying to avoid premature proliferation of modules. | ||||
* | | Support implicit and explicit content types | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -0/+122 |
| | | |||||
* | | Support implicit render and blank render | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -16/+54 |
| | | |||||
* | | Ported over render :template tests | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -1/+38 |
| | | |||||
* | | Finished implementing render :text in Base2 | Yehuda Katz + Carl Lerche | 2009-05-01 | 3 | -1/+38 |
| | | |||||
* | | Renamed the new_base tests | Yehuda Katz + Carl Lerche | 2009-05-01 | 4 | -94/+98 |
| | | |||||
* | | Renamed ActionController::AbstractBase to ActionController::Http | Yehuda Katz + Carl Lerche | 2009-05-01 | 2 | -16/+16 |
| | | |||||
* | | OMG, a lot of work | Yehuda Katz + Carl Lerche | 2009-05-01 | 11 | -75/+174 |
|/ | |||||
* | Added routing test for irregular ID requirements and custom member action. | Ruy Asan | 2009-05-01 | 1 | -0/+8 |
| | | | | | | [#2595 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Update some old tests to use AC TestProcess | Joshua Peek | 2009-04-30 | 1 | -12/+13 |
| | |||||
* | alias method chain process with test | Joshua Peek | 2009-04-30 | 1 | -2/+2 |
| | |||||
* | Move TestRequest cookies accessor into AD TestRequest | Joshua Peek | 2009-04-30 | 1 | -0/+15 |
| | |||||
* | Depend on unreleased rack 1.1 | Joshua Peek | 2009-04-30 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2009-04-30 | 1 | -0/+10 |
|\ | |||||
| * | Fix render :json => nil [#2589 state:resolved] | Jeremy Kemper | 2009-04-30 | 1 | -0/+10 |
| | | |||||
* | | Fix action-cached exception responses. | John F. Douthat | 2009-04-30 | 1 | -0/+35 |
|/ | | | | | | | | Methods raising ActiveRecord::RecordNotFound were returning 404 on first request and 200 OK with blank body on subsequent requests. [#2533 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
* | Start moving TestRequest and TestResponse into ActionDispatch | Joshua Peek | 2009-04-30 | 5 | -15/+51 |
| | |||||
* | Group integration test helpers and delegate other helpers to request and ↵ | Joshua Peek | 2009-04-30 | 1 | -11/+1 |
| | | | | response objects | ||||
* | Switch to action_dispatch rack namespace | Joshua Peek | 2009-04-30 | 1 | -1/+1 |
| | |||||
* | Framework backtrace cleaning is handled by ActiveSupport now | Joshua Peek | 2009-04-30 | 1 | -27/+0 |
| | |||||
* | Deprecate template, session, assigns, and layout accessors on response ↵ | Joshua Peek | 2009-04-28 | 6 | -122/+159 |
| | | | | object. Instead access them through the controller instance. This mainly affects functional test assertions. |