govuk_content_models 22.1.0 → 22.1.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 22.1.1
+
+* Copy collection associations when cloning Editions
+
 ## 22.1.0
 
 * Add default values for collection associations on Edition

data/app/models/edition.rb

@@ -155,9 +155,16 @@ class Edition
     new_edition = edition_class.new(title: self.title,
                                     version_number: get_next_version_number)
 
-    real_fields_to_merge = fields_to_copy(edition_class) +
-                           [:panopticon_id, :overview, :alternative_title,
-                            :slug, :department]
+    real_fields_to_merge = fields_to_copy(edition_class) + [
+      :panopticon_id,
+      :overview,
+      :alternative_title,
+      :slug,
+      :department,
+      :browse_pages,
+      :primary_topic,
+      :additional_topics
+    ]
 
     real_fields_to_merge.each do |attr|
       new_edition[attr] = read_attribute(attr)

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 = "22.1.0"
+  VERSION = "22.1.1"
 end

data/test/models/edition_test.rb

@@ -1074,5 +1074,26 @@ class EditionTest < ActiveSupport::TestCase
     should "validates browse pages" do
       assert_includes Edition.validators.map(&:class), BrowsePageValidator
     end
+
+    should "retain collections across new editions" do
+      edition = FactoryGirl.create(:guide_edition,
+        panopticon_id: @artefact.id,
+        state: "published",
+        primary_topic: 'oil-and-gas/carbon-capture-and-storage',
+        additional_topics: [
+          'oil-and-gas/fields-and-wells',
+          'oil-and-gas/licensing'
+        ],
+        browse_pages: [
+          'education/school-admissions-transport',
+          'driving/drivers-lorries-buses'
+        ]
+      )
+
+      new_edition = edition.build_clone
+      assert_equal edition.primary_topic, new_edition.primary_topic
+      assert_equal edition.additional_topics, new_edition.additional_topics
+      assert_equal edition.browse_pages, new_edition.browse_pages
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 22.1.0
+  version: 22.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -464,7 +464,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3250701866585656813
+      hash: 510366184885881008
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -473,7 +473,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -3250701866585656813
+      hash: 510366184885881008
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23