govuk_content_models 31.2.0 → 31.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6c4b37f1704591fe5ac808a9bebf9ba0f46f556
-  data.tar.gz: 92b2f993c3593f86ce2456e6cd2d368425487c86
+  metadata.gz: 976fcc12ec04b0a7730a917068999749e33235c4
+  data.tar.gz: 04559780e24de5c5ef77f2df19b0c5a1dbac2d62
 SHA512:
-  metadata.gz: ea3806b6bf44597b7cac2ca62d4ae70e0c9c2115f62e8d2f1fb9174c30e9554ceae5c988a4ba93befb4f2eb9521cdb4237ff67cd93ede953e1a4f97852de9190
-  data.tar.gz: 0745c269617bbbb331f3ef841d6d1df8d02fc48420eb9491fb27d9c18dd6536af8b430d646a1d4b43195344a8d9b51961ec65ba04a74b7c1e857d50e288adaf0
+  metadata.gz: d3cc2e23eca5a70c5acab04bc125d762813683f1442250dad71ef6d782a9b575f232b8f3cc5663cf4c242603fdc42bdce55691d7584ce54779224257d09cf79a
+  data.tar.gz: c645c2dfd2cbf17f8a8f49dad61462b03845a2f588a08d498a7a8e757e011da49c2879bb8def4f891337335c7e5b39c317e59536f16b2a79a5c9b2d9e2e47455

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 31.2.1
+
+- Bugfix: don't run validations on editions when archiving an artefact
+
 ## 31.2.0
 
 - Add `content_id` to `Tag` model

data/app/models/artefact.rb

@@ -294,7 +294,7 @@ class Artefact
     if state == 'archived'
       Edition.where(panopticon_id: self.id, :state.nin => ["archived"]).each do |edition|
         edition.new_action(self, "note", comment: "Artefact has been archived. Archiving this edition.")
-        edition.archive!
+        edition.perform_event_without_validations(:archive!)
       end
     end
   end
@@ -313,7 +313,7 @@ class Artefact
   def save_as(user, options={})
     default_action = new_record? ? "create" : "update"
     action_type = options.delete(:action_type) || default_action
-    record_action action_type, user: user
+    record_action(action_type, user: user)
     save(options)
   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 = "31.2.0"
+  VERSION = "31.2.1"
 end

data/test/models/artefact_test.rb

@@ -460,6 +460,21 @@ class ArtefactTest < ActiveSupport::TestCase
     end
   end
 
+  test "should not run validations on editions when archiving" do
+    artefact = FactoryGirl.create(:artefact, state: "live")
+    edition = FactoryGirl.create(:help_page_edition, panopticon_id: artefact.id, state: 'published')
+    user1 = FactoryGirl.create(:user)
+
+    # Make the edition invalid, check that it persisted the invalid state
+    edition.update_attribute(:title, nil)
+    assert_equal(nil, edition.reload.title)
+
+    artefact.update_attributes_as(user1, state: "archived")
+    artefact.save!
+
+    assert_equal("archived", edition.reload.state)
+  end
+
   test "should restrict what attributes can be updated on an edition that has an archived artefact" do
     artefact = FactoryGirl.create(:artefact, state: "live")
     edition = FactoryGirl.create(:programme_edition, panopticon_id: artefact.id, state: "published")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 31.2.0
+  version: 31.2.1
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext