govspeak 6.5.0 → 6.5.1

data/test/govspeak_button_test.rb

@@ -1,9 +1,9 @@
 # encoding: UTF-8
 
-require 'test_helper'
-require 'govspeak_test_helper'
+require "test_helper"
+require "govspeak_test_helper"
 
-require 'ostruct'
+require "ostruct"
 
 class GovspeakTest < Minitest::Test
   include GovspeakTestHelper
@@ -42,7 +42,7 @@ class GovspeakTest < Minitest::Test
 
   # Test that nothing renders when not given a link
   test_given_govspeak "{button}I shouldn't render a button{/button}" do
-    assert_html_output '<p>{button}I shouldn’t render a button{/button}</p>'
+    assert_html_output "<p>{button}I shouldn’t render a button{/button}</p>"
   end
 
   test_given_govspeak "Text before the button with line breaks \n\n\n{button}[Start Now](http://www.gov.uk){/button}\n\n\n test after the button" do

data/test/govspeak_contacts_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require "test_helper"
 
 class GovspeakContactsTest < Minitest::Test
   def build_contact(attrs = {})
@@ -19,8 +19,8 @@ class GovspeakContactsTest < Minitest::Test
               region: "London",
               postal_code: "WC2B 6NH",
               world_location: "United Kingdom",
-            }
-          ]
+            },
+          ],
         ),
         email_addresses: attrs.fetch(
           :email_addresses,
@@ -28,8 +28,8 @@ class GovspeakContactsTest < Minitest::Test
             {
               title: "",
               email: "people@digital.cabinet-office.gov.uk",
-            }
-          ]
+            },
+          ],
         ),
         phone_numbers: attrs.fetch(
           :phone_numbers,
@@ -37,23 +37,23 @@ class GovspeakContactsTest < Minitest::Test
             {
               title: "helpdesk",
               number: "+4412345 67890",
-            }
-          ]
+            },
+          ],
         ),
         contact_form_links: attrs.fetch(
           :contact_form_links,
           [
             {
-              link: "https://www.gov.uk/contact"
-            }
-          ]
-        )
-      }
+              link: "https://www.gov.uk/contact",
+            },
+          ],
+        ),
+      },
     }
   end
 
   def compress_html(html)
-    html.gsub(/[\n\r]+[\s]*/, '')
+    html.gsub(/[\n\r]+[\s]*/, "")
   end
 
   test "contact is rendered when present in options[:contacts]" do
@@ -136,7 +136,7 @@ class GovspeakContactsTest < Minitest::Test
       {
         street_address: "125 Kingsway",
         country_name: "United Kingdom",
-      }
+      },
     ])
     govspeak = "[Contact:4f3383e4-48a2-4461-a41d-f85ea8b89ba0]"
     rendered = Govspeak::Document.new(govspeak, contacts: [contact]).to_html
@@ -152,7 +152,7 @@ class GovspeakContactsTest < Minitest::Test
     contact = build_contact(post_addresses: [
       {
         street_address: "",
-      }
+      },
     ])
     govspeak = "[Contact:4f3383e4-48a2-4461-a41d-f85ea8b89ba0]"
     rendered = Govspeak::Document.new(govspeak, contacts: [contact]).to_html
@@ -163,7 +163,7 @@ class GovspeakContactsTest < Minitest::Test
     contact = build_contact(email_addresses: [
       {
         email: "",
-      }
+      },
     ])
     govspeak = "[Contact:4f3383e4-48a2-4461-a41d-f85ea8b89ba0]"
     rendered = Govspeak::Document.new(govspeak, contacts: [contact]).to_html
@@ -174,7 +174,7 @@ class GovspeakContactsTest < Minitest::Test
     contact = build_contact(contact_form_links: [
       {
         link: "",
-      }
+      },
     ])
     govspeak = "[Contact:4f3383e4-48a2-4461-a41d-f85ea8b89ba0]"
     rendered = Govspeak::Document.new(govspeak, contacts: [contact]).to_html
@@ -185,7 +185,7 @@ class GovspeakContactsTest < Minitest::Test
     contact = build_contact(phone_numbers: [
       {
         number: "",
-      }
+      },
     ])
     govspeak = "[Contact:4f3383e4-48a2-4461-a41d-f85ea8b89ba0]"
     rendered = Govspeak::Document.new(govspeak, contacts: [contact]).to_html

data/test/govspeak_extract_contact_content_ids_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require "test_helper"
 
 class GovspeakExtractContactContentIdsTest < Minitest::Test
   test "contact content ids can be extracted from govspeak" do

data/test/govspeak_images_bang_test.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
-require 'test_helper'
-require 'govspeak_test_helper'
+require "test_helper"
+require "govspeak_test_helper"
 
 class GovspeakImagesBangTest < Minitest::Test
   include GovspeakTestHelper
@@ -22,7 +22,7 @@ class GovspeakImagesBangTest < Minitest::Test
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
   end
@@ -32,7 +32,7 @@ class GovspeakImagesBangTest < Minitest::Test
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt '&amp;&quot;&lt;&gt;"></div>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
   end
@@ -48,49 +48,49 @@ class GovspeakImagesBangTest < Minitest::Test
   end
 
   test "!!n syntax adds image caption if given" do
-    given_govspeak "!!1", images: [Image.new(caption: 'My Caption & so on')] do
+    given_govspeak "!!1", images: [Image.new(caption: "My Caption & so on")] do
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>\n} +
         %{<figcaption><p>My Caption &amp; so on</p></figcaption>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
   end
 
   test "!!n syntax ignores a blank caption" do
-    given_govspeak "!!1", images: [Image.new(caption: '  ')] do
+    given_govspeak "!!1", images: [Image.new(caption: "  ")] do
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
   end
 
   test "¡¡n syntax adds image credit if given" do
-    given_govspeak "!!1", images: [Image.new(credit: 'My Credit & so on')] do
+    given_govspeak "!!1", images: [Image.new(credit: "My Credit & so on")] do
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>\n} +
         %{<figcaption><p>Image credit: My Credit &amp; so on</p></figcaption>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
   end
 
   test "!!n syntax ignores a blank credit" do
-    given_govspeak "!!1", images: [Image.new(credit: '  ')] do
+    given_govspeak "!!1", images: [Image.new(credit: "  ")] do
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
   end
 
   test "!!n syntax adds image caption and credit if given" do
-    given_govspeak "!!1", images: [Image.new(caption: 'My Caption & so on', credit: 'My Credit & so on')] do
+    given_govspeak "!!1", images: [Image.new(caption: "My Caption & so on", credit: "My Credit & so on")] do
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>\n} +
@@ -98,7 +98,7 @@ class GovspeakImagesBangTest < Minitest::Test
           %{<p>My Caption &amp; so on</p>\n} +
           %{<p>Image credit: My Credit &amp; so on</p>} +
         %{</figcaption>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
   end

data/test/govspeak_images_test.rb

@@ -1,7 +1,7 @@
 # encoding: UTF-8
 
-require 'test_helper'
-require 'govspeak_test_helper'
+require "test_helper"
+require "govspeak_test_helper"
 
 class GovspeakImagesTest < Minitest::Test
   include GovspeakTestHelper
@@ -18,7 +18,7 @@ class GovspeakImagesTest < Minitest::Test
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
   end
@@ -28,7 +28,7 @@ class GovspeakImagesTest < Minitest::Test
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt '&amp;&quot;&lt;&gt;"></div>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
   end
@@ -39,49 +39,49 @@ class GovspeakImagesTest < Minitest::Test
   end
 
   test "Image:image-id syntax adds image caption if given" do
-    given_govspeak "[Image:image-id]", images: [build_image(caption: 'My Caption & so on')] do
+    given_govspeak "[Image:image-id]", images: [build_image(caption: "My Caption & so on")] do
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>\n} +
         %{<figcaption><p>My Caption &amp; so on</p></figcaption>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
   end
 
   test "Image:image-id syntax ignores a blank caption" do
-    given_govspeak "[Image:image-id]", images: [build_image(caption: '  ')] do
+    given_govspeak "[Image:image-id]", images: [build_image(caption: "  ")] do
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
   end
 
   test "Image:image-id syntax adds image credit if given" do
-    given_govspeak "[Image:image-id]", images: [build_image(credit: 'My Credit & so on')] do
+    given_govspeak "[Image:image-id]", images: [build_image(credit: "My Credit & so on")] do
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>\n} +
         %{<figcaption><p>Image credit: My Credit &amp; so on</p></figcaption>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
   end
 
   test "Image:image-id syntax ignores a blank credit" do
-    given_govspeak "[Image:image-id]", images: [build_image(credit: '  ')] do
+    given_govspeak "[Image:image-id]", images: [build_image(credit: "  ")] do
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
   end
 
   test "Image:image-id syntax adds image caption and credit if given" do
-    given_govspeak "[Image:image-id]", images: [build_image(caption: 'My Caption & so on', credit: 'My Credit & so on')] do
+    given_govspeak "[Image:image-id]", images: [build_image(caption: "My Caption & so on", credit: "My Credit & so on")] do
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>\n} +
@@ -89,7 +89,7 @@ class GovspeakImagesTest < Minitest::Test
           %{<p>My Caption &amp; so on</p>\n} +
           %{<p>Image credit: My Credit &amp; so on</p>} +
         %{</figcaption>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
   end
@@ -103,7 +103,7 @@ class GovspeakImagesTest < Minitest::Test
       assert_html_output(
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
-        %{</figure>}
+        %{</figure>},
       )
     end
 
@@ -112,7 +112,7 @@ class GovspeakImagesTest < Minitest::Test
         %{<figure class="image embedded">} +
         %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
         %{</figure>\n} +
-        %{<p>some text</p>}
+        %{<p>some text</p>},
       )
     end
   end

data/test/govspeak_link_test.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'test_helper'
+require "test_helper"
 
 class GovspeakLinkTest < Minitest::Test
   test "embedded link with link provided" do

data/test/govspeak_structured_headers_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class GovspeakStructuredHeadersTest < Minitest::Test
   def document_body
@@ -90,7 +90,7 @@ class GovspeakStructuredHeadersTest < Minitest::Test
               text: "Sub sub heading 2.2.1",
               level: 4,
               id: "sub-sub-heading-221",
-              headers: []
+              headers: [],
             },
           ],
         },

data/test/govspeak_table_with_headers_test.rb

@@ -1,4 +1,4 @@
-require 'test_helper'
+require "test_helper"
 
 class GovspeakTableWithHeadersTest < Minitest::Test
   def expected_outcome

data/test/govspeak_test.rb

@@ -1,9 +1,9 @@
 # encoding: UTF-8
 
-require 'test_helper'
-require 'govspeak_test_helper'
+require "test_helper"
+require "govspeak_test_helper"
 
-require 'ostruct'
+require "ostruct"
 
 class GovspeakTest < Minitest::Test
   include GovspeakTestHelper
@@ -20,7 +20,7 @@ class GovspeakTest < Minitest::Test
 
   test "strips forbidden unicode characters" do
     rendered = Govspeak::Document.new(
-      "this is text with forbidden characters \ufffc\u2028\ufeff\u202c\u202a"
+      "this is text with forbidden characters \u0008\u000b\ufffe\u{2ffff}\u{5fffe}",
     ).to_html
     assert_equal "<p>this is text with forbidden characters</p>\n", rendered
   end
@@ -44,17 +44,17 @@ class GovspeakTest < Minitest::Test
 ## Medium title
 }
     assert_equal [
-      Govspeak::Header.new('Big title', 1, 'big-title'),
-      Govspeak::Header.new('Small subtitle', 3, 'small-subtitle'),
-      Govspeak::Header.new('Medium title', 2, 'medium-title')
+      Govspeak::Header.new("Big title", 1, "big-title"),
+      Govspeak::Header.new("Small subtitle", 3, "small-subtitle"),
+      Govspeak::Header.new("Medium title", 2, "medium-title"),
     ], document.headers
   end
 
   test "extracts different ids for duplicate headers" do
     document = Govspeak::Document.new("## Duplicate header\n\n## Duplicate header")
     assert_equal [
-      Govspeak::Header.new('Duplicate header', 2, 'duplicate-header'),
-      Govspeak::Header.new('Duplicate header', 2, 'duplicate-header-1')
+      Govspeak::Header.new("Duplicate header", 2, "duplicate-header"),
+      Govspeak::Header.new("Duplicate header", 2, "duplicate-header-1"),
     ], document.headers
   end
 
@@ -76,10 +76,10 @@ class GovspeakTest < Minitest::Test
 </div>
 }
     assert_equal [
-      Govspeak::Header.new('First title', 1, 'first-title'),
-      Govspeak::Header.new('Nested subtitle', 2, 'nested-subtitle'),
-      Govspeak::Header.new('Double nested subtitle', 3, 'double-nested-subtitle'),
-      Govspeak::Header.new('Second double subtitle', 3, 'second-double-subtitle')
+      Govspeak::Header.new("First title", 1, "first-title"),
+      Govspeak::Header.new("Nested subtitle", 2, "nested-subtitle"),
+      Govspeak::Header.new("Double nested subtitle", 3, "double-nested-subtitle"),
+      Govspeak::Header.new("Second double subtitle", 3, "second-double-subtitle"),
     ], document.headers
   end
 
@@ -90,8 +90,8 @@ class GovspeakTest < Minitest::Test
 ## Second title {#special}
 }
     assert_equal [
-      Govspeak::Header.new('First title', 1, 'first-title'),
-      Govspeak::Header.new('Second title', 2, 'special'),
+      Govspeak::Header.new("First title", 1, "first-title"),
+      Govspeak::Header.new("Second title", 2, "special"),
     ], document.headers
   end
 
@@ -360,7 +360,7 @@ Teston
   # TODO: review whether we should require closing symbols for these extensions
   #       need to check all existing content.
   test_given_govspeak "xaa" do
-    assert_html_output '<p>xaa</p>'
+    assert_html_output "<p>xaa</p>"
     assert_text_output "xaa"
   end
 
@@ -639,12 +639,12 @@ Teston
       }
   end
 
-  test 'sanitize source input by default' do
+  test "sanitize source input by default" do
     document = Govspeak::Document.new("<script>doBadThings();</script>")
     assert_equal "", document.to_html.strip
   end
 
-  test 'it can have sanitizing disabled' do
+  test "it can have sanitizing disabled" do
     document = Govspeak::Document.new("<script>doGoodThings();</script>", sanitize: false)
     assert_equal "<script>doGoodThings();</script>", document.to_html.strip
   end