govuk_content_models 6.0.3 → 6.0.4

data/app/models/edition.rb

@@ -166,11 +166,15 @@ class Edition
       new_edition[attr] = read_attribute(attr)
     end
 
-    if edition_class == AnswerEdition and self.class == GuideEdition
+    if edition_class == AnswerEdition and %w(GuideEdition ProgrammeEdition TransactionEdition).include?(self.class.name)
       new_edition.body = whole_body
     end
 
-    if edition_class == GuideEdition and self.class == AnswerEdition
+    if edition_class == TransactionEdition and %w(AnswerEdition GuideEdition ProgrammeEdition).include?(self.class.name)
+      new_edition.more_information = whole_body
+    end
+
+    if edition_class == GuideEdition and self.is_a?(AnswerEdition)
       new_edition.parts.build(title: "Part One", body: whole_body,
                               slug: "part-one")
     end

data/app/models/transaction_edition.rb

@@ -23,6 +23,6 @@ class TransactionEdition < Edition
   end
 
   def whole_body
-    [ self.link, self.introduction, self.more_information ].join("\n\n")
+    [ self.link, self.introduction, self.more_information, self.alternate_methods ].join("\n\n")
   end
 end

data/lib/govuk_content_models/test_helpers/factories.rb

@@ -85,6 +85,17 @@ FactoryGirl.define do
     section { "test:subsection test" }
   end
 
+  factory :programme_edition_with_multiple_parts, parent: :programme_edition do
+    title "a title"
+    after :create do |getp|
+      getp.parts.build(title: "PART !", body: "This is some programme version text.",
+                       slug: "part-one")
+      getp.parts.build(title: "PART !!",
+                       body: "This is some more programme version text.",
+                       slug: "part-two")
+    end
+  end
+
   factory :guide_edition_with_two_parts, parent: :guide_edition do
     title "a title"
     after :create do |getp|

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 = "6.0.3"
+  VERSION = "6.0.4"
 end

data/test/models/edition_test.rb

@@ -130,7 +130,8 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal clone1.version_number, 3
   end
 
-  test "Cloning into a different edition type" do
+# test cloning into different edition types
+  test "Cloning from GuideEdition into AnswerEdition" do
     edition = FactoryGirl.create(
         :guide_edition,
         state: "published",
@@ -150,18 +151,156 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal new_edition.department, "Test dept"
     assert_equal new_edition.overview, "I am a test overview"
     assert_equal new_edition.alternative_title, "Alternative test title"
+    assert_equal new_edition.whole_body, edition.whole_body
+  end
+
+  test "Cloning from ProgrammeEdition into AnswerEdition" do
+    edition = FactoryGirl.create(
+        :programme_edition,
+        state: "published",
+        panopticon_id: @artefact.id,
+        version_number: 1,
+        department: "Test dept",
+        overview: "I am a test overview",
+        alternative_title: "Alternative test title"
+    )
+    new_edition = edition.build_clone AnswerEdition
+
+    assert_equal new_edition.class, AnswerEdition
+    assert_equal new_edition.version_number, 2
+    assert_equal new_edition.panopticon_id, @artefact.id.to_s
+    assert_equal new_edition.state, "lined_up"
+    assert_equal new_edition.department, "Test dept"
+    assert_equal new_edition.overview, "I am a test overview"
+    assert_equal new_edition.alternative_title, "Alternative test title"
+    assert_equal new_edition.whole_body, edition.whole_body
+  end
+
+  test "Cloning from TransactionEdition into AnswerEdition" do
+    edition = FactoryGirl.create(
+        :transaction_edition,
+        state: "published",
+        panopticon_id: @artefact.id,
+        version_number: 1,
+        department: "Test dept",
+        overview: "I am a test overview",
+        alternative_title: "Alternative test title",
+        more_information: "More information",
+        alternate_methods: "Alternate methods"
+    )
+    new_edition = edition.build_clone AnswerEdition
+
+    assert_equal new_edition.class, AnswerEdition
+    assert_equal new_edition.version_number, 2
+    assert_equal new_edition.panopticon_id, @artefact.id.to_s
+    assert_equal new_edition.state, "lined_up"
+    assert_equal new_edition.department, "Test dept"
+    assert_equal new_edition.overview, "I am a test overview"
+    assert_equal new_edition.alternative_title, "Alternative test title"
+    assert_equal new_edition.whole_body, edition.whole_body
+  end
+
+  test "Cloning from AnswerEdition into TransactionEdition" do
+    edition = FactoryGirl.create(
+        :answer_edition,
+        state: "published",
+        panopticon_id: @artefact.id,
+        version_number: 1,
+        department: "Test dept",
+        overview: "I am a test overview",
+        alternative_title: "Alternative test title",
+        body: "Test body"
+    )
+    new_edition = edition.build_clone TransactionEdition
+
+    assert_equal new_edition.class, TransactionEdition
+    assert_equal new_edition.version_number, 2
+    assert_equal new_edition.panopticon_id, @artefact.id.to_s
+    assert_equal new_edition.state, "lined_up"
+    assert_equal new_edition.department, "Test dept"
+    assert_equal new_edition.overview, "I am a test overview"
+    assert_equal new_edition.alternative_title, "Alternative test title"
+    assert_equal new_edition.more_information, "Test body"
+  end
+
+  test "Cloning from GuideEdition into TransactionEdition" do
+    edition = FactoryGirl.create(
+        :guide_edition,
+        state: "published",
+        panopticon_id: @artefact.id,
+        version_number: 1,
+        department: "Test dept",
+        overview: "I am a test overview",
+        alternative_title: "Alternative test title",
+        video_url: "http://www.youtube.com/watch?v=dQw4w9WgXcQ"
+    )
+    new_edition = edition.build_clone TransactionEdition
+
+    assert_equal new_edition.class, TransactionEdition
+    assert_equal new_edition.version_number, 2
+    assert_equal new_edition.panopticon_id, @artefact.id.to_s
+    assert_equal new_edition.state, "lined_up"
+    assert_equal new_edition.department, "Test dept"
+    assert_equal new_edition.overview, "I am a test overview"
+    assert_equal new_edition.alternative_title, "Alternative test title"
+    assert_equal new_edition.more_information, edition.whole_body
+  end
+
+  test "Cloning from ProgrammeEdition into TransactionEdition" do
+    edition = FactoryGirl.create(
+        :programme_edition,
+        state: "published",
+        panopticon_id: @artefact.id,
+        version_number: 1,
+        department: "Test dept",
+        overview: "I am a test overview",
+        alternative_title: "Alternative test title"
+    )
+    new_edition = edition.build_clone TransactionEdition
+
+    assert_equal new_edition.class, TransactionEdition
+    assert_equal new_edition.version_number, 2
+    assert_equal new_edition.panopticon_id, @artefact.id.to_s
+    assert_equal new_edition.state, "lined_up"
+    assert_equal new_edition.department, "Test dept"
+    assert_equal new_edition.overview, "I am a test overview"
+    assert_equal new_edition.alternative_title, "Alternative test title"
+    assert_equal new_edition.more_information, edition.whole_body
+  end
+
+  test "Cloning from AnswerEdition into GuideEdition" do
+    edition = FactoryGirl.create(
+        :answer_edition,
+        state: "published",
+        panopticon_id: @artefact.id,
+        version_number: 1,
+        department: "Test dept",
+        overview: "I am a test overview",
+        alternative_title: "Alternative test title"
+    )
+    new_edition = edition.build_clone GuideEdition
+
+    assert_equal new_edition.class, GuideEdition
+    assert_equal new_edition.version_number, 2
+    assert_equal new_edition.panopticon_id, @artefact.id.to_s
+    assert_equal new_edition.state, "lined_up"
+    assert_equal new_edition.department, "Test dept"
+    assert_equal new_edition.overview, "I am a test overview"
+    assert_equal new_edition.alternative_title, "Alternative test title"
   end
 
   test "Cloning between types with parts" do
-    edition = FactoryGirl.create(:programme_edition,
+    edition = FactoryGirl.create(:programme_edition_with_multiple_parts,
                                  panopticon_id: @artefact.id,
                                  state: "published",
                                  version_number: 1,
-                                 overview: "I am a shiny programme")
+                                 overview: "I am a shiny programme",
+                                 )
     new_edition = edition.build_clone GuideEdition
 
     assert_equal(new_edition.parts.map {|part| part.title },
                  edition.parts.map {|part| part.title })
+    assert_equal 7, new_edition.parts.size #there are 5 'default' parts plus an additional two created by the factory
   end
 
   test "edition finder should return the published edition when given an empty edition parameter" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 6.0.3
+  version: 6.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -452,7 +452,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 903394278691268012
+      hash: -4288275942381521382
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -461,7 +461,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 903394278691268012
+      hash: -4288275942381521382
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23