govuk_content_models 35.0.0 → 35.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92694115f4161b92997ef39dda8faf21ffe830fa
-  data.tar.gz: 16a4fc4c0c45804fe4d34ed799958f98e88d18ac
+  metadata.gz: 818153ae9ec98e66cebfcb9754ad00b7a447ffd4
+  data.tar.gz: e4f79124027a88b3353477a4a62853de0cc846e9
 SHA512:
-  metadata.gz: dfae23fecd0faa01072c0ba78e24206d747fa9a2d0823b6cdd5de88c42798d973242651058209d4cd903ecc31dfae8b356c037284349a8974516e11d7487902f
-  data.tar.gz: 304f70288d4261f7c5cd3ec21ecb2383c5dc6880b896df083df5e2df45a47bbb1286e8aa6d95c1e1c27445b6792d90a29d52bf0a0a17f77add414bb8ea88df09
+  metadata.gz: e5610c8661285a6a4f06889daa260e339db47318c6ecb3f3046a4f1c3f4a1e790581dfd59eb42c776a3cd8d8276cda9fd4c877111575ecf20546e965378d6922
+  data.tar.gz: 913527e1c41880a7a952271141656107a226d17056c2340f215f11f22e5a04970dbd85ef506e5e5235e818b177c1461759e484ae8565f8376862505a3870c5ae

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 35.0.1
+
+- Handle saving changes to promotion toggles correctly for existing documents [#381](https://github.com/alphagov/govuk_content_models/pull/381)
+
 ## 35.0.0
 
 - Upgrade to Mongoid 5.1 and Rails 4.2

data/lib/govuk_content_models/presentation_toggles.rb

@@ -27,7 +27,10 @@ module PresentationToggles
   end
 
   def organ_donor_registration_key
-    presentation_toggles['organ_donor_registration'] ||= self.class.default_presentation_toggles['organ_donor_registration']
+    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)
@@ -62,7 +65,10 @@ module PresentationToggles
   end
 
   def promotion_choice_key
-    presentation_toggles['promotion_choice'] ||= self.class.default_presentation_toggles['promotion_choice']
+    unless presentation_toggles.key? 'promotion_choice'
+      presentation_toggles['promotion_choice'] = self.class.default_presentation_toggles['promotion_choice']
+    end
+    presentation_toggles['promotion_choice']
   end
 
   module ClassMethods

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 = "35.0.0"
+  VERSION = "35.0.1"
 end

data/test/models/completed_transaction_edition_test.rb

@@ -81,6 +81,15 @@ class CompletedTransactionEditionTest < ActiveSupport::TestCase
         },
       }
     )
+    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!
@@ -93,13 +102,6 @@ class CompletedTransactionEditionTest < ActiveSupport::TestCase
 
     assert_equal "organ_donor", completed_transaction_edition.reload.promotion_choice
     assert_equal "https://www.organdonation.nhs.uk/registration/", completed_transaction_edition.promotion_choice_url
-
-    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
   end
 
   test "passes through legacy organ donor info" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 35.0.0
+  version: 35.0.1
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext