diff options
| author | Xavier Noria <fxn@hashref.com> | 2010-05-04 19:36:26 +0200 |
|---|---|---|
| committer | Xavier Noria <fxn@hashref.com> | 2010-05-04 19:36:26 +0200 |
| commit | 583b60d109522907020700225f1c739737297a2d (patch) | |
| tree | a36d986cbbb73c94d217cbe86c9af7ef97a89567 /actionpack/test/controller/layout_test.rb | |
| parent | 44a98967676492995d19fd4d541dbc9d52bf6b53 (diff) | |
| parent | 0dd3b4630fea4bd4d4010b7096c9ee79d34c4501 (diff) | |
| download | rails-583b60d109522907020700225f1c739737297a2d.tar.gz rails-583b60d109522907020700225f1c739737297a2d.tar.bz2 rails-583b60d109522907020700225f1c739737297a2d.zip | |
Merge remote branch 'rails/master'
Diffstat (limited to 'actionpack/test/controller/layout_test.rb')
| -rw-r--r-- | actionpack/test/controller/layout_test.rb | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/actionpack/test/controller/layout_test.rb b/actionpack/test/controller/layout_test.rb index 48be7571ea..165c61ffad 100644 --- a/actionpack/test/controller/layout_test.rb +++ b/actionpack/test/controller/layout_test.rb @@ -10,8 +10,6 @@ ActionView::Template::register_template_handler :mab, ActionController::Base.view_paths = [ File.dirname(__FILE__) + '/../fixtures/layout_tests/' ] -require "fixture_template" - class LayoutTest < ActionController::Base def self.controller_path; 'views' end def self._implied_layout_name; to_s.underscore.gsub(/_controller$/, '') ; end |