govuk_navigation_helpers 8.1.1 → 8.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2097d9cbeb05c288dd203fc0daa94ee9fa2d3a6a
-  data.tar.gz: d03f10f2eb85b2702a0eb65810f4715a609d7f30
+  metadata.gz: 00d6196b7af9cb3f946c7619095daeb9926207c1
+  data.tar.gz: 594c10714eaf2c263878be7371f20a31a47b83a0
 SHA512:
-  metadata.gz: bb9517734393c5b1fc4862be6354e70c0db2e5fa364910ba613990c74a5bb9a3c20b1b5d908f96ccfee01d7848e6c5d8a347033998a78a193cf43e3366cad43c
-  data.tar.gz: 0cc1644665f14aacb99a905af0913072e0b7e4219d6c28b1d06da806fd403f3f7e2db5c44eb144fae82b56dd629f904ca577f5cdc8eb967287f80dc998ede264
+  metadata.gz: 2af437186445b73d36b31b6abe2528a9c0b70345534fb06679215334625d786a89b8cb8f324abc572753585da52cd69fe7a86ffa2ff106986c6b14bd11b74be7
+  data.tar.gz: ee8020c7eb9e6b53997df336fb8093e76895881408b377ef85ce7df9aac474b2b9592901483b3f10ec02f8d23644d7683804103c9c8569ba28585437ff301df8

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 8.2.0
+* Update related navigation sidebar helper to return mainstream topics alongside whitehall topics
+* Update content in the /end-a-civil-partnership, /get-a-divorce tasklists
+
 ## 8.1.1
 * Update content in the /end-a-civil-partnership, /get-a-divorce, and /learn-to-drive-a-car tasklists
 * Strip non-alphanumeric characters from world location links for related navigation helper.

data/config/tasklists/end-a-civil-partnership.json

@@ -96,7 +96,7 @@
           "contents": [
             {
               "type": "paragraph",
-              "text": "You should try to agree how you'll deal with your children, money and property before you apply to end your civil partnership."
+              "text": "You should try to agree the arrangements for looking after your children and work out any money or property issues before you apply to end your civil partnership."
             },
             {
               "type": "list",
@@ -186,11 +186,11 @@
             },
             {
               "type": "paragraph",
-              "text": "Your civil partner will receive a copy of the dissolution application. You'll be told when they respond and what you'll need to do next."
+              "text": "Your husband or wife will receive a copy of the dissolution application. When they respond, you'll be told what you need to do next."
             },
             {
               "type": "paragraph",
-              "text": "You might need to get legal advice if your civil partner disagrees with your application."
+              "text": "You might need to get legal advice if they disagree with the application."
             },
             {
               "type": "list",
@@ -202,6 +202,10 @@
                 }
               ]
             },
