1 files changed, 74 insertions, 1 deletions
diff --git a/actionpack/test/controller/action_pack_assertions_test.rb b/actionpack/test/controller/action_pack_assertions_test.rb
index ca542eb7e2..ba4cffcd3e 100644
--- a/actionpack/test/controller/action_pack_assertions_test.rb
+++ b/actionpack/test/controller/action_pack_assertions_test.rb
@@ -39,6 +39,8 @@ class ActionPackAssertionsController < ActionController::Base
 
   def redirect_external() redirect_to "http://www.rubyonrails.org"; end
 
+  def redirect_external_protocol_relative() redirect_to "//www.rubyonrails.org"; end
+
   def response404() head '404 AWOL' end
 
   def response500() head '500 Sorry' end
@@ -96,6 +98,14 @@ class ActionPackAssertionsController < ActionController::Base
     raise "post" if request.post?
     render :text => "request method: #{request.env['REQUEST_METHOD']}"
   end
+
+  def render_file_absolute_path
+    render :file => File.expand_path('../../../README.rdoc', __FILE__)
+  end
+
+  def render_file_relative_path
+    render :file => 'README.rdoc'
+  end
 end
 
 # Used to test that assert_response includes the exception message
@@ -142,6 +152,16 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
     assert_tag :content => "/action_pack_assertions/flash_me"
   end
 
+  def test_render_file_absolute_path
+    get :render_file_absolute_path
+    assert_match(/\A= Action Pack/, @response.body)
+  end
+
+  def test_render_file_relative_path
+    get :render_file_relative_path
+    assert_match(/\A= Action Pack/, @response.body)
+  end
+
   def test_get_request
     assert_raise(RuntimeError) { get :raise_exception_on_get }
     get :raise_exception_on_post
@@ -240,6 +260,19 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
     end
   end
 
+  def test_assert_redirect_failure_message_with_protocol_relative_url
+    begin
+      process :redirect_external_protocol_relative
+      assert_redirected_to "/foo"
+    rescue ActiveSupport::TestCase::Assertion => ex
+      assert_no_match(
+        /#{request.protocol}#{request.host}\/\/www.rubyonrails.org/,
+        ex.message,
+        'protocol relative url was incorrectly normalized'
+      )
+    end
+  end
+
   def test_template_objects_exist
     process :assign_this
     assert !@controller.instance_variable_defined?(:"@hi")
@@ -259,7 +292,7 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
   def test_flash_exist
     process :flash_me
     assert flash.any?
-    assert_present flash['hello']
+    assert flash['hello'].present?
   end
 
   def test_flash_does_not_exist
@@ -291,6 +324,9 @@ class ActionPackAssertionsControllerTest < ActionController::TestCase
 
     process :redirect_external
     assert_equal 'http://www.rubyonrails.org', @response.redirect_url
+
+    process :redirect_external_protocol_relative
+    assert_equal '//www.rubyonrails.org', @response.redirect_url
   end
 
   def test_no_redirect_url
@@ -430,11 +466,34 @@ end
 class AssertTemplateTest < ActionController::TestCase
   tests ActionPackAssertionsController
 
+  def test_with_invalid_hash_keys_raises_argument_error
+    assert_raise(ArgumentError) do
+      assert_template foo: "bar"
+    end
+  end
+
   def test_with_partial
     get :partial
     assert_template :partial => '_partial'
   end
 
+  def test_file_with_absolute_path_success
+    get :render_file_absolute_path
+    assert_template :file => File.expand_path('../../../README.rdoc', __FILE__)
+  end
+
+  def test_file_with_relative_path_success
+    get :render_file_relative_path
+    assert_template :file => 'README.rdoc'
+  end
+
+  def test_with_file_failure
+    get :render_file_absolute_path
+    assert_raise(ActiveSupport::TestCase::Assertion) do
+      assert_template :file => 'test/hello_world'
+    end
+  end
+
   def test_with_nil_passes_when_no_template_rendered
     get :nothing
     assert_template nil
@@ -447,6 +506,20 @@ class AssertTemplateTest < ActionController::TestCase
     end
   end
 
+  def test_with_empty_string_fails_when_template_rendered
+    get :hello_world
+    assert_raise(ActiveSupport::TestCase::Assertion) do
+      assert_template ""
+    end
+  end
+
+  def test_with_empty_string_fails_when_no_template_rendered
+    get :nothing
+    assert_raise(ActiveSupport::TestCase::Assertion) do
+      assert_template ""
+    end
+  end
+
   def test_passes_with_correct_string
     get :hello_world
     assert_template 'hello_world'