Commit Graph

1941 Commits

Author SHA1 Message Date
Pratik Naik
4a6f4b92ad Change integration test helpers to accept Rack environment instead of just HTTP Headers.
Before :  get '/path', {}, 'Accept' => 'text/javascript'
  After  :  get '/path', {}, 'HTTP_ACCEPT' => 'text/javascript'
2009-05-19 23:50:03 +02:00
Yehuda Katz + Carl Lerche
07f733c631 Ported simple benchmarking in new base 2009-05-18 17:33:45 -07:00
Jeremy Kemper
3e2f0800e3 Merge branch 'master' of git@github.com:rails/rails 2009-05-18 13:43:44 -07:00
Jeremy Kemper
cf6e025a45 Merge branch 'master' of git@github.com:rails/rails 2009-05-18 11:54:51 -07:00
Andy Stewart
5e190ef138 Truncate helper accepts a :separator for a more legible result [#1807 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-18 20:46:19 +02:00
Pratik Naik
195fadbfd3 Ensure HTTP Digest auth uses appropriate HTTP method [#2490 state:resolved] [Steve Madsen] 2009-05-18 16:59:37 +02:00
Joshua Peek
01d7acd11d Fix reset_session with ActiveRecord store [#2200 state:resolved] 2009-05-17 14:42:36 -05:00
Joshua Peek
092089015b Extract generic callbacks middleware from dispatcher 2009-05-17 13:39:55 -05:00
Mike Breen
edc9c226d1 Add tests for assert_template :template
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-17 19:50:00 +02:00
Joshua Peek
8118fca9be Merge Failsafe middleware into ShowExceptions 2009-05-17 12:24:59 -05:00
Joshua Peek
c3319504f0 Rescue hack was supposed to be removed. Some how it crept back in. 2009-05-17 12:24:59 -05:00
Travis Briggs
98eaa2c683 Ensure number_to_human_size does not strip zeros from the end [#1763 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-17 19:02:50 +02:00
Lance Ivy
11bac70078 Ensure auto_link does not ignore multiple trailing punctuations [#2504 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-05-17 18:56:06 +02:00
Bryan Helmkamp
7f318c3ec5 Instead of checking Rails.env.test? in Failsafe middleware, check env["rails.raise_exceptions"] 2009-05-16 14:15:26 -04:00
Yehuda Katz + Carl Lerche
5a45446cff Ported Rescuable to new base 2009-05-15 17:49:11 -07:00
Yehuda Katz + Carl Lerche
7e10504bde Refactored AbstractController to provide better hook points for overriding aspects of action dispatching 2009-05-15 15:57:12 -07:00
José Valim
eb021707f5 Allow strings to be sent as collection to select.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
2009-05-15 15:30:17 +12:00
Jeremy Kemper
628110d7ee Active Support dependencies 2009-05-14 17:42:20 -07:00
Yehuda Katz + Carl Lerche
b6bac73b28 Merge commit 'origin/master'
Conflicts:
	actionpack/lib/action_controller/abstract/base.rb
	actionpack/lib/action_controller/routing.rb
2009-05-14 17:38:30 -07:00
Yehuda Katz + Carl Lerche
da65320433 Got new base to pass controller/base_test.rb, implemented method_missing action semantics in compatibility mode, and fixed a few action_missing bugs. 2009-05-14 17:25:10 -07:00
Yehuda Katz + Carl Lerche
8fac2c88ca Cleaning up more render tests 2009-05-14 15:30:35 -07:00
Yehuda Katz + Carl Lerche
49a84ff69c Ported over render :file tests. 2009-05-13 17:00:59 -07:00
Jeremy Kemper
e8550ee032 Cherry-pick core extensions 2009-05-13 12:00:15 -07:00
Yehuda Katz + Carl Lerche
216309c165 Implemented redirects and partial rendering in new base. 2009-05-12 16:21:34 -07:00
Yehuda Katz + Carl Lerche
72ca7c591c Fixed new callbacks to not call the action when a callback sets the response body 2009-05-12 10:53:00 -07:00
Yehuda Katz + Carl Lerche
00a9d4b91c Merge branch 'master' into wip_abstract_controller
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
2009-05-11 17:07:05 -07:00
Yehuda Katz + Carl Lerche
0f6e764e40 Fixed a bug with handling render options 2009-05-11 14:48:58 -07:00
Yehuda Katz + Carl Lerche
6694bd46f5 Aliased AbstractController::ActionNotFound to ActionController::UnknownAction 2009-05-11 12:45:26 -07:00
Yehuda Katz + Carl Lerche
94ee9d2452 Ported ConditionalGet to new Base 2009-05-11 12:04:43 -07:00
Yehuda Katz + Carl Lerche
a2f3684cec Ported fresh_when into a ConditionalGet module 2009-05-11 10:57:59 -07:00
Yehuda Katz
030dfe3f83 More community code review :) 2009-05-11 10:22:07 -07:00
Joshua Peek
2854535b02 Make module dependency DSL opt in 2009-05-07 10:29:22 -05:00
Joshua Peek
d4402c5554 assert_redirect_to's partial hash matching was deprecated in 2-3 stable 7f1f16c01 2009-05-04 20:26:43 -05:00
Joshua Peek
11af089cee Extract ActionController rescue templates into Rescue and ShowExceptions middleware.
This commit breaks all exception catching plugins like ExceptionNotifier. These plugins should be rewritten as middleware instead overriding Controller#rescue_action_in_public.
2009-05-02 23:02:22 -05:00
Jeremy Kemper
9047c9809d Fix implicit ordering expectation 2009-05-02 16:41:50 -07:00
Jeremy Kemper
1c6fcbfd2d Fix implicit ordering expectation 2009-05-02 15:30:00 -07:00
Joshua Peek
24affdc88c Deprecate Controller.process interface 2009-05-02 15:37:29 -05:00
Joshua Peek
f32cf44870 Switch functional tests to run through the rack interface instead of process 2009-05-02 15:29:18 -05:00
Joshua Peek
a8b75c480f Functional test runner finalizes response just like the integration test 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.
2009-05-02 14:57:40 -05:00
Joshua Peek
3900f4007e Deprecate assert_redirect_to's partial hash matching 2009-05-02 14:23:44 -05:00
Yehuda Katz
72160d9f89 Implement FooController.action(:name)
* 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
2009-05-02 02:15:09 -07:00
Yehuda Katz + Carl Lerche
7dd072d333 A few more tweaks to get new Base running old render tests again 2009-05-01 17:53:20 -07:00
Yehuda Katz + Carl Lerche
e046f36824 Renamed Base2 to Base and don't require old action_controller for new Base 2009-05-01 17:31:03 -07:00
Yehuda Katz + Carl Lerche
b1d34b3aa4 Starting to get new_base to run on old tests 2009-05-01 17:31:03 -07:00
Yehuda Katz + Carl Lerche
b4903a8e34 Modify new_base to use String action_names for back-compat 2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
69fd669165 Committing the last changes before we start trying to get the old tests to pass on the new base 2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
4ee3e5b094 Ported over the concept of public instance methods on controller child classes as callable action methods 2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
d58b57a3ca Move ContentType inline for now.
Trying to avoid premature proliferation of modules.
2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
b98e496c03 Support implicit and explicit content types 2009-05-01 17:31:02 -07:00
Yehuda Katz + Carl Lerche
49834e088b Support implicit render and blank render 2009-05-01 17:31:02 -07:00