govuk_content_models 34.0.0 → 35.0.0

data/lib/govuk_content_models/action_processors/assign_processor.rb

@@ -3,7 +3,7 @@ module GovukContentModels
     class AssignProcessor < BaseProcessor
 
       def process
-        edition.set(:assigned_to_id, action_attributes[:recipient_id])
+        edition.set(assigned_to_id: action_attributes[:recipient_id])
         edition.reload
       end
 

data/lib/govuk_content_models/action_processors/new_version_processor.rb

@@ -13,6 +13,8 @@ module GovukContentModels
         else
           edition.build_clone
         end
+
+        @edition.save(validate: false) if record_action?
       end
 
       def record_action?

data/lib/govuk_content_models/presentation_toggles.rb

@@ -4,6 +4,8 @@ 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)
@@ -19,20 +21,63 @@ module PresentationToggles
   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
-    presentation_toggles['organ_donor_registration']
+    presentation_toggles['organ_donor_registration'] ||= self.class.default_presentation_toggles['organ_donor_registration']
+  end
+
+  def promotion_choice=(value)
+    promotion_choice_key["choice"] = value
+  end
+
+  def promotion_choice_url=(value)
+    promotion_choice_key['url'] = value
+  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
+  end
+
+  def promotes_something?
+    promotion_choice != 'none'
+  end
+
+  def promotion_choice_url
+    url = promotion_choice_key["url"]
+    url.empty? ? organ_donor_registration_url : url
+  end
+
+  def promotion_choice_key
+    presentation_toggles['promotion_choice'] ||= self.class.default_presentation_toggles['promotion_choice']
   end
 
   module ClassMethods
     def default_presentation_toggles
       {
         'organ_donor_registration' =>
-          { 'promote_organ_donor_registration' => false, 'organ_donor_registration_url' => '' }
+          {
+            'promote_organ_donor_registration' => false,
+            'organ_donor_registration_url' => ''
+          },
+        'promotion_choice' =>
+          {
+            'choice' => '',
+            'url' => ''
+          }
       }
     end
   end

data/lib/govuk_content_models/require_all.rb

@@ -10,5 +10,6 @@ root_path = "#{File.dirname(__FILE__)}/../.."
 end
 
 # Require validators first, then other files in app
-Dir.glob("#{root_path}/app/validators/*.rb").each {|f| require f }
-Dir.glob("#{root_path}/app/**/*.rb").each {|f| require f }
+Dir.glob("#{root_path}/app/validators/*.rb").each { |f| require f }
+Dir.glob("#{root_path}/app/traits/*.rb").each { |f| require f }
+Dir.glob("#{root_path}/app/**/*.rb").each { |f| require f }

data/lib/govuk_content_models/test_helpers/factories.rb

@@ -64,7 +64,7 @@ FactoryGirl.define do
 
     trait :non_publisher do
       kind            'smart-answer'
-      owning_app      'smart-answers'
+      owning_app      'smartanswers'
     end
 
     trait :draft do
@@ -97,12 +97,17 @@ FactoryGirl.define do
         a = create(:artefact)
         a.id
       }
+    transient do
+      version_number nil
+    end
 
     sequence(:slug) { |n| "slug-#{n}" }
     sequence(:title) { |n| "A key answer to your question #{n}" }
 
-    after :build do |ed|
-      if previous = ed.series.order(version_number: "desc").first
+    after :build do |ed, evaluator|
+      if !evaluator.version_number.nil?
+        ed.version_number = evaluator.version_number
+      elsif (previous = ed.series.order(version_number: "desc").first)
         ed.version_number = previous.version_number + 1
       end
     end

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

data/test/models/artefact_test.rb

@@ -124,7 +124,7 @@ class ArtefactTest < ActiveSupport::TestCase
     should "not validate need ids that were migrated from the singular need_id field" do
       artefact = FactoryGirl.create(:artefact)
       # simulate what happened during migration
