Ignore integrity unless request is ssl

Author: josh

lib/sprockets/rails/helper.rb

@@ -124,11 +124,13 @@ def asset_integrity(path, options = {})
       def javascript_include_tag(*sources)
         options = sources.extract_options!.stringify_keys
 
+        unless request_ssl?
+          options.delete("integrity")
+        end
+
         case options["integrity"]
-        when true
+        when true, false, nil
           compute_integrity = options.delete("integrity")
-        when false, nil
-          options.delete("integrity")
         end
 
         if options["debug"] != false && request_debug_assets?
@@ -156,11 +158,13 @@ def javascript_include_tag(*sources)
       def stylesheet_link_tag(*sources)
         options = sources.extract_options!.stringify_keys
 
+        unless request_ssl?
+          options.delete("integrity")
+        end
+
         case options["integrity"]
-        when true
+        when true, false, nil
           compute_integrity = options.delete("integrity")
-        when false, nil
-          options.delete("integrity")
         end
 
         if options["debug"] != false && request_debug_assets?
@@ -183,6 +187,10 @@ def stylesheet_link_tag(*sources)
       end
 
       protected
+        def request_ssl?
+          respond_to?(:request) && self.request && self.request.ssl?
+        end
+
         # Enable split asset debugging. Eventually will be deprecated
         # and replaced by source maps in Sprockets 3.x.
         def request_debug_assets?

test/test_helper.rb

@@ -172,6 +172,44 @@ def test_stylesheet_path
   end
 end
 
+class NoSSLHelperTest < NoHostHelperTest
+  def setup
+    super
+
+    @view.request = nil
+  end
+
+  def test_javascript_include_tag_integrity
+    assert_dom_equal %(<script src="/javascripts/static.js"></script>),
+      @view.javascript_include_tag("static", integrity: true)
+    assert_dom_equal %(<script src="/javascripts/static.js"></script>),
+      @view.javascript_include_tag("static", integrity: false)
+    assert_dom_equal %(<script src="/javascripts/static.js"></script>),
+      @view.javascript_include_tag("static", integrity: nil)
+
+    assert_dom_equal %(<script src="/javascripts/static.js"></script>),
+      @view.javascript_include_tag("static", integrity: "ni:///sha-256;TvVUHzSfftWg1rcfL6TIJ0XKEGrgLyEq6lEpcmrG9qs?ct=application/javascript")
+
+    assert_dom_equal %(<script src="/assets/foo.js"></script>),
+      @view.javascript_include_tag("foo", integrity: true)
+  end
+
+  def test_stylesheet_link_tag_integrity
+    assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
+      @view.stylesheet_link_tag("static", integrity: true)
+    assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
+      @view.stylesheet_link_tag("static", integrity: false)
+    assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
+      @view.stylesheet_link_tag("static", integrity: nil)
+
+    assert_dom_equal %(<link href="/stylesheets/static.css" media="screen" rel="stylesheet" />),
+      @view.stylesheet_link_tag("static", integrity: "ni:///sha-256;5YzTQPuOJz_EpeXfN_-v1sxsjAj_dw8q26abiHZM3A4?ct=text/css")
+
+    assert_dom_equal %(<link href="/assets/foo.css" media="screen" rel="stylesheet" />),
+      @view.stylesheet_link_tag("foo", integrity: true)
+  end
+end
+
 class RelativeHostHelperTest < HelperTest
   def setup
     super