aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/test/abstract_controller
diff options
context:
space:
mode:
authorYehuda Katz <wycats@gmail.com>2009-08-07 15:00:12 -0300
committerYehuda Katz <wycats@gmail.com>2009-08-07 15:00:12 -0300
commit010a0c92eb573cd4c216c51371356adddfde11cf (patch)
tree96da751eaf21bcac20818440657b3f38a6687ffc /actionpack/test/abstract_controller
parent55575e21655023259d0dae22bc1b148b34168d92 (diff)
downloadrails-010a0c92eb573cd4c216c51371356adddfde11cf.tar.gz
rails-010a0c92eb573cd4c216c51371356adddfde11cf.tar.bz2
rails-010a0c92eb573cd4c216c51371356adddfde11cf.zip
Rename find_by_parts and find_by_parts? to find and exists?
Diffstat (limited to 'actionpack/test/abstract_controller')
-rw-r--r--actionpack/test/abstract_controller/abstract_controller_test.rb4
-rw-r--r--actionpack/test/abstract_controller/helper_test.rb2
2 files changed, 3 insertions, 3 deletions
diff --git a/actionpack/test/abstract_controller/abstract_controller_test.rb b/actionpack/test/abstract_controller/abstract_controller_test.rb
index 10b97f4eb4..9438a4dfc9 100644
--- a/actionpack/test/abstract_controller/abstract_controller_test.rb
+++ b/actionpack/test/abstract_controller/abstract_controller_test.rb
@@ -139,10 +139,10 @@ module AbstractController
private
def self.layout(formats)
begin
- view_paths.find_by_parts(name.underscore, {:formats => formats}, "layouts")
+ view_paths.find(name.underscore, {:formats => formats}, "layouts")
rescue ActionView::MissingTemplate
begin
- view_paths.find_by_parts("application", {:formats => formats}, "layouts")
+ view_paths.find("application", {:formats => formats}, "layouts")
rescue ActionView::MissingTemplate
end
end
diff --git a/actionpack/test/abstract_controller/helper_test.rb b/actionpack/test/abstract_controller/helper_test.rb
index cd6d4ee90e..e9a60c0307 100644
--- a/actionpack/test/abstract_controller/helper_test.rb
+++ b/actionpack/test/abstract_controller/helper_test.rb
@@ -4,7 +4,7 @@ module AbstractController
module Testing
class ControllerWithHelpers < AbstractController::Base
- include RenderingController
+ include AbstractController::RenderingController
include Helpers
def render(string)