-      artefact.set(:need_ids, ['As an employer
+      artefact.set(need_ids: ['As an employer
                                 I need to know which type of DBS check an employee needs
                                 so that I can apply for the correct one'])
 
@@ -146,25 +146,25 @@ class ArtefactTest < ActiveSupport::TestCase
       end
 
       should "append to existing need_ids when need_id is assigned" do
-        @artefact.set(:need_ids, ["100044"])
-        @artefact.set(:need_id, "100044")
+        @artefact.set(need_ids: ["100044"])
+        @artefact.set(need_id: "100044")
 
         @artefact.need_id = "100045"
 
         assert_equal "100045", @artefact.need_id
-        assert_equal ["100044", "100045"], @artefact.need_ids
+        assert_equal %w(100044 100045), @artefact.need_ids
       end
 
       # this should only matter till the time we have both fields
       # need_id and need_ids. can delete this test once we unset need_id.
       should "keep need_ids unchanged when need_id is removed" do
-        @artefact.set(:need_ids, ["100044", "100045"])
-        @artefact.set(:need_id, "100044")
+        @artefact.set(need_ids: %w(100044 100045))
+        @artefact.set(need_id: "100044")
 
         @artefact.need_id = nil
 
         assert_equal nil, @artefact.need_id
-        assert_equal ["100044", "100045"], @artefact.need_ids
+        assert_equal %w(100044 100045), @artefact.need_ids
       end
     end
   end
@@ -350,7 +350,7 @@ class ArtefactTest < ActiveSupport::TestCase
     artefact = FactoryGirl.create(:draft_artefact)
     edition = FactoryGirl.create(:answer_edition, panopticon_id: artefact.id)
     old_updated_at = 2.days.ago.to_time
-    edition.set(:updated_at, old_updated_at)
+    edition.set(updated_at: old_updated_at)
 
     artefact.language = "cy"
     artefact.save!
@@ -465,7 +465,7 @@ class ArtefactTest < ActiveSupport::TestCase
     artefact.update_attributes_as(user1, state: "archived")
     artefact.save!
 
-    editions.each &:reload
+    editions.each(&:reload)
     editions.each do |edition|
       assert_equal "archived", edition.state
     end

data/test/models/business_support_edition_test.rb

@@ -10,35 +10,32 @@ class BusinessSupportEditionTest < ActiveSupport::TestCase
     support = FactoryGirl.create(
       :business_support_edition,
       panopticon_id: @artefact.id,
+      short_description: "The short description",
+      body: "The body",
+      eligibility: "The eligibility",
+      evaluation: "The evaluation",
+      additional_information: "The additional information",
+      min_value: 1000,
+      max_value: 3000,
+      max_employees: 2000,
+      organiser: "The business support people",
+      continuation_link: "http://www.gov.uk",
+      will_continue_on: "The GOVUK website",
+      contact_details: "123 The Street, Townsville, UK. 07324 123456",
+      priority: 2,
+      area_gss_codes: %w(G123 G345 G45 G9),
+      locations: %w(scotland england),
+      sectors: %w(education manufacturing),
+      support_types: %w(grant loan),
+      start_date: Date.parse("1 Jan 2000"),
+      end_date: Date.parse("1 Jan 2020"),
     )
-    support.short_description = "The short description"
-    support.body = "The body"
-    support.eligibility = "The eligibility"
-    support.evaluation = "The evaluation"
-    support.additional_information = "The additional information"
-    support.min_value = 1000
-    support.max_value = 3000
-    support.max_employees = 2000
-    support.organiser = "The business support people"
-    support.continuation_link = "http://www.gov.uk"
-    support.will_continue_on = "The GOVUK website"
-    support.contact_details = "123 The Street, Townsville, UK. 07324 123456"
 
-    support.priority = 2
-    support.area_gss_codes = ["G123","G345","G45","G9"]
     support.business_sizes << "up-to-249"
     support.business_types << "charity"
-    support.locations = ["scotland", "england"]
     support.purposes << "making-the-most-of-the-internet"
-    support.sectors = ["education", "manufacturing"]
     support.stages << "start-up"
-    support.support_types = ["grant", "loan"]
-    support.start_date = Date.parse("1 Jan 2000")
-    support.end_date = Date.parse("1 Jan 2020")
 
-    support.safely.save!
-
-    support = BusinessSupportEdition.first
     assert_equal "The short description", support.short_description
     assert_equal "The body", support.body
     assert_equal "The eligibility", support.eligibility

data/test/models/campaign_edition_test.rb

@@ -6,18 +6,19 @@ class CampaignEditionTest < ActiveSupport::TestCase
   end
 
   should "have correct extra fields" do
-    c = FactoryGirl.build(:campaign_edition, :panopticon_id => @artefact.id)
-    c.body = "Start all the campaigns!"
-    c.large_image_id = "large-image-id-from-the-asset-manager"
-    c.medium_image_id = "medium-image-id-from-the-asset-manager"
-    c.small_image_id = "small-image-id-from-the-asset-manager"
-    c.organisation_formatted_name = "Driver & Vehicle\nLicensing\nAgency"
-    c.organisation_url = "/government/organisations/driver-and-vehicle-licensing-agency"
-    c.organisation_brand_colour = "department-for-transport"
-    c.organisation_crest = "single-identity"
-    c.safely.save!
+    c = FactoryGirl.create(
+      :campaign_edition,
+      panopticon_id: @artefact.id,
+      body: "Start all the campaigns!",
+      large_image_id: "large-image-id-from-the-asset-manager",
+      medium_image_id: "medium-image-id-from-the-asset-manager",
+      small_image_id: "small-image-id-from-the-asset-manager",
+      organisation_formatted_name: "Driver & Vehicle\nLicensing\nAgency",
+      organisation_url: "/government/organisations/driver-and-vehicle-licensing-agency",
+      organisation_brand_colour: "department-for-transport",
+      organisation_crest: "single-identity",
+    )
 
-    c = CampaignEdition.first
     assert_equal "Start all the campaigns!", c.body
     assert_equal "large-image-id-from-the-asset-manager", c.large_image_id
     assert_equal "medium-image-id-from-the-asset-manager", c.medium_image_id

data/test/models/completed_transaction_edition_test.rb

@@ -33,4 +33,83 @@ class CompletedTransactionEditionTest < ActiveSupport::TestCase
     assert completed_transaction_edition.invalid?
     assert_includes completed_transaction_edition.errors[:organ_donor_registration_url], "can't be blank"
   end
+
+  test "invalid if promotion_choice_url is not specified when a promotion choice is made" do
+    completed_transaction_edition = FactoryGirl.build(:completed_transaction_edition,
+      promotion_choice: 'organ_donor', promotion_choice_url: "")
+
+    assert completed_transaction_edition.invalid?
+    assert_includes completed_transaction_edition.errors[:promotion_choice_url], "can't be blank"
+  end
+
+  test "invalid if promotion_choice is not one of the allowed ones" do
+    completed_transaction_edition = FactoryGirl.build(:completed_transaction_edition, promotion_choice: 'cheese')
+
+    assert completed_transaction_edition.invalid?
+    assert_includes completed_transaction_edition.errors[:promotion_choice], "is not included in the list"
+  end
+
+  test "stores promotion choice and URL" do
+    completed_transaction_edition = FactoryGirl.build(:completed_transaction_edition)
+
+    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
+
+    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 "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.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
+
+    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
+    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

data/test/models/downtime_test.rb

@@ -84,7 +84,7 @@ class DowntimeTest < ActiveSupport::TestCase
       Timecop.freeze(Time.zone.now + 10) do
         downtime = FactoryGirl.build(:downtime)
 
-        downtime.end_time = Time.zone.now
+        downtime.end_time = Time.zone.now - 1.minute
         refute downtime.publicise?
       end
     end

data/test/models/edition_test.rb

@@ -24,8 +24,8 @@ class EditionTest < ActiveSupport::TestCase
 
   def template_published_answer(version_number = 1)
     answer = template_answer(version_number)
-    answer.publish
-    answer.save
+    answer.publish!
+    answer.save!
     answer
   end
 
@@ -85,6 +85,16 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal [g1], g3.previous_siblings.to_a
   end
 
+  test "subsequent and previous siblings are in order" do
+    g4 = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, version_number: 4)
+    g2 = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, version_number: 2)
+    g1 = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, version_number: 1)
+    g3 = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, version_number: 3)
+
+    assert_equal [g2, g3, g4], g1.subsequent_siblings.to_a
+    assert_equal [g1, g2, g3], g4.previous_siblings.to_a
+  end
+
   test "A programme should have default parts" do
     programme = FactoryGirl.create(:programme_edition, panopticon_id: @artefact.id)
     assert_equal programme.parts.count, ProgrammeEdition::DEFAULT_PARTS.length
@@ -103,7 +113,7 @@ class EditionTest < ActiveSupport::TestCase
       edition.body += "some update"
 
       refute edition.valid?
-      assert_include edition.errors.full_messages, %q<Body ["Don't include hover text in links. Delete the text in quotation marks eg \\"This appears when you hover over the link.\\""]>
+      assert_includes edition.errors.full_messages, %q<Body ["Don't include hover text in links. Delete the text in quotation marks eg \\"This appears when you hover over the link.\\""]>
     end
 
     should "allow archiving an edition with invalid links" do
@@ -723,6 +733,8 @@ class EditionTest < ActiveSupport::TestCase
 
     second_edition = edition.build_clone
     second_edition.state = "ready"
+    second_edition.save!
+
     publish(user, second_edition, "Second publication")
 
     # simulate link validation errors in published edition
@@ -732,6 +744,8 @@ class EditionTest < ActiveSupport::TestCase
     # fix link validation error in cloned edition by appending a '/' to the relative url
     third_edition.parts.first.body = "[register your vehicle](/registering-an-imported-vehicle)"
     third_edition.state = "ready"
+    third_edition.save!
+
     publish(user, third_edition, "Third publication")
 
     edition.reload
@@ -854,7 +868,7 @@ class EditionTest < ActiveSupport::TestCase
   test "user should not be able to review an edition they requested review for" do
     user = User.create(name: "Mary")
 
-    edition = ProgrammeEdition.new(title: "Childcare", slug: "childcare", panopticon_id: @artefact.id)
+    edition = ProgrammeEdition.create(title: "Childcare", slug: "childcare", panopticon_id: @artefact.id)
     assert edition.can_request_review?
     request_review(user, edition)
     refute request_amendments(user, edition)
@@ -1044,8 +1058,8 @@ class EditionTest < ActiveSupport::TestCase
       ed2 = FactoryGirl.build(:edition, :panopticon_id => @artefact.id)
       ed2.version_number = ed1.version_number
 
-      assert_raises Mongo::OperationFailure do
-        ed2.safely.save! :validate => false
+      assert_raises Mongo::Error::OperationFailure do
+        ed2.save! validate: false
       end
     end
   end
@@ -1195,7 +1209,7 @@ class EditionTest < ActiveSupport::TestCase
                                                      state: 'published')
       edition2 = edition1.build_clone
 
-      assert_equal edition1.updated_at, edition2.public_updated_at
+      assert_in_delta edition1.updated_at, edition2.public_updated_at, 1.second
     end
 
     should 'return the timestamp of the first published edition when there are no major updates' do
@@ -1209,8 +1223,8 @@ class EditionTest < ActiveSupport::TestCase
       end
       edition1.update_attributes!(state: 'archived', major_change: false)
 
-      assert_equal edition1.updated_at, edition2.public_updated_at
-      assert_not_equal edition2.updated_at, edition2.public_updated_at
+      assert_in_delta edition1.updated_at, edition2.public_updated_at, 1.second
+      assert_not_in_delta edition2.updated_at, edition2.public_updated_at, 1.second
     end
 
     should 'return nil if there are no major updates and no published editions' do

data/test/models/help_page_edition_test.rb

@@ -2,15 +2,16 @@ require "test_helper"
 
 class HelpPageEditionTest < ActiveSupport::TestCase
   setup do
-    @artefact = FactoryGirl.create(:artefact, :kind => 'help_page', :slug => "help/foo")
+    @artefact = FactoryGirl.create(:artefact, kind: 'help_page', slug: "help/foo")
   end
 
   should "have correct extra fields" do
-    h = FactoryGirl.build(:help_page_edition, :panopticon_id => @artefact.id)
-    h.body = "I'm a help page."
-    h.safely.save!
+    h = FactoryGirl.create(
+      :help_page_edition,
+      panopticon_id: @artefact.id,
+      body: "I'm a help page.",
+    )
 
-    h = HelpPageEdition.first
     assert_equal "I'm a help page.", h.body
   end
 
@@ -20,17 +21,21 @@ class HelpPageEditionTest < ActiveSupport::TestCase
   end
 
   should "return the body as whole_body" do
-    h = FactoryGirl.build(:help_page_edition,
-                          :panopticon_id => @artefact.id,
-                          :body => "Something")
+    h = FactoryGirl.build(
+      :help_page_edition,
+      panopticon_id: @artefact.id,
+      body: "Something",
+    )
     assert_equal h.body, h.whole_body
   end
 
   should "clone extra fields when cloning edition" do
-    help_page = FactoryGirl.create(:help_page_edition,
-                               :panopticon_id => @artefact.id,
-                               :state => "published",
-                               :body => "I'm very helpful")
+    help_page = FactoryGirl.create(
+      :help_page_edition,
+      panopticon_id: @artefact.id,
+      state: "published",
+      body: "I'm very helpful",
+    )
 
     new_help_page = help_page.build_clone
     assert_equal help_page.body, new_help_page.body

data/test/models/licence_edition_test.rb

@@ -6,15 +6,16 @@ class LicenceEditionTest < ActiveSupport::TestCase
   end
 
   should "have correct extra fields" do
-    l = FactoryGirl.build(:licence_edition, panopticon_id: @artefact.id)
-    l.licence_identifier = "AB1234"
-    l.licence_short_description = "Short description of licence"
-    l.licence_overview = "Markdown overview of licence..."
-    l.will_continue_on = "The HMRC website"
-    l.continuation_link = "http://www.hmrc.gov.uk"
-    l.safely.save!
+    l = FactoryGirl.create(
+      :licence_edition,
+      panopticon_id: @artefact.id,
+      licence_identifier: "AB1234",
+      licence_short_description: "Short description of licence",
+      licence_overview: "Markdown overview of licence...",
+      will_continue_on: "The HMRC website",
+      continuation_link: "http://www.hmrc.gov.uk"
+    )
 
