govuk_content_models 36.0.0 → 37.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 78511b72b76121386601a27a3406e48cdbdb12ee
-  data.tar.gz: 8b6f3505b3570a4e9015c752ef6b31eaaa3d9917
+  metadata.gz: 509f173b9c1d06101cb2b41fb74ae031a30fd99e
+  data.tar.gz: f2e8f1137985b74e33009062e68404774cc08be9
 SHA512:
-  metadata.gz: fc472a37b621228b0d1dc12a61a429a38d8ffab42af3d682afbc100a83c32dfeaad62a887cebb5776ecb5cd5d515a196e9efc614544e23f38f581a11a65c7446
-  data.tar.gz: 7cfe6d0c2585856f333686db8bf9d1a9055752fdd01f381aae4a19647d7218a61b9932145ac32aeb505614ca8acf73a4c404e8e28b96183fc2a196f6cad1833b
+  metadata.gz: 19d98c962dcb6fcaf9bc02f4c083ede71233ef2fb2b94a350cca2165b9edab0933b67e9990194ce6008d48e1fbe26a33f99a95ee5bb60116349427edf0a592a7
+  data.tar.gz: 3c873f461815c6b99b35675f6daf0446ffb64cbb0484f63768c0af40ab0b9d72a4d048567be3619efb1d813d279fe8a84fbaed5b74969395e13c80ee6a701cfb

data/lib/govuk_content_models/presentation_toggles.rb

@@ -3,36 +3,10 @@ module PresentationToggles
 
   included do
     field :presentation_toggles, type: Hash, default: default_presentation_toggles
-    validates_presence_of :organ_donor_registration_url, if: :promote_organ_donor_registration?
     validates :promotion_choice_url, presence: true, if: :promotes_something?
     validates :promotion_choice, inclusion: { in: %w(none organ_donor register_to_vote) }
   end
 
-  def promote_organ_donor_registration=(value)
-    value = value.is_a?(Boolean) ? value : value != '0' # if assigned using a checkbox
-    organ_donor_registration_key['promote_organ_donor_registration'] = value
-  end
-
-  def promote_organ_donor_registration
-    organ_donor_registration_key['promote_organ_donor_registration']
-  end
-  alias_method :promote_organ_donor_registration?, :promote_organ_donor_registration
-
-  def organ_donor_registration_url=(value)
-    organ_donor_registration_key['organ_donor_registration_url'] = value
-  end
-
-  def organ_donor_registration_url
-    organ_donor_registration_key['organ_donor_registration_url']
-  end
-
-  def organ_donor_registration_key
-    unless presentation_toggles.key? 'organ_donor_registration'
-      presentation_toggles['organ_donor_registration'] = self.class.default_presentation_toggles['organ_donor_registration']
-    end
-    presentation_toggles['organ_donor_registration']
-  end
-
   def promotion_choice=(value)
     promotion_choice_key["choice"] = value
   end
@@ -42,17 +16,8 @@ module PresentationToggles
   end
 
   def promotion_choice
-    has_legacy_promote = promote_organ_donor_registration
     choice = promotion_choice_key["choice"]
-    if choice.empty?
-      if has_legacy_promote
-        "organ_donor"
-      else
-        "none"
-      end
-    else
-      choice
-    end
+    choice.empty? ? "none" : choice
   end
 
   def promotes_something?
@@ -60,8 +25,7 @@ module PresentationToggles
   end
 
   def promotion_choice_url
-    url = promotion_choice_key["url"]
-    url.empty? ? organ_donor_registration_url : url
+    promotion_choice_key["url"]
   end
 
   def promotion_choice_key
@@ -74,11 +38,6 @@ module PresentationToggles
   module ClassMethods
     def default_presentation_toggles
       {
-        'organ_donor_registration' =>
-          {
-            'promote_organ_donor_registration' => false,
-            'organ_donor_registration_url' => ''
-          },
         'promotion_choice' =>
           {
             'choice' => '',

data/lib/govuk_content_models/version.rb

@@ -1,4 +1,4 @@
 module GovukContentModels
   # Changing this causes Jenkins to tag and release the gem into the wild
-  VERSION = "36.0.0"
+  VERSION = "37.0.0"
 end

data/test/models/completed_transaction_edition_test.rb

@@ -3,35 +3,17 @@ require "test_helper"
 class CompletedTransactionEditionTest < ActiveSupport::TestCase
   test "controls whether organ donor registration promotion should be displayed on a completed transaction page" do
     completed_transaction_edition = FactoryGirl.create(:completed_transaction_edition)
-    refute completed_transaction_edition.promote_organ_donor_registration?
+    refute completed_transaction_edition.promotes_something?
 
-    completed_transaction_edition.promote_organ_donor_registration = true
-    completed_transaction_edition.organ_donor_registration_url = "https://www.organdonation.nhs.uk/registration/"
-    completed_transaction_edition.save!
-    assert completed_transaction_edition.reload.promote_organ_donor_registration?
+    completed_transaction_edition.promotion_choice = "organ_donor"
+    completed_transaction_edition.promotion_choice_url = "https://www.organdonation.nhs.uk/registration/"
 
-    completed_transaction_edition.promote_organ_donor_registration = false
     completed_transaction_edition.save!
-    refute completed_transaction_edition.reload.promote_organ_donor_registration?
-  end
-
-  test "stores organ donor registration promotion URL" do
-    completed_transaction_edition = FactoryGirl.build(:completed_transaction_edition,
-      promote_organ_donor_registration: true)
+    assert completed_transaction_edition.reload.promotes_something?
 
-    completed_transaction_edition.organ_donor_registration_url = "https://www.organdonation.nhs.uk/registration/"
+    completed_transaction_edition.promotion_choice = ''
     completed_transaction_edition.save!
-
-    assert_equal "https://www.organdonation.nhs.uk/registration/",
-      completed_transaction_edition.reload.organ_donor_registration_url
-  end
-
-  test "invalid if organ_donor_registration_url is not specified when promotion is on" do
-    completed_transaction_edition = FactoryGirl.build(:completed_transaction_edition,
-      promote_organ_donor_registration: true, organ_donor_registration_url: "")
-
-    assert completed_transaction_edition.invalid?
-    assert_includes completed_transaction_edition.errors[:organ_donor_registration_url], "can't be blank"
+    refute completed_transaction_edition.reload.promotes_something?
   end
 
   test "invalid if promotion_choice_url is not specified when a promotion choice is made" do
@@ -71,47 +53,4 @@ class CompletedTransactionEditionTest < ActiveSupport::TestCase
     assert_equal "register_to_vote", completed_transaction_edition.reload.promotion_choice
     assert_equal "https://www.gov.uk/register-to-vote", completed_transaction_edition.promotion_choice_url
   end
-
-  test "stores promotion choice and URL on legacy documents" do
-    completed_transaction_edition = FactoryGirl.build(:completed_transaction_edition,
-      presentation_toggles: {
-        'organ_donor_registration' => {
-          'promote_organ_donor_registration' => false,
-          'organ_donor_registration_url' => ''
-        },
-      }
-    )
-    completed_transaction_edition.save(validate: false)
-    completed_transaction_edition.reload
-
-    completed_transaction_edition.promotion_choice = "register_to_vote"
-    completed_transaction_edition.promotion_choice_url = "https://www.gov.uk/register-to-vote"
-    completed_transaction_edition.save!
-
-    assert_equal "register_to_vote", completed_transaction_edition.reload.promotion_choice
-    assert_equal "https://www.gov.uk/register-to-vote", completed_transaction_edition.promotion_choice_url
-
-    completed_transaction_edition.promotion_choice = "none"
-    completed_transaction_edition.save!
-
-    assert_equal "none", completed_transaction_edition.reload.promotion_choice
-
-    completed_transaction_edition.promotion_choice = "organ_donor"
-    completed_transaction_edition.promotion_choice_url = "https://www.organdonation.nhs.uk/registration/"
-    completed_transaction_edition.save!
-
-    assert_equal "organ_donor", completed_transaction_edition.reload.promotion_choice
-    assert_equal "https://www.organdonation.nhs.uk/registration/", completed_transaction_edition.promotion_choice_url
-  end
-
-  test "passes through legacy organ donor info" do
-    completed_transaction_edition = FactoryGirl.build(:completed_transaction_edition,
-      promote_organ_donor_registration: true)
-
-    completed_transaction_edition.organ_donor_registration_url = "https://www.organdonation.nhs.uk/registration/"
-    completed_transaction_edition.save!
-
-    assert_equal "organ_donor", completed_transaction_edition.reload.promotion_choice
-    assert_equal "https://www.organdonation.nhs.uk/registration/", completed_transaction_edition.promotion_choice_url
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 36.0.0
+  version: 37.0.0
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext