Sergey Pchelincev
1b5298e805
add lazy look up in abstract controller's translate method
2012-07-18 10:33:14 +03:00
Aaron Patterson
cd4a0a3332
we raise a subclass of LoadError, so rescue that
2012-06-14 10:40:23 -07:00
José Valim
dd0275e463
Add a test case for layout nil.
2012-03-28 23:06:52 +04:00
Luke Gruber
08c4d8eac3
use consistent explicit module inclusion
...
aid ease of understanding and readability for tests
2012-03-16 21:54:25 -04:00
Luke Gruber
aca6937760
allow zero-arity proc for AbstrController::layout
...
proc without parameters can now be given to
AbstractController::layout
2012-03-15 16:40:23 -04:00
Santiago Pastorino
687db9f86d
Add missing require
2012-03-10 19:15:29 -02:00
Santiago Pastorino
4751a699c9
AbstractController.action_methods should return a Set
2012-03-10 18:37:30 -02:00
Alexey Vakhov
b27c29ef4a
Fix layout lookup for anonymous controller
2012-02-28 14:42:57 +04:00
Aaron Patterson
fd918fe5ed
AP tests should inherit from AS::TestCase
2012-01-05 17:05:44 -08:00
José Valim
cae1768c6a
Remove deprecated layout lookup.
2011-12-20 14:44:48 +01:00
José Valim
5ad5215211
Deprecate implicit layout lookup in favor of inheriting the _layout config.
2011-12-09 07:20:55 +01:00
Prem Sichanugrist
18ceed201b
Allow layout fallback when using layout
method
...
Rails will now use your default layout (such as "layouts/application") when you specify a layout with `:only` and `:except` condition, and those conditions fail.
For example, consider this snippet:
class CarsController
layout 'single_car', :only => :show
end
Rails will use 'layouts/single_car' when a request comes in `:show` action, and use 'layouts/application' (or 'layouts/cars', if exists) when a request comes in for any other actions.
2011-12-06 21:16:29 -05:00
José Valim
43d27e9105
Deprecate passing the template handler in the template name.
...
For example, calling hello.erb is now deprecated. Since Rails 3.0
passing the handler had no effect whatsover. This commit simply
deprecates such cases so we can clean up the code in later releases.
2011-09-22 15:37:38 +02:00
Santiago Pastorino
adef9764ae
Merge pull request #1644 from smartinez87/warns
...
Remove unused variable causing warning in 1.9.3
2011-06-10 18:35:14 -07:00
Sebastian Martinez
c4ddc6f693
Remove unused variable causing warning in 1.9.3
2011-06-10 21:10:06 -03:00
Neeraj Singh
277eb05733
class WithSymbolReturningString is not used anywhere in the test.
...
Secondly it seemed from the method that the intent was to test a case
where layout was declared in a symbol and the method named mention in
layout returns nil.
That case is already covered with class class WithSymbolReturningNil .
Also the case of SymbolReturningString is covered with the class
WithSymbol.
2011-06-08 20:22:13 -04:00
Neeraj Singh
7fff2f9fe3
Make test meaningful
...
If before_filter list was being called mistakenly then
the test should fail. However test will not fail because
second filter is assigning new values to @list. To truly
test that first before_filter is not called when it should
not be called then @list should not assigned value unconditionally.
This patch will make the test fail if first filter is called.
2011-06-08 10:51:10 -04:00
José Valim
47ac896936
Merge pull request #1549 from neerajdotname/rename_to_method_for_action
...
test name should reflect the name of the method
2011-06-08 00:41:55 -07:00
Neeraj Singh
8f3c9e87d9
test name should reflect the name of the method
...
that is actually being called
2011-06-08 03:17:27 -04:00
Neeraj Singh
cbfdd0df33
remove unused class from test
2011-06-08 02:54:19 -04:00
Aaron Patterson
36d6678690
removing usesless variable assignments
2011-01-18 15:52:56 -08:00
Nick Sutterer
db24701abe
process_action accepts multiple args, even with Callbacks.
2010-12-29 16:37:10 -08:00
artemave
ddd85ef9c6
#948 template_inheritance
2010-12-26 22:32:15 -08:00
José Valim
14f9904e0f
Avoid (@_var ||= nil) pattern by using initialize methods and ensuring everyone calls super as expected.
2010-09-29 11:18:31 +02:00
Emilio Tagua
0c08d8bd75
Fix more warnings by defining variables and using instance_variable_defined? instead instance_variable_get.
2010-09-28 18:25:52 -03:00
José Valim
66ef92272c
Add clear_helpers as a way to clean up all helpers added to this controller, maintaing just the helper with the same name as the controller.
2010-08-26 16:07:54 -03:00
Santiago Pastorino
b451de0d6d
Deletes trailing whitespaces (over text files only find * -type f -exec sed 's/[ \t]*$//' -i {} \;)
2010-08-14 04:12:33 -03:00
Piotr Sarnacki
84f0a0bc30
Reload action_methods in AbstractController after defining new method.
...
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-08-04 14:44:34 -03:00
Jeremy Kemper
81f398b804
Fix setting helpers_path to a string or pathname
2010-07-07 12:03:08 -07:00
José Valim
02399a1184
Ensure overwritten callbacks conditions in controllers work [ #4761 state:resolved] [ #3913 state:resolved]
2010-06-22 07:57:45 +02:00
Neeraj Singh
73f0e1a842
Use assert_respond_to because it has better error messaging
...
[#4628 state:resolved]
Signed-off-by: José Valim <jose.valim@gmail.com>
2010-05-18 02:12:06 +02:00
wycats
485512c50f
Whitespace
2010-04-04 19:58:16 -07:00
wycats
209fb5190b
render_to_string should have the identical signature as render
2010-04-04 19:58:15 -07:00
José Valim
2a12686832
Allow anything that responds to render to be given as :template and use find_template instead of find in views.
2010-03-12 14:25:10 +01:00
José Valim
bdf5096816
Move details to lookup_context and make resolvers use the cache key.
2010-03-08 20:39:15 +01:00
José Valim
ea68fe59c6
More refactoring on the views side of rendering.
2010-03-08 14:46:57 +01:00
José Valim
0a85380966
Finally moved the find template logic to the views.
2010-03-08 11:32:01 +01:00
José Valim
ffd8d753f1
Move layout lookup to views.
2010-03-08 02:04:18 +01:00
José Valim
c7564d74e8
Added template lookup responsible to hold all information used in template lookup.
2010-03-07 19:41:58 +01:00
José Valim
df85ab41c1
Renamed LocalizedCache to DetailsCache.
2010-02-24 22:17:26 +01:00
Mikel Lindsaar
2ebea1c02d
deOMGifying Railties, Active Support, and Action Pack
2010-01-31 09:46:30 -08:00
José Valim
cc2642b220
Added :format and :locale options to render.
2010-01-29 17:51:06 +01:00
José Valim
986a4e616b
Fix rendering of layouts.
2010-01-29 17:51:05 +01:00
José Valim
3f84091937
ActionMailer should depend just on AbstractController.
2010-01-29 17:51:05 +01:00
Jeremy Kemper
aef76d1e71
Merge remote branch 'fxn/master'
2010-01-26 15:38:49 -08:00
Xavier Noria
7d312e54ba
deletes no void files removal.rb and class_test.rb
2010-01-26 22:57:27 +01:00
José Valim
e274eb1df1
Bring layouts with proc back alive.
2010-01-26 16:34:25 +01:00
José Valim and Mikel Lindsaar
4e96442c4e
Merge branch 'master' of git://github.com/rails/rails
...
Conflicts:
actionmailer/lib/action_mailer/mail_helper.rb
railties/lib/rails/configuration.rb
2010-01-25 09:50:01 +11:00
José Valim
6545a68264
Fix failing tests after merge.
2010-01-24 15:08:06 +01:00
José Valim and Mikel Lindsaar
ddfc0725a0
Added AbstractController::Collector.
2010-01-23 10:23:06 +01:00