1 files changed, 68 insertions, 43 deletions
diff --git a/actionpack/test/controller/view_paths_test.rb b/actionpack/test/controller/view_paths_test.rb
index 0516da32d8..1b4c1fae2f 100644
--- a/actionpack/test/controller/view_paths_test.rb
+++ b/actionpack/test/controller/view_paths_test.rb
@@ -1,30 +1,30 @@
 require 'abstract_unit'
 
 class ViewLoadPathsTest < Test::Unit::TestCase
-  
   LOAD_PATH_ROOT = File.join(File.dirname(__FILE__), '..', 'fixtures')
 
-  ActionController::Base.view_paths = [ LOAD_PATH_ROOT ]
+  ActionController::Base.view_paths = [LOAD_PATH_ROOT]
 
   class TestController < ActionController::Base
     def self.controller_path() "test" end
     def rescue_action(e) raise end
-    
+
     before_filter :add_view_path, :only => :hello_world_at_request_time
-    
+
     def hello_world() end
     def hello_world_at_request_time() render(:action => 'hello_world') end
+
     private
-    def add_view_path
-      prepend_view_path "#{LOAD_PATH_ROOT}/override"
-    end
+      def add_view_path
+        prepend_view_path "#{LOAD_PATH_ROOT}/override"
+      end
   end
-  
+
   class Test::SubController < ActionController::Base
     layout 'test/sub'
     def hello_world; render(:template => 'test/hello_world'); end
   end
-  
+
   def setup
     TestController.view_paths = nil
 
@@ -41,68 +41,80 @@ class ViewLoadPathsTest < Test::Unit::TestCase
     @last_message = nil
     ActiveSupport::Deprecation.behavior = Proc.new { |message, callback| @last_message = message }
   end
-  
+
   def teardown
     ActiveSupport::Deprecation.behavior = @old_behavior
   end
-  
+
   def test_template_load_path_was_set_correctly
-    assert_equal [ LOAD_PATH_ROOT ], @controller.view_paths
+    assert_equal [ LOAD_PATH_ROOT ], @controller.view_paths.map(&:to_s)
   end
-  
+
   def test_controller_appends_view_path_correctly
     @controller.append_view_path 'foo'
-    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths
-    
+    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths.map(&:to_s)
+
     @controller.append_view_path(%w(bar baz))
-    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths
+    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
+
+    @controller.append_view_path(LOAD_PATH_ROOT)
+    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
+
+    @controller.append_view_path([LOAD_PATH_ROOT])
+    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
   end
-  
+
   def test_controller_prepends_view_path_correctly
     @controller.prepend_view_path 'baz'
-    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths
-    
+    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
+
     @controller.prepend_view_path(%w(foo bar))
-    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths
+    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
+
+    @controller.prepend_view_path(LOAD_PATH_ROOT)
+    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
+
+    @controller.prepend_view_path([LOAD_PATH_ROOT])
+    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
   end
-  
+
   def test_template_appends_view_path_correctly
     @controller.instance_variable_set :@template, ActionView::Base.new(TestController.view_paths, {}, @controller)
     class_view_paths = TestController.view_paths
 
     @controller.append_view_path 'foo'
-    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths
-    
+    assert_equal [LOAD_PATH_ROOT, 'foo'], @controller.view_paths.map(&:to_s)
+
     @controller.append_view_path(%w(bar baz))
-    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths
+    assert_equal [LOAD_PATH_ROOT, 'foo', 'bar', 'baz'], @controller.view_paths.map(&:to_s)
     assert_equal class_view_paths, TestController.view_paths
   end
-  
+
   def test_template_prepends_view_path_correctly
     @controller.instance_variable_set :@template, ActionView::Base.new(TestController.view_paths, {}, @controller)
     class_view_paths = TestController.view_paths
-    
+
     @controller.prepend_view_path 'baz'
-    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths
-    
+    assert_equal ['baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
+
     @controller.prepend_view_path(%w(foo bar))
-    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths
+    assert_equal ['foo', 'bar', 'baz', LOAD_PATH_ROOT], @controller.view_paths.map(&:to_s)
     assert_equal class_view_paths, TestController.view_paths
   end
-  
+
   def test_view_paths
     get :hello_world
     assert_response :success
     assert_equal "Hello world!", @response.body
   end
-  
+
   def test_view_paths_override
     TestController.prepend_view_path "#{LOAD_PATH_ROOT}/override"
     get :hello_world
     assert_response :success
     assert_equal "Hello overridden world!", @response.body
   end
-  
+
   def test_view_paths_override_for_layouts_in_controllers_with_a_module
     @controller = Test::SubController.new
     Test::SubController.view_paths = [ "#{LOAD_PATH_ROOT}/override", LOAD_PATH_ROOT, "#{LOAD_PATH_ROOT}/override2" ]
@@ -110,31 +122,44 @@ class ViewLoadPathsTest < Test::Unit::TestCase
     assert_response :success
     assert_equal "layout: Hello overridden world!", @response.body
   end
-  
+
   def test_view_paths_override_at_request_time
     get :hello_world_at_request_time
     assert_response :success
     assert_equal "Hello overridden world!", @response.body
   end
-  
+
   def test_inheritance
     original_load_paths = ActionController::Base.view_paths
-    
+
     self.class.class_eval %{
       class A < ActionController::Base; end
       class B < A; end
       class C < ActionController::Base; end
     }
-  
-    A.view_paths = [ 'a/path' ]
-    
-    assert_equal [ 'a/path' ],        A.view_paths
-    assert_equal A.view_paths,   B.view_paths
+
+    A.view_paths = ['a/path']
+
+    assert_equal ['a/path'], A.view_paths.map(&:to_s)
+    assert_equal A.view_paths, B.view_paths
     assert_equal original_load_paths, C.view_paths
-    
+
     C.view_paths = []
     assert_nothing_raised { C.view_paths << 'c/path' }
-    assert_equal ['c/path'], C.view_paths
+    assert_equal ['c/path'], C.view_paths.map(&:to_s)
+  end
+
+  def test_find_template_file_for_path
+    assert_equal "test/hello_world.erb", @controller.view_paths.find_template_file_for_path("test/hello_world.erb").to_s
+    assert_equal "test/hello.builder", @controller.view_paths.find_template_file_for_path("test/hello.builder").to_s
+    assert_equal nil, @controller.view_paths.find_template_file_for_path("test/missing.erb")
+  end
+
+  def test_view_paths_find_template_file_for_path
+    assert_equal "test/formatted_html_erb.html.erb", @controller.view_paths.find_template_file_for_path("test/formatted_html_erb.html").to_s
+    assert_equal "test/formatted_xml_erb.xml.erb", @controller.view_paths.find_template_file_for_path("test/formatted_xml_erb.xml").to_s
+    assert_equal "test/hello_world.erb", @controller.view_paths.find_template_file_for_path("test/hello_world.html").to_s
+    assert_equal "test/hello_world.erb", @controller.view_paths.find_template_file_for_path("test/hello_world.xml").to_s
+    assert_equal nil, @controller.view_paths.find_template_file_for_path("test/missing.html")
   end
-  
 end