govuk_navigation_helpers 6.0.2 → 6.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc315992bc95e0ccc4ca7a148a1adc70c3e23b64
-  data.tar.gz: 70329a7f0bfbfc93770ebc404e9aac21a4a61914
+  metadata.gz: a90b969d4918f507faf0a1786349dec54afb1860
+  data.tar.gz: a5c670c1434dbe9a9469c980bd9bee9b9199e6c1
 SHA512:
-  metadata.gz: 7fb450a6afc7351e5cab8d776e0af36bb712fa88a252cd204875172b6a34af41f5d5a0357b608ef61eac111fcfcc33fe56c9201a9e58161681784dca68f31d83
-  data.tar.gz: 189c06187364cb4d9b0279b43a8f685ca925c48642ecf07dd0677f1587acabbef62d45a69a7d2efb586c426c51717484dfb41fd53baa6729cb95ed3ff54a57cd
+  metadata.gz: d07df36796dbe825414fcae535d69dad0778fdbd58868a1e653d6de2d3322aea102687b2bf78c4fa20bcbcfef9eb54043907e0bccbb3f8273375db82406b2627
+  data.tar.gz: 02e75793f4ee2884e62de9c819439d50ee286047ea058f5cc7dc10c251b7b3b405b037314f142188cc5c54ccc069a7a9c668d10e7454b093e790601cb0a8bca7

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 6.1.0
+
+* Add "Register to vote" section to related links data. This will only affect
+  completed transactions (apart from register-to-vote) until May 23rd 2017.
+
+## 6.0.2
+
+* Bump gds-api-adapters to 43.0.0
+
 ## 6.0.1
 
 * Remove duplicate related links from search for the new taxonomy sidebar.

data/govuk_navigation_helpers.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_runtime_dependency "gds-api-adapters", ">= 43.0"
+  spec.add_runtime_dependency "activesupport"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake", "~> 10.0"

data/lib/govuk_navigation_helpers/content_item.rb

@@ -65,5 +65,9 @@ module GovukNavigationHelpers
     def external_links
       content_store_response.dig("details", "external_related_links").to_a
     end
+
+    def document_type
+      content_store_response.fetch('document_type')
+    end
   end
 end

data/lib/govuk_navigation_helpers/related_items.rb

@@ -1,3 +1,6 @@
+require 'time'
+require 'active_support/core_ext/string/zones'
+require 'active_support/values/time_zone'
 require 'govuk_navigation_helpers/grouped_related_links'
 require 'govuk_navigation_helpers/content_item'
 
@@ -20,6 +23,7 @@ module GovukNavigationHelpers
     def related_items
       {
         sections: [
+          register_to_vote_section,
           tagged_to_same_mainstream_browse_page_section,
           parents_tagged_to_same_mainstream_browse_page_section,
           tagged_to_different_mainstream_browse_pages_section,
@@ -32,6 +36,30 @@ module GovukNavigationHelpers
 
     attr_reader :content_item
 
+    def register_to_vote_section
+      return unless should_show_register_to_vote_section?
+
+      {
+        title: 'Register to vote',
+        description: 'To vote in the General Election on 8 June, you need to apply to register by 11:59pm on 22 May.',
+        url: nil,
+        items: [
+          title: 'Register to vote',
+          url: '/register-to-vote'
+        ]
+      }
+    end
+
+    def should_show_register_to_vote_section?
+      content_item.document_type == 'completed_transaction' &&
+        register_to_vote_on_time? &&
+        content_item.base_path !~ /register-to-vote/
+    end
+
+    def register_to_vote_on_time?
+      Time.now < ActiveSupport::TimeZone['London'].parse('2017-05-22T23:59:59')
+    end
+
     def tagged_to_same_mainstream_browse_page_section
       return unless grouped.tagged_to_same_mainstream_browse_page.any?
 

data/lib/govuk_navigation_helpers/version.rb

@@ -1,3 +1,3 @@
 module GovukNavigationHelpers
-  VERSION = "6.0.2".freeze
+  VERSION = "6.1.0".freeze
 end

data/spec/related_items_spec.rb

@@ -1,8 +1,8 @@
 require "spec_helper"
 
 RSpec.describe GovukNavigationHelpers::RelatedItems do
-  def payload_for(content_item)
-    generator = GovukSchemas::RandomExample.for_schema("placeholder", schema_type: "frontend")
+  def payload_for(content_item, schema = "placeholder")
+    generator = GovukSchemas::RandomExample.for_schema(schema, schema_type: "frontend")
     fully_valid_content_item = generator.merge_and_validate(content_item)
     GovukNavigationHelpers::NavigationHelper.new(fully_valid_content_item).related_items
   end
@@ -263,5 +263,72 @@ RSpec.describe GovukNavigationHelpers::RelatedItems do
         ]
       )
     end
+
+    it 'does not generate the register to vote section for /register-to-vote' do
+      allow(Time).to receive(:now).and_return(Time.parse('2017-05-05'))
+      content_item = {
+        "base_path" => "/register-to-vote",
+        "document_type" => "completed_transaction",
+        "links" => {},
+        "details" => {
+          "external_related_links" => [],
+          "promotion" => {
+            "category" => "organ_donor",
+            "url" => "https://www.organdonation.nhs.uk/"
+          }
+        }
+      }
+      transaction_payload = payload_for(content_item, "completed_transaction")
+
+      expect(transaction_payload).to eql(sections: [])
+    end
+
+    it 'generates the register to vote section for completed transactions with register to vote promotion' do
+      allow(Time).to receive(:now).and_return(Time.parse('2017-05-05'))
+      content_item = {
+        "base_path" => "/done/pay-dvla-fine",
+        "document_type" => "completed_transaction",
+        "links" => {},
+        "details" => {
+          "external_related_links" => [],
+          "promotion" => {
+            "category" => "register_to_vote",
+            "url" => "/register-to-vote"
+          }
+        }
+      }
+      transaction_payload = payload_for(content_item, "completed_transaction")
+
+      expect(transaction_payload).to eql(
+        sections: [{
+          title: "Register to vote",
+          description: "To vote in the General Election on 8 June, you need to apply to register by 11:59pm on 22 May.",
+          url: nil,
+          items: [
+            title: "Register to vote",
+            url: "/register-to-vote"
+          ]
+        }]
+      )
+    end
+
+    it 'does not show the register to vote section after May 23rd' do
+      allow(Time).to receive(:now).and_return(Time.parse('2017-05-24'))
+      content_item = {
+        "base_path" => "/done/pay-dvla-fine",
+        "document_type" => "completed_transaction",
+        "links" => {},
+        "details" => {
+          "external_related_links" => [],
+          "promotion" => {
+            "category" => "register_to_vote",
+            "url" => "/register-to-vote"
+          }
+        }
+      }
+      transaction_payload = payload_for(content_item, "completed_transaction")
+
+      expect(transaction_payload).to eql(sections: [])
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_navigation_helpers
 version: !ruby/object:Gem::Version
-  version: 6.0.2
+  version: 6.1.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-28 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gds-api-adapters
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '43.0'
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement