govuk_content_models 28.9.0 → 28.10.0

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 28.10.0
+
+- Add conversion from LicenceEdition to AnswerEdition in `Edition#build_clone`
+
 ## 28.9.0
 
 - Add `department_analytics_profile` to transaction editions

data/app/models/downtime.rb

@@ -17,7 +17,7 @@ class Downtime
   end
 
   def publicise?
-    Time.zone.now.between?(start_time.to_date - 1, end_time) # starting at midnight a day before start time
+    Time.zone.now.between?(start_time.yesterday.at_midnight, end_time)
   end
 
   private

data/app/models/edition.rb

@@ -210,6 +210,11 @@ class Edition
       new_edition.body = whole_body
     end
 
+    if edition_class == AnswerEdition and self.is_a?(LicenceEdition)
+      new_edition.body = whole_body
+      new_edition.overview = licence_overview
+    end
+
     if edition_class == SimpleSmartAnswerEdition && %w(AnswerEdition GuideEdition ProgrammeEdition TransactionEdition).include?(self.class.name)
       new_edition.body = whole_body
     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 = "28.9.0"
+  VERSION = "28.10.0"
 end

data/test/models/downtime_test.rb

@@ -65,16 +65,17 @@ class DowntimeTest < ActiveSupport::TestCase
 
   context "publicising downtime" do
     should "start at midnight a day before it is scheduled" do
-      Timecop.freeze(Date.today) do # beginnning of today
+      now = Time.zone.parse("2015-01-01")
+      Timecop.freeze(now) do
         downtime = FactoryGirl.build(:downtime)
 
-        downtime.start_time = (Date.today + 1).to_time + (3 * 60 * 60) # 3am tomorrow
+        downtime.start_time = Time.zone.parse("2015-01-02 03:00")
         assert downtime.publicise?
 
-        downtime.start_time = Date.today.to_time + (21 * 60 * 60) # 9pm today
+        downtime.start_time = Time.zone.parse("2015-01-01 21:00")
         assert downtime.publicise?
 
-        downtime.start_time = Date.today + 2 # day after tomorrow
+        downtime.start_time = Time.zone.parse("2015-01-03 00:00")
         refute downtime.publicise?
       end
     end

data/test/models/edition_test.rb

@@ -222,6 +222,30 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal new_edition.whole_body, edition.whole_body
   end
 
+  test "Cloning from LicenceEdition into AnswerEdition" do
+    edition = FactoryGirl.create(
+      :licence_edition,
+      state: "published",
+      panopticon_id: @artefact.id,
+      version_number: 1,
+      department: "Test dept",
+      licence_overview: "I am a test overview",
+      licence_identifier: "Test identifier",
+      licence_short_description: "I am a test short description",
+      will_continue_on: "test will continue on",
+      continuation_link: "https://github.com/alphagov/"
+    )
+    new_edition = edition.build_clone AnswerEdition
+
+    assert_equal AnswerEdition, new_edition.class
+    assert_equal 2, new_edition.version_number
+    assert_equal @artefact.id.to_s, new_edition.panopticon_id
+    assert_equal "draft", new_edition.state
+    assert_equal "Test dept", new_edition.department
+    assert_equal "I am a test overview", new_edition.overview
+    assert_equal edition.whole_body, new_edition.body
+  end
+
   test "Cloning from ProgrammeEdition into AnswerEdition" do
     edition = FactoryGirl.create(
         :programme_edition,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 28.9.0
+  version: 28.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -478,7 +478,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1058733526370502898
+      hash: -2559664419333283544
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -487,7 +487,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1058733526370502898
+      hash: -2559664419333283544
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23