Ignore integrity: false

Author: josh

lib/sprockets/rails/helper.rb

@@ -124,8 +124,11 @@ def asset_integrity(path, options = {})
       def javascript_include_tag(*sources)
         options = sources.extract_options!.stringify_keys
 
-        if options["integrity"] == true
+        case options["integrity"]
+        when true
           compute_integrity = options.delete("integrity")
+        when false, nil
+          options.delete("integrity")
         end
 
         if options["debug"] != false && request_debug_assets?
@@ -153,8 +156,11 @@ def javascript_include_tag(*sources)
       def stylesheet_link_tag(*sources)
         options = sources.extract_options!.stringify_keys
 
-        if options["integrity"] == true
+        case options["integrity"]
+        when true
           compute_integrity = options.delete("integrity")
+        when false, nil
+          options.delete("integrity")
         end
 
         if options["debug"] != false && request_debug_assets?

test/test_helper.rb

@@ -126,6 +126,10 @@ 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)
   end
 
   def test_stylesheet_link_tag_integrity
@@ -134,6 +138,8 @@ 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)
   end
 
   def test_javascript_path
@@ -312,6 +318,11 @@ def test_stylesheet_link_tag
   def test_javascript_include_tag_integrity
     super
 
+    assert_dom_equal %(<script src="/assets/foo-#{@foo_js_digest}.js"></script>),
+      @view.javascript_include_tag("foo", integrity: false)
+    assert_dom_equal %(<script src="/assets/foo-#{@foo_js_digest}.js"></script>),
+      @view.javascript_include_tag("foo", integrity: nil)
+
     assert_dom_equal %(<script src="/assets/foo-#{@foo_js_digest}.js" integrity="ni:///sha-256;TvVUHzSfftWg1rcfL6TIJ0XKEGrgLyEq6lEpcmrG9qs?ct=application/javascript"></script>),
       @view.javascript_include_tag("foo", integrity: true)
     assert_dom_equal %(<script src="/assets/foo-#{@foo_js_digest}.js" integrity="ni:///sha-256;TvVUHzSfftWg1rcfL6TIJ0XKEGrgLyEq6lEpcmrG9qs?ct=application/javascript"></script>),
@@ -326,6 +337,11 @@ def test_javascript_include_tag_integrity
   def test_stylesheet_link_tag_integrity
     super
 
+    assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
+      @view.stylesheet_link_tag("foo", integrity: false)
+    assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" />),
+      @view.stylesheet_link_tag("foo", integrity: nil)
+
     assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" integrity="ni:///sha-256;5YzTQPuOJz_EpeXfN_-v1sxsjAj_dw8q26abiHZM3A4?ct=text/css" />),
       @view.stylesheet_link_tag("foo", integrity: true)
     assert_dom_equal %(<link href="/assets/foo-#{@foo_css_digest}.css" media="screen" rel="stylesheet" integrity="ni:///sha-256;5YzTQPuOJz_EpeXfN_-v1sxsjAj_dw8q26abiHZM3A4?ct=text/css" />),