-    l = LicenceEdition.first
     assert_equal "AB1234", l.licence_identifier
     assert_equal "Short description of licence", l.licence_short_description
     assert_equal "Markdown overview of licence...", l.licence_overview

data/test/models/local_transaction_edition_test.rb

@@ -3,35 +3,39 @@ require "govuk_content_models/test_helpers/local_services"
 
 class LocalTransactionEditionTest < ActiveSupport::TestCase
   include LocalServicesHelper
+  BINS = 1
+  HOUSING_BENEFIT = 2
+  NONEXISTENT = 999
+
   def setup
     @artefact = FactoryGirl.create(:artefact)
   end
 
   test "should report that an authority provides a service" do
     bins_transaction = LocalTransactionEdition.new(
-      lgsl_code:     "bins",
+      lgsl_code:     BINS,
       title:         "Transaction",
       slug:          "slug",
       panopticon_id: @artefact.id
     )
-    county_council = make_authority_providing("bins")
+    county_council = make_authority_providing(BINS)
     assert bins_transaction.service_provided_by?(county_council.snac)
   end
 
   test "should report that an authority does not provide a service" do
     bins_transaction = LocalTransactionEdition.new(
-      lgsl_code:     "bins",
+      lgsl_code:     BINS,
       title:         "Transaction",
       slug:          "slug",
       panopticon_id: @artefact.id
     )
-    county_council = make_authority_providing("housing-benefit")
+    county_council = make_authority_providing(HOUSING_BENEFIT)
     refute bins_transaction.service_provided_by?(county_council.snac)
   end
 
   test "should be a transaction search format" do
     bins_transaction = LocalTransactionEdition.new(
-      lgsl_code:     "bins",
+      lgsl_code:     BINS,
       title:         "Transaction",
       slug:          "slug",
       panopticon_id: @artefact.id
@@ -41,9 +45,9 @@ class LocalTransactionEditionTest < ActiveSupport::TestCase
 
 
   test "should validate on save that a LocalService exists for that lgsl_code" do
-    s = LocalService.create!(lgsl_code: "bins", providing_tier: %w{county unitary})
+    s = LocalService.create!(lgsl_code: BINS, providing_tier: %w{county unitary})
 
-    lt = LocalTransactionEdition.new(lgsl_code: "nonexistent", title: "Foo", slug: "foo", panopticon_id: @artefact.id)
+    lt = LocalTransactionEdition.new(lgsl_code: NONEXISTENT, title: "Foo", slug: "foo", panopticon_id: @artefact.id)
     lt.save
     assert !lt.valid?
 

data/test/models/parted_test.rb

@@ -15,4 +15,12 @@ class PartedTest < ActiveSupport::TestCase
     assert_equal({slug: ["can't be blank", "is invalid"]}, edition.errors[:parts][0]['54c10d4d759b743528000011:2'])
     assert_equal 2, edition.errors[:parts][0].length
   end
+
+  test "#whole_body returns ordered parts" do
+    edition = FactoryGirl.create(:guide_edition)
+    edition.parts.build(_id: '54c10d4d759b743528000010', order: '1', title: "Part 1", slug: "part_1")
+    edition.parts.build(_id: '54c10d4d759b743528000011', order: '3', title: "Part 3", slug: "part_3")
+    edition.parts.build(_id: '54c10d4d759b743528000012', order: '2', title: "Part 2", slug: "part_2")
+    assert_equal("# Part 1\n\n\n\n# Part 2\n\n\n\n# Part 3\n\n", edition.whole_body)
+  end
 end

data/test/models/prerendered_entity_tests.rb

@@ -15,11 +15,11 @@ module PrerenderedEntityTests
 
   def test_create_or_update_by_slug
     slug = "a-slug"
-    original_body = "Original body"
+    original_title = "Original title"
 
     version1_attrs= {
       slug: slug,
-      body: original_body,
+      title: original_title,
     }
 
     created = model_class.create_or_update_by_slug!(version1_attrs)
@@ -28,13 +28,13 @@ module PrerenderedEntityTests
     assert created.persisted?
 
     version2_attrs = version1_attrs.merge(
-      body: "Updated body",
+      title: "Updated title",
     )
 
     version2 = model_class.create_or_update_by_slug!(version2_attrs)
 
     assert version2.persisted?
-    assert_equal "Updated body", version2.body
+    assert_equal "Updated title", version2.title
   end
 
   def test_find_by_slug