govuk_content_models 16.1.0 → 16.1.1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 16.1.1
+
+* Make Tag#parent return the tag's parent even if it is draft.
+
 ## 16.1.0
 
 * Add new format for international_development_fund for an Artefact

data/app/models/tag.rb

@@ -63,7 +63,7 @@ class Tag
   end
 
   def parent
-    Tag.by_tag_id(parent_id, self.tag_type) if has_parent?
+    Tag.by_tag_id(parent_id, type: self.tag_type, draft: true) if has_parent?
   end
 
   def unique_title

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 = "16.1.0"
+  VERSION = "16.1.1"
 end

data/test/models/tag_test.rb

@@ -128,6 +128,13 @@ class TagTest < ActiveSupport::TestCase
     assert_includes Tag.validators.map(&:class), TagIdValidator
   end
 
+  test "#parent returns the parent even if the parent is draft" do
+    parent = FactoryGirl.create(:tag, state: 'draft')
+    child = FactoryGirl.create(:tag, state: 'draft', parent_id: parent.tag_id)
+
+    assert_equal parent, child.parent
+  end
+
   context "state" do
     setup do
       @atts = { tag_type: 'section', tag_id: 'test', title: 'Test' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 16.1.0
+  version: 16.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-24 00:00:00.000000000 Z
+date: 2014-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -466,7 +466,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -669024731182328575
+      hash: -3793855121358721402
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -475,7 +475,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -669024731182328575
+      hash: -3793855121358721402
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23