Merge pull request #166 from Christine-horrocks/Update_treaties_prefi…

…x_number Update treaties to add prefix and number
ukparliament · Feb 13, 2019 · d957d52 · d957d52
2 parents 20aae0b + ecde5c3
commit d957d52
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 27 deletions.
diff --git a/app/serializers/page_serializer/treaties_show_page_serializer.rb b/app/serializers/page_serializer/treaties_show_page_serializer.rb
@@ -21,10 +21,22 @@ def heading1_component
       ComponentSerializer::Heading1ComponentSerializer.new(heading_content).to_h
     end
 
+    def title_context
+      prefix  = @treaty.try(:treatyPrefix)
+      number  = @treaty.try(:treatyNumber)
+
+      ctx_info = ''
+      ctx_info << prefix.to_s if prefix
+      ctx_info << " #{number}" if number
+
+      ctx_info unless ctx_info.empty?
+    end
+
     def heading_content
       {}.tap do |hash|
         hash[:subheading] = ContentDataHelper.content_data(content: 'treaties.show.subheading', link: treaties_path)
         hash[:heading] = title || t('no_name')
+        hash[:context] = title_context
       end
     end
 

diff --git a/spec/fixtures/serializers/page_serializer/treaties_show_page_serializer/fixture.yml b/spec/fixtures/serializers/page_serializer/treaties_show_page_serializer/fixture.yml
@@ -85,6 +85,8 @@ main-components:
             link: "/treaties"
         heading:
           content: laidThingName - 1
+        context:
+          content: treatyPrefix - 1 488
 - name: section__section
   data:
     components:

diff --git a/...ixtures/serializers/page_serializer/treaties_show_page_serializer/treaty_with_no_name.yml b/...ixtures/serializers/page_serializer/treaties_show_page_serializer/treaty_with_no_name.yml
@@ -85,6 +85,8 @@ main-components:
             link: "/treaties"
         heading:
           content: "[Name unavailable]"
+        context:
+          content: treatyPrefix - 1 488
 - name: section__section
   data:
     components:

diff --git a/...ettes/PageSerializer_TreatiesShowPageSerializer/_to_h/produces_the_expected_JSON_hash.yml b/...ettes/PageSerializer_TreatiesShowPageSerializer/_to_h/produces_the_expected_JSON_hash.yml
diff --git a/..._TreatiesShowPageSerializer/with_no_name/produces_the_expected_JSON_hash_with_no_name.yml b/..._TreatiesShowPageSerializer/with_no_name/produces_the_expected_JSON_hash_with_no_name.yml