+            {
+              "type": "paragraph",
+              "text": "If they don't respond, you'll need to prove that they've received the application. For example, by using a bailiff to deliver it to them."
+            },
             {
               "type": "substep",
               "optional": true
@@ -212,7 +216,7 @@
                 {
                   "href": "/divorce-missing-husband-wife",
                   "text": "Find your civil partner's address",
-                  "context": "£0 to £100"
+                  "context": "£0 to £150"
                 },
                 {
                   "href": "/end-civil-partnership/if-your-partner-lacks-mental-capacity",
@@ -234,7 +238,7 @@
           "contents": [
             {
               "type": "paragraph",
-              "text": "If the court agrees with your dissolution application, you can apply for a document called a 'conditional order'. You can give more information about why the civil partnership has broken down."
+              "text": "The court will tell you if you can continue with your dissolution application. You'll need to apply for a document called a 'conditional order'. You can give more information about why the civil partnership has broken down."
             },
             {
               "type": "list",
@@ -293,7 +297,7 @@
           "contents": [
             {
               "type": "paragraph",
-              "text": "Once you, your civil partner and the court all agree, you can apply for a document called a 'final order' to end your civil partnership. You can do this 6 weeks to 12 months after you receive the conditional order."
+              "text": "Once you, your civil partner and the court all agree, you can apply for a document called a 'final order' to end your civil partnership. You can do this 6 weeks after you receive the conditional order."
             },
             {
               "type": "paragraph",
@@ -322,6 +326,7 @@
               "type": "paragraph",
               "text": "Once it's approved, they'll send you both a copy of the final order to say your civil partnership has legally ended."
             }
+
           ]
         }
       ]

data/config/tasklists/get-a-divorce.json

@@ -98,10 +98,11 @@
           "contents": [
             {
               "type": "paragraph",
-              "text": "You should try to agree how you'll deal with your children, money and property before you start your divorce."
+              "text": "You should try to agree the arrangements for looking after your children and work out any money or property issues before you start your divorce."
             },
             {
               "type": "list",
+              "style": "required",
               "contents": [
                 {
                   "href": "/looking-after-children-divorce",
@@ -164,7 +165,7 @@
                 },
                 {
                   "href": "/divorce/grounds-for-divorce",
-                  "text": "Check the list of reasons why you can get a divorce"
+                  "text": "Check the reasons you can get a divorce (the 'grounds for divorce')"
                 },
                 {
                   "href": "http://hmctsformfinder.justice.gov.uk/HMCTS/GetForm.do?court_forms_id=1115",
@@ -187,11 +188,11 @@
             },
             {
               "type": "paragraph",
-              "text": "Your husband or wife will receive a copy of the divorce petition. You'll be told when they respond and what you'll need to do next."
+              "text": "Your husband or wife will receive a copy of the divorce petition. When they respond, you'll be told what you need to do next."
             },
             {
               "type": "paragraph",
-              "text": "You might need to get legal advice if your husband or wife disagrees with your divorce petition."
+              "text": "You might need to get legal advice if they disagree with the petition."
             },
             {
               "type": "list",
@@ -203,6 +204,10 @@
                 }
               ]
             },
+            {
+              "type": "paragraph",
+              "text": "If they don't respond, you'll need to prove that they've received the petition. For example, by using a bailiff to deliver it to them."
+            },
             {
               "type": "substep",
               "optional": true
@@ -213,7 +218,7 @@
                 {
                   "href": "/divorce-missing-husband-wife",
                   "text": "Find your husband or wife’s address",
-                  "context": "£0 to £100"
+                  "context": "£0 to £150"
                 },
                 {
                   "href": "/divorce/if-your-husband-or-wife-lacks-mental-capacity",
@@ -235,7 +240,7 @@
           "contents": [
             {
               "type": "paragraph",
-              "text": "If the court agrees with your divorce petition, you can apply for a document called a 'decree nisi'. You can give more information about why the marriage has broken down."
+              "text": "The court will tell you if you can continue with your divorce petition. You'll need to apply for a document called a 'decree nisi'. You can give more information about why the marriage has broken down."
             },
             {
               "type": "list",
@@ -294,7 +299,7 @@
           "contents": [
             {
               "type": "paragraph",
-              "text": "Once you, your husband or wife, and the court all agree, you can apply for the final document to end your marriage. This is called a 'decree absolute'. You can do this 6 weeks to 12 months after you receive the decree nisi."
+              "text": "Once you, your husband or wife, and the court all agree, you can apply for the final document to end your marriage. This is called a 'decree absolute'. You can do this 6 weeks after you receive the decree nisi."
             },
             {
               "type": "paragraph",

data/lib/govuk_navigation_helpers/related_navigation_sidebar.rb

@@ -70,7 +70,9 @@ module GovukNavigationHelpers
     end
 
     def related_topics
-      build_links_for_sidebar(@content_item.related_topics)
+      topics = build_links_for_sidebar(@content_item.related_topics)
+      topics << related_mainstream_topic << related_mainstream_parent_topic
+      topics.compact
     end
 
     def related_topical_events
@@ -93,6 +95,16 @@ module GovukNavigationHelpers
       ]
     end
 
+    def related_mainstream_topic
+      return unless grouped.tagged_to_same_mainstream_browse_page.any?
+      { text: @content_item.parent.title, path: @content_item.parent.base_path }
+    end
+
+    def related_mainstream_parent_topic
+      return unless grouped.parents_tagged_to_same_mainstream_browse_page.any?
+      { text: @content_item.parent.parent.title, path: @content_item.parent.parent.base_path }
+    end
+
     def parameterise(str, sep = "-")
       parameterised_str = str.gsub(/[^\w\-]+/, sep)
       unless sep.nil? || sep.empty?
@@ -104,5 +116,9 @@ module GovukNavigationHelpers
       end
       parameterised_str.downcase
     end
+
+    def grouped
+      @grouped ||= GroupedRelatedLinks.new(@content_item)
+    end
   end
 end

data/lib/govuk_navigation_helpers/version.rb

@@ -1,3 +1,3 @@
 module GovukNavigationHelpers
-  VERSION = "8.1.1".freeze
+  VERSION = "8.2.0".freeze
 end

data/spec/related_navigation_sidebar_spec.rb

@@ -52,12 +52,30 @@ RSpec.describe GovukNavigationHelpers::RelatedNavigationSidebar do
           "delivered_on" => "2017-09-22T14:30:00+01:00"
         },
         "links" => {
+          "parent" => [
+            {
+              "content_id" => "32c1b93d-2553-47c9-bc3c-fc5b513ecc32",
+              "locale" => "en",
+              "base_path" => "/mainstream-topic",
+              "title" => "mainstream topic"
+            }
+          ],
           "ordered_related_items" => [
             {
               "content_id" => "32c1b93d-2553-47c9-bc3c-fc5b513ecc32",
               "locale" => "en",
               "base_path" => "/related-item",
-              "title" => "related item"
+              "title" => "related item",
+              "links" => {
+                "mainstream_browse_pages" => [
+                  {
+                    "content_id" => "32c1b93d-2553-47c9-bc3c-fc5b513ecc32",
+                    "locale" => "en",
+                    "base_path" => "/mainstream-topic",
+                    "title" => "mainstream topic"
+                  }
+                ]
+              }
             }
           ],
           "document_collections" => [
@@ -118,7 +136,7 @@ RSpec.describe GovukNavigationHelpers::RelatedNavigationSidebar do
       expected = {
         related_items: [{ path: "/related-item", text: "related item" }],
         collections: [{ path: "/related-collection", text: "related collection" }],
-        topics: [{ path: "/related-topic", text: "related topic" }],
+        topics: [{ path: "/related-topic", text: "related topic" }, { path: "/mainstream-topic", text: "mainstream topic" }],
         topical_events: [{ path: "/related-topical-event", text: "related topical event" }],
         policies: [{ path: "/related-policy", text: "related policy" }],
         publishers: [{ path: "/related-organisation", text: "related organisation" }],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_navigation_helpers
 version: !ruby/object:Gem::Version
-  version: 8.1.1
+  version: 8.2.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-20 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters