Commit Graph

9029 Commits

Author SHA1 Message Date
Yehuda Katz and Carl Lerche
6c05b5e938 Temporarily modifies setup to call super directly. This can support more T::U runners. 2009-04-08 17:33:41 -07:00
Yehuda Katz and Carl Lerche
91402bdd31 Reverts changes made to AS::TC 2009-04-08 10:10:06 -07:00
Yehuda Katz and Carl Lerche
3cecbc21e3 Get Base2 layouts to work :) 2009-04-07 17:57:20 -07:00
Yehuda Katz and Carl Lerche
95c9718118 Layouts work in AbstractController. Add support for the rspec runner for T::U 2009-04-07 15:54:02 -07:00
Yehuda Katz and Carl Lerche
c1aa5b0e14 Add depends_on, use, and setup to abstract up ideas about module inheritance. 2009-04-07 14:57:18 -07:00
Yehuda Katz and Carl Lerche
9c8eaf8e25 Merge branch 'abstract_controller' of git@github.com:wycats/rails into abstract_controller 2009-04-06 12:35:44 -07:00
Yehuda Katz and Carl Lerche
4d3cd9b43f Changes necessary to run the T::U tests with the rspec runner 2009-04-06 12:35:24 -07:00
Yehuda Katz and Carl Lerche
1d3e2c2b73 In the middle of some refactoring... some fails due to changes in AbstractController not yet reflected in ActionController tests 2009-03-23 18:06:47 -07:00
Yehuda Katz and Carl Lerche
a501638e9d Checkpoint 2009-03-23 15:45:01 -07:00
Yehuda Katz
34f058e082 Add a bunch of tests for various render :action, layout combinations 2009-03-23 12:07:34 -07:00
Carl Lerche
4a93148bfe Adding render :layout tests 2009-03-23 10:23:14 -07:00
Carl Lerche
ab17ecfe5d Finished implementing :layout for most of the render options 2009-03-23 10:23:14 -07:00
Carl Lerche
c6123c3703 Finished implementing layout for render :text 2009-03-23 10:23:14 -07:00
Carl Lerche
81e814adfa Working on being able to render :text with layouts 2009-03-23 10:23:14 -07:00
Carl Lerche
90c079a781 Modified the action layout tests to use the new FixtureTemplate class 2009-03-23 10:23:14 -07:00
Yehuda Katz
dc96ba8043 Temporary runner 2009-03-20 15:02:12 -07:00
Yehuda Katz
d1256f71d6 Hacked up fixture view paths to simplify tests for a bit 2009-03-20 14:05:10 -07:00
Yehuda Katz
7a86f8ea90 Test controller layout 2009-03-19 16:11:20 -07:00
Yehuda Katz
890321e51e Get very basic layouts working.
* Required small architecture change
2009-03-19 15:45:48 -07:00
Yehuda Katz
8ab37c7660 Started implementing render :action 2009-03-19 13:35:39 -07:00
Yehuda Katz
e0447023db Implemented basic template rendering in AC::Base2:
* Created several macros for writing simpler specs
* Finished making Rack::Test work right
* Implemented render_to_string
* Status Codes
* render :text => nil
2009-03-18 15:58:47 -07:00
Yehuda Katz
fb626ee390 Rework NewCallbacks to not require method_missing 2009-03-17 18:05:08 -07:00
Yehuda Katz
e6e3e3dfbc Temporarily reraise to simplify debugging 2009-03-17 18:04:41 -07:00
Yehuda Katz
f55514125c Working toward getting a basic AbstractController framework 2009-03-17 18:04:22 -07:00
Yehuda Katz
a2637e9f1f Try to build a new AC::Base on top of AbstractController 2009-03-12 13:19:13 -06:00
Yehuda Katz
67f9b39bd0 Use extlib accessor for new callbacks 2009-03-12 13:18:31 -06:00
Yehuda Katz
72b365ece9 Move Abstract stuff to autoload 2009-03-12 13:18:15 -06:00
Yehuda Katz
0c92a51dad Handle nil QS 2009-03-12 13:17:57 -06:00
Yehuda Katz
f8088d7def memoize correctly ;) 2009-03-03 17:20:57 -08:00
Yehuda Katz
6001cea5d7 Helpers with an initial test 2009-03-03 16:42:20 -08:00
Yehuda Katz
cde9aab823 Callbacks test 2009-02-27 20:49:44 -08:00
Yehuda Katz
9510070f78 Fixes multiple conditions 2009-02-27 19:37:09 -08:00
Yehuda Katz
c16c7a8de4 Add support for callbacks 2009-02-27 19:25:45 -08:00
Yehuda Katz
ee80dad680 Initial hooks 2009-02-27 15:11:02 -08:00
Yehuda Katz
d1157e7242 AbstractController now supports layouts and rendering 2009-02-27 11:42:13 -08:00
Yehuda Katz
b1f078bddf First, very early, AbstractController code. More to come 2009-02-24 17:25:21 -08:00
Yehuda Katz
d6b9f8410c Remove errant debug code 2009-02-03 08:04:14 -08:00
Yehuda Katz
d4a817c066 Make tests pass 2009-02-02 14:01:29 -08:00
Yehuda Katz
ff68430077 Whoops. 2009-02-02 12:03:35 -08:00
Yehuda Katz
9744f687cc Add support for pending 2009-02-02 11:49:32 -08:00
Yehuda Katz
6faff0223b Merge commit 'rails/3-0-unstable' 2009-02-02 09:54:27 -08:00
Yehuda Katz
44cdf0c5fe Some merge cleanup 2009-02-02 09:54:23 -08:00
Jeremy Kemper
4945d92b03 Remove dead cgi_ext require 2009-01-31 14:46:02 -08:00
Jeremy Kemper
8da52b13b5 Remove duplicate ConcurrentHash 2009-01-31 14:44:04 -08:00
Yehuda Katz
3030bc90c9 Merge commit 'rails/3-0-unstable'
Conflicts:

	actionpack/lib/action_controller/base.rb
	actionpack/lib/action_dispatch/http/mime_type.rb
	actionpack/lib/action_dispatch/http/request.rb
	actionpack/lib/action_view/base.rb
	actionpack/lib/action_view/paths.rb
	actionpack/test/controller/session/cookie_store_test.rb
	actionpack/test/dispatch/rack_test.rb
	actionpack/test/dispatch/request_test.rb
2009-01-30 11:30:27 -08:00
Yehuda Katz
ae42163bf5 Merge branch 'master' of git@github.com:wycats/rails 2009-01-30 11:01:11 -08:00
Yehuda Katz
da10673e32 Sync 'rails/rails/master' 2009-01-30 10:53:19 -08:00
Charles Nutter
ed0e564087 Ensure constant_watch_stack is protected by a mutex, so concurrent requires do not corrupt it.
[#1816 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2009-01-30 08:27:03 -08:00
Scott Taylor
2dedb5b03a Controller, response, and request should all refer to same session, even after a call to session_reset [#1823 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-01-29 19:39:48 -06:00
Mike Gaffney
1b79683171 Deprecation tests for f17c876 [#1801 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-01-29 19:37:38 -06:00