govspeak 6.5.0 → 6.5.5

data/test/govspeak_extract_contact_content_ids_test.rb

@@ -1,6 +1,4 @@
-# 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,5 @@
-# encoding: UTF-8
-
-require 'test_helper'
-require 'govspeak_test_helper'
+require "test_helper"
+require "govspeak_test_helper"
 
 class GovspeakImagesBangTest < Minitest::Test
   include GovspeakTestHelper
@@ -20,85 +18,85 @@ class GovspeakImagesBangTest < Minitest::Test
   test "!!n syntax renders an image in options[:images]" do
     given_govspeak "!!1", images: [Image.new] do
       assert_html_output(
-        %{<figure class="image embedded">} +
-        %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
-        %{</figure>}
+        %(<figure class="image embedded">) +
+        %(<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>) +
+        %(</figure>),
       )
     end
   end
 
   test "!!n syntax escapes alt text" do
-    given_govspeak "!!1", images: [Image.new(alt_text: %{my alt '&"<>})] do
+    given_govspeak "!!1", images: [Image.new(alt_text: %(my alt '&"<>))] do
       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 class="image embedded">) +
+        %(<div class="img"><img src="http://example.com/image.jpg" alt="my alt '&amp;&quot;&lt;&gt;"></div>) +
+        %(</figure>),
       )
     end
   end
 
   test "!!n syntax renders nothing if not found" do
     doc = Govspeak::Document.new("!!1")
-    assert_equal %{\n}, doc.to_html
+    assert_equal %(\n), doc.to_html
   end
 
   test "Image:image-id syntax renders nothing" do
     doc = Govspeak::Document.new("[Image:another-id]", images: [Image.new])
-    assert_equal %{\n}, doc.to_html
+    assert_equal %(\n), doc.to_html
   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 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>),
       )
     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 class="image embedded">) +
+        %(<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>) +
+        %(</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 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>),
       )
     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 class="image embedded">) +
+        %(<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>) +
+        %(</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} +
-        %{<figcaption>} +
-          %{<p>My Caption &amp; so on</p>\n} +
-          %{<p>Image credit: My Credit &amp; so on</p>} +
-        %{</figcaption>} +
-        %{</figure>}
+        %(<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>\n) +
+          %(<p>Image credit: My Credit &amp; so on</p>) +
+        %(</figcaption>) +
+        %(</figure>),
       )
     end
   end

data/test/govspeak_images_test.rb

@@ -1,7 +1,5 @@
-# encoding: UTF-8
-
-require 'test_helper'
-require 'govspeak_test_helper'
+require "test_helper"
+require "govspeak_test_helper"
 
 class GovspeakImagesTest < Minitest::Test
   include GovspeakTestHelper
@@ -16,80 +14,80 @@ class GovspeakImagesTest < Minitest::Test
   test "Image:image-id syntax renders an image in options[:images]" do
     given_govspeak "[Image:image-id]", images: [build_image] do
       assert_html_output(
-        %{<figure class="image embedded">} +
-        %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
-        %{</figure>}
+        %(<figure class="image embedded">) +
+        %(<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>) +
+        %(</figure>),
       )
     end
   end
 
   test "Image:image-id syntax escapes alt text" do
-    given_govspeak "[Image:image-id]", images: [build_image(alt_text: %{my alt '&"<>})] do
+    given_govspeak "[Image:image-id]", images: [build_image(alt_text: %(my alt '&"<>))] do
       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 class="image embedded">) +
+        %(<div class="img"><img src="http://example.com/image.jpg" alt="my alt '&amp;&quot;&lt;&gt;"></div>) +
+        %(</figure>),
       )
     end
   end
 
   test "Image:image-id syntax renders nothing if not found" do
     doc = Govspeak::Document.new("[Image:another-id]")
-    assert_equal %{\n}, doc.to_html
+    assert_equal %(\n), doc.to_html
   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 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>),
       )
     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 class="image embedded">) +
+        %(<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>) +
+        %(</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 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>),
       )
     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 class="image embedded">) +
+        %(<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>) +
+        %(</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} +
-        %{<figcaption>} +
-          %{<p>My Caption &amp; so on</p>\n} +
-          %{<p>Image credit: My Credit &amp; so on</p>} +
-        %{</figcaption>} +
-        %{</figure>}
+        %(<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>\n) +
+          %(<p>Image credit: My Credit &amp; so on</p>) +
+        %(</figcaption>) +
+        %(</figure>),
       )
     end
   end
@@ -101,18 +99,18 @@ class GovspeakImagesTest < Minitest::Test
 
     given_govspeak "[Image:image-id]", images: [build_image] do
       assert_html_output(
-        %{<figure class="image embedded">} +
-        %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
-        %{</figure>}
+        %(<figure class="image embedded">) +
+        %(<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>) +
+        %(</figure>),
       )
     end
 
     given_govspeak "[Image:image-id] some text", images: [build_image] do
       assert_html_output(
-        %{<figure class="image embedded">} +
-        %{<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>} +
-        %{</figure>\n} +
-        %{<p>some text</p>}
+        %(<figure class="image embedded">) +
+        %(<div class="img"><img src="http://example.com/image.jpg" alt="my alt"></div>) +
+        %(</figure>\n) +
+        %(<p>some text</p>),
       )
     end
   end

data/test/govspeak_link_extractor_test.rb

@@ -40,7 +40,7 @@ class GovspeakLinkExtractorTest < Minitest::Test
   end
 
   test "Links are extracted from the body" do
-    expected_links = %w{http://www.example.com http://www.gov.com /cais-trwydded-yrru-dros-dro http://www.example.com/from/html}
+    expected_links = %w[http://www.example.com http://www.gov.com /cais-trwydded-yrru-dros-dro http://www.example.com/from/html]
     assert_equal expected_links, links
   end
 

data/test/govspeak_link_test.rb

@@ -1,6 +1,4 @@
-# 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,8 +1,8 @@
-require 'test_helper'
+require "test_helper"
 
 class GovspeakStructuredHeadersTest < Minitest::Test
   def document_body
-    %{
+    %(
 ## Heading 1
 
 ## Heading 2
@@ -29,7 +29,7 @@ class GovspeakStructuredHeadersTest < Minitest::Test
 
 ## Heading 5
 
-    }
+    )
   end
 
   def doc
@@ -90,14 +90,15 @@ class GovspeakStructuredHeadersTest < Minitest::Test
               text: "Sub sub heading 2.2.1",
               level: 4,
               id: "sub-sub-heading-221",
-              headers: []
+              headers: [],
             },
           ],
         },
         {
           text: "Sub heading 2.3",
-          level: 3, id: "sub-heading-23",
-          headers: []
+          level: 3,
+          id: "sub-heading-23",
+          headers: [],
         },
       ],
     }

data/test/govspeak_table_with_headers_test.rb

@@ -1,8 +1,8 @@
-require 'test_helper'
+require "test_helper"
 
 class GovspeakTableWithHeadersTest < Minitest::Test
   def expected_outcome
-    %{
+    %(
 <table>
   <thead>
     <tr>
@@ -24,11 +24,11 @@ class GovspeakTableWithHeadersTest < Minitest::Test
     </tr>
   </tbody>
 </table>
-}
+)
   end
 
   def expected_outcome_with_hashes_in_cell_contents
-    %{
+    %(
 <table>
   <thead>
     <tr>
@@ -50,11 +50,11 @@ class GovspeakTableWithHeadersTest < Minitest::Test
     </tr>
   </tbody>
 </table>
-}
+)
   end
 
   def expected_outcome_for_table_with_alignments
-    %{
+    %(
 <table>
   <thead>
     <tr>
@@ -76,11 +76,11 @@ class GovspeakTableWithHeadersTest < Minitest::Test
     </tr>
   </tbody>
 </table>
-}
+)
   end
 
   def expected_outcome_for_table_headers_in_the_wrong_place
-    %{
+    %(
 <table>
   <thead>
     <tr>
@@ -102,11 +102,11 @@ class GovspeakTableWithHeadersTest < Minitest::Test
     </tr>
   </tbody>
 </table>
-}
+)
   end
 
   def expected_outcome_for_table_with_blank_table_headers
-    %{
+    %(
 <table>
   <thead>
     <tr>
@@ -128,52 +128,95 @@ class GovspeakTableWithHeadersTest < Minitest::Test
     </tr>
   </tbody>
 </table>
-}
+)
+  end
+
+  def expected_outcome_for_table_headers_containing_links
+    %(
+<table>
+  <thead>
+    <tr>
+      <td></td>
+      <th scope="col">Second Column</th>
+      <th scope="col">Third Column</th>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <th scope="row">Link contained in header <a rel="external" href="http://google.com">link1</a>
+</th>
+      <td>Cell</td>
+      <td>Cell</td>
+    </tr>
+    <tr>
+      <th scope="row">No link</th>
+      <td>Cell</td>
+      <td>Cell</td>
+    </tr>
+    <tr>
+      <th scope="row"><a rel="external" href="http://www.bbc.co.uk">Whole header is link</a>
+</th>
+      <td>Cell</td>
+      <td>Cell</td>
+    </tr>
+  </tbody>
+</table>
+)
   end
 
   def document_body_with_hashes_for_all_headers
-    @document_body_with_hashes_for_all_headers ||= Govspeak::Document.new(%{
+    @document_body_with_hashes_for_all_headers ||= Govspeak::Document.new(%(
 |                 |# Second Column  |# Third Column       |
 | --------------- | --------------- | ------------------- |
 |# First row      | Cell            | Cell                |
 |# Second row     | Cell            | Cell                |
-})
+))
   end
 
   def document_body_with_hashes_for_row_headers
-    @document_body_with_hashes_for_row_headers ||= Govspeak::Document.new(%{
+    @document_body_with_hashes_for_row_headers ||= Govspeak::Document.new(%(
 |                 | Second Column   | Third Column        |
 | --------------- | --------------- | ------------------- |
 |# First row      | Cell            | Cell                |
 |# Second row     | Cell            | Cell                |
-})
+))
   end
 
   def document_body_with_alignments
-    @document_body_with_alignments ||= Govspeak::Document.new(%{
+    @document_body_with_alignments ||= Govspeak::Document.new(%(
 |                 | Second Column   | Third Column        |
 | :-------------- | :-------------: | ------------------: |
 |# First row      | Cell            | Cell                |
 |# Second row     | Cell            | Cell                |
-})
+))
   end
 
   def document_body_with_table_headers_in_the_wrong_place
-    @document_body_with_table_headers_in_the_wrong_place ||= Govspeak::Document.new(%{
+    @document_body_with_table_headers_in_the_wrong_place ||= Govspeak::Document.new(%(
 |                 | Second Column   | Third Column        |
 | --------------- | --------------- | ------------------- |
 |# First row      |# Cell           | Cell                |
 |# Second row     | Cell            |# Cell               |
-})
+))
   end
 
   def document_body_with_blank_table_headers
-    @document_body_with_blank_table_headers ||= Govspeak::Document.new(%{
+    @document_body_with_blank_table_headers ||= Govspeak::Document.new(%(
 |                 | Second Column   | Third Column        |
 | --------------- | --------------- | ------------------- |
 |#                | Cell            | Cell                |
 |# Second row     | Cell            | Cell                |
-})
+))
+  end
+
+  def document_body_with_table_headers_containing_links
+    @document_body_with_table_headers_containing_links ||= Govspeak::Document.new(%(
+|                                                      | Second Column   | Third Column        |
+| ---------------------------------------------------- | --------------- | ------------------- |
+|# Link contained in header [link1](http://google.com) | Cell            | Cell                |
+|# No link                                             | Cell            | Cell                |
+|# [Whole header is link](http://www.bbc.co.uk)        | Cell            | Cell                |
+))
   end
 
   test "Cells with |# are headers" do
@@ -192,6 +235,10 @@ class GovspeakTableWithHeadersTest < Minitest::Test
     assert_equal document_body_with_table_headers_in_the_wrong_place.to_html, expected_outcome_for_table_headers_in_the_wrong_place
   end
 
+  test "Table headers with a scope of row can have embedded links" do
+    assert_equal document_body_with_table_headers_containing_links.to_html, expected_outcome_for_table_headers_containing_links
+  end
+
   test "Table headers are not blank" do
     assert_equal document_body_with_blank_table_headers.to_html, expected_outcome_for_table_with_blank_table_headers
   end