2 files changed, 39 insertions, 0 deletions
diff --git a/actionpack/test/controller/renderer_test.rb b/actionpack/test/controller/renderer_test.rb
index 866600b935..81b32a67b3 100644
--- a/actionpack/test/controller/renderer_test.rb
+++ b/actionpack/test/controller/renderer_test.rb
@@ -103,6 +103,20 @@ class RendererTest < ActiveSupport::TestCase
     assert_equal "true", content
   end
 
+  test "return valid asset url with defaults" do
+    renderer = ApplicationController.renderer
+    content  = renderer.render inline: "<%= asset_url 'asset.jpg' %>"
+
+    assert_equal "http://example.org/asset.jpg", content
+  end
+
+  test "return valid asset url when https is true" do
+    renderer = ApplicationController.renderer.new https: true
+    content  = renderer.render inline: "<%= asset_url 'asset.jpg' %>"
+
+    assert_equal "https://example.org/asset.jpg", content
+  end
+
   private
     def render
       @render ||= ApplicationController.renderer.method(:render)
diff --git a/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb b/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb
index 3b4ea96c4f..d6b501b3ac 100644
--- a/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb
+++ b/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb
@@ -1,5 +1,6 @@
 require "abstract_unit"
 require "action_dispatch/system_testing/test_helpers/screenshot_helper"
+require "capybara/dsl"
 
 class ScreenshotHelperTest < ActiveSupport::TestCase
   test "image path is saved in tmp directory" do
@@ -25,4 +26,28 @@ class ScreenshotHelperTest < ActiveSupport::TestCase
       end
     end
   end
+
+  test "rack_test driver does not support screenshot" do
+    begin
+      original_driver = Capybara.current_driver
+      Capybara.current_driver = :rack_test
+
+      new_test = ActionDispatch::SystemTestCase.new("x")
+      assert_not new_test.send(:supports_screenshot?)
+    ensure
+      Capybara.current_driver = original_driver
+    end
+  end
+
+  test "selenium driver supports screenshot" do
+    begin
+      original_driver = Capybara.current_driver
+      Capybara.current_driver = :selenium
+
+      new_test = ActionDispatch::SystemTestCase.new("x")
+      assert new_test.send(:supports_screenshot?)
+    ensure
+      Capybara.current_driver = original_driver
+    end
+  end
 end