govuk_content_models 41.1.1 → 42.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f62fa6f0be7b191abab1031c90c07477b6f441e9
-  data.tar.gz: 740a4a1599e10251153f14593c6030be11fafbb2
+  metadata.gz: 8bacf08397308954506f1db7f3367eff5bb87825
+  data.tar.gz: d87f23b5972b468378aeb9085dc3241ffe2de61f
 SHA512:
-  metadata.gz: 83a2942d1809c38aeebc939ac2f216264f6379322b34443e6ebc487f4b80fb0de3b8d0ae5afd19d7fbbe3d4c3f7ef36cc0ea0625e7179e213befa083f64ddd3e
-  data.tar.gz: e4cb4108fbd8dc79627ea0916e7ed8e72ac55e2388c0c32a8a9ea5bd55d1d8ee51ae3614de2d83f7349516a4e16af250592eb67e55aa740d4e3b803ff06bec8c
+  metadata.gz: 74dcfde7b33e6dfd7b17af36967cfe065fe299a79c74e6d1d4024e0d100eacfbcaa4504b8f3a3d1bbf107b9bcfae117050da7181c6fa5a1a975ed97c44cca180
+  data.tar.gz: d0df800cf739c23c95372ce124df316b08d0a5feac079a4d90ce1e5cb167c235bb6c17ac11dc91fe182c346851923ed1d72cc909bcb52ae755012605b532876b

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 42.0.0
+
+- Remove everything related to tagging and related links. We now use the content
+  store for this.
+
 ## 41.1.1
 
 - Use `require_dependency` to avoid warnings in publisher sidekiq in development mode

data/app/models/artefact.rb

@@ -1,5 +1,4 @@
 require "plek"
-require "traits/taggable"
 require "artefact_action"  # Require this when running outside Rails
 require_dependency "safe_html"
 
@@ -15,11 +14,6 @@ class Artefact
   include Mongoid::Document
   include Mongoid::Timestamps
 
-  include Taggable
-  stores_tags_for :sections, :writing_teams, :propositions,
-                  :keywords, :specialist_sectors, :organisations
-  has_primary_tag_for :section
-
   field "name",                 type: String
   field "slug",                 type: String
   field "paths",                type: Array, default: []
@@ -60,8 +54,6 @@ class Artefact
 
   scope :not_archived, lambda { where(:state.nin => ["archived"]) }
 
-  MAXIMUM_RELATED_ITEMS = 8
-
   FORMATS_BY_DEFAULT_OWNING_APP = {
     "publisher"               => ["answer",
                                   "business_support",
@@ -124,7 +116,6 @@ class Artefact
                                   "world_location_news_article",
                                   "worldwide_priority",
                                   "written_statement"],
-    "panopticon"              => ["specialist_sector"],
   }.freeze
 
   FORMATS = FORMATS_BY_DEFAULT_OWNING_APP.values.flatten
@@ -141,7 +132,6 @@ class Artefact
     "find my nearest"                  => "place",
   }.tap { |h| h.default_proc = -> _, k { k } }.freeze
 
-  has_and_belongs_to_many :related_artefacts, class_name: "Artefact"
   embeds_many :actions, class_name: "ArtefactAction", order: { created_at: :asc }
 
   embeds_many :external_links, class_name: "ArtefactExternalLink"
@@ -165,11 +155,6 @@ class Artefact
   validate :format_of_new_need_ids, if: :need_ids_changed?
   validate :validate_redirect_url
 
-  scope :relatable_items, proc {
-    where(:kind.ne => "completed_transaction", :state.ne => "archived")
-      .order_by(name: :asc)
-  }
-
   def self.in_alphabetical_order
     order_by(name: :asc)
   end
@@ -178,16 +163,6 @@ class Artefact
     where(slug: s).first
   end
 
-  # The old-style section string identifier, of the form 'Crime:Prisons'
-  def section
-    return '' unless self.primary_section
-    if primary_section.parent
-      [primary_section.parent.title, primary_section.title].join ':'
-    else
-      primary_section.title
-    end
-  end
-
   # Fallback to english if no language is present
   def language
     attributes['language'] || "en"
@@ -204,69 +179,12 @@ class Artefact
     ].reject(&:blank?).join("?")
   end
 
-  # TODO: Replace this nonsense with a proper API layer.
   def as_json(options={})
     super.tap { |hash|
-      if hash["tag_ids"]
-        hash["tags"] = Tag.by_tag_ids(hash["tag_ids"]).map(&:as_json)
-      else
-        hash["tag_ids"] = []
-        hash["tags"] = []
-      end
-
-      if self.primary_section
-        hash['primary_section'] = self.primary_section.tag_id
-      end
-
-      unless options[:ignore_related_artefacts]
-        hash["related_items"] = published_related_artefacts.map do |a|
-          {"artefact" => a.as_json(ignore_related_artefacts: true)}
-        end
-      end
-      hash.delete("related_artefacts")
-      hash.delete("related_artefact_ids")
       hash["id"] = hash.delete("_id")
-
-      # Add a section identifier if needed
-      hash["section"] ||= section
     }
   end
 
-  def published_related_artefacts
-    related_artefacts.select do |related_artefact|
-      if related_artefact.owning_app == "publisher"
-        related_artefact.any_editions_published?
-      else
-        true
-      end
-    end
-  end
-
-  # Pass in the desired scope, eg self.related_artefacts.live,
-  # get back the items in the order they were set in, rather than natural order
-  def ordered_related_artefacts(scope_or_array = self.related_artefacts)
-    scope_or_array.sort_by { |artefact| related_artefact_ids.index(artefact.id) }
-  end
-
-  def related_artefacts_grouped_by_distance(scope_or_array = self.related_artefacts)
-    groups = { "subsection" => [], "section" => [], "other" => [] }
-    scoped_artefacts = ordered_related_artefacts(scope_or_array)
-
-    if primary_tag = self.primary_section
-      groups['subsection'] = scoped_artefacts.select {|a| a.tag_ids.include?(primary_tag.tag_id) }
-
-      if primary_tag.parent_id.present?
-        pattern = Regexp.new "^#{Regexp.quote(primary_tag.parent_id)}\/.+"
-        groups['section'] = scoped_artefacts.reject {|a| groups['subsection'].include?(a) }.select {|a|
-          a.tag_ids.grep(pattern).count > 0
-        }
-      end
-    end
-    groups['other'] = scoped_artefacts.reject {|a| (groups['subsection'] + groups['section']).include?(a) }
-
-    groups
-  end
-
   def any_editions_published?
     Edition.where(panopticon_id: self.id, state: 'published').any?
   end
@@ -370,9 +288,6 @@ class Artefact
   def snapshot
     attributes
       .except("_id", "created_at", "updated_at", "actions")
-      .merge(
-        "related_artefact_ids" => self.related_artefact_ids
-      )
   end
 
   def need_id=(new_need_id)

data/app/models/edition.rb

@@ -18,10 +18,6 @@ class Edition
   field :slug,                 type: String
   field :rejected_count,       type: Integer,  default: 0
 
-  field :browse_pages,         type: Array, default: []
-  field :primary_topic,        type: String
-  field :additional_topics,    type: Array, default: []
-
   field :assignee,             type: String
   field :reviewer,             type: String
   field :creator,              type: String
@@ -53,7 +49,7 @@ class Edition
   validates :panopticon_id, presence: true
   validates_with SafeHtml
   validates_with LinkValidator, on: :update, unless: :archived?
-  validates_with TopicValidator, BrowsePageValidator, ReviewerValidator
+  validates_with ReviewerValidator
   validates_presence_of :change_note, if: :major_change
 
   before_save :check_for_archived_artefact
@@ -252,10 +248,6 @@ class Edition
     end
   end
 
-  def panopticon_uri
-    Plek.current.find("panopticon") + "/artefacts/" + (panopticon_id || slug).to_s
-  end
-
   def format
     self.class.to_s.gsub("Edition", "")
   end
@@ -332,9 +324,6 @@ private
       :panopticon_id,
       :overview,
       :slug,
-      :browse_pages,
-      :primary_topic,
-      :additional_topics,
     ]
   end
 

data/app/validators/slug_validator.rb

@@ -8,7 +8,6 @@ class SlugValidator < ActiveModel::EachValidator
       FinderEmailSignupValidator,
       GovernmentPageValidator,
       ManualPageValidator,
-      BrowsePageValidator,
       DetailedGuideValidator,
       DefaultValidator
     ].map { |klass| klass.new(record, attribute, value) }
@@ -147,21 +146,6 @@ protected
     end
   end
 
-  class BrowsePageValidator < InstanceValidator
-    def applicable?
-      of_kind?('specialist_sector')
-    end
-
-    def validate!
-      unless [1, 2].include?(url_parts.size)
-        record.errors[attribute] << "must contains one or two path parts"
-      end
-      unless url_parts.all? { |url_part| valid_slug?(url_part) }
-        record.errors[attribute] << "must be usable in a URL"
-      end
-    end
-  end
-
   class DetailedGuideValidator < InstanceValidator
     def applicable?
       of_kind?('detailed_guide')

data/lib/govuk_content_models/test_helpers/factories.rb

@@ -1,7 +1,6 @@
 require "factory_girl"
 require "answer_edition"
 require "artefact"
-require "tag"
 require "user"
 
 FactoryGirl.define do
@@ -26,23 +25,6 @@ FactoryGirl.define do
     artefact
   end
 
-  factory :tag do
-    sequence(:tag_id) { |n| "crime-and-justice-#{n}" }
-    sequence(:title) { |n| "The title #{n}" }
-    tag_type "section"
-
-    trait :draft do
-      state "draft"
-    end
-
-    trait :live do
-      state "live"
-    end
-
-    factory :draft_tag, traits: [:draft]
-    factory :live_tag, traits: [:live]
-  end
-
   factory :artefact do
     sequence(:name) { |n| "Artefact #{n}" }
     sequence(:slug) { |n| "slug-#{n}" }

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 = "41.1.1"
+  VERSION = "42.0.0"
 end

data/test/models/artefact_action_test.rb

@@ -19,11 +19,8 @@ class ArtefactActionTest < ActiveSupport::TestCase
 
   DEFAULTS = {
     "active" => false,
-    "tag_ids" => [],
-    "tags" => [],
     "need_ids" => [],
     "state" => "draft",
-    "related_artefact_ids" => [],
     "paths" => [],
     "prefixes" => [],
     "language" => "en",

data/test/models/artefact_test.rb

@@ -272,63 +272,6 @@ class ArtefactTest < ActiveSupport::TestCase
     assert_equal "other", a.kind
   end
 
-  test "should store and return related artefacts in order" do
-    a = Artefact.create!(slug: "a", name: "a", kind: "place", need_ids: ["100001"], owning_app: "x")
-    b = Artefact.create!(slug: "b", name: "b", kind: "place", need_ids: ["100001"], owning_app: "x")
-    c = Artefact.create!(slug: "c", name: "c", kind: "place", need_ids: ["100001"], owning_app: "x")
-
-    a.related_artefacts = [b, c]
-    a.save!
-    a.reload
-
-    assert_equal [b, c], a.ordered_related_artefacts
-  end
-
-  test "should store and return related artefacts in order, even when not in natural order" do
-    a = Artefact.create!(slug: "a", name: "a", kind: "place", need_ids: ["100001"], owning_app: "x")
-    b = Artefact.create!(slug: "b", name: "b", kind: "place", need_ids: ["100001"], owning_app: "x")
-    c = Artefact.create!(slug: "c", name: "c", kind: "place", need_ids: ["100001"], owning_app: "x")
-
-    a.related_artefacts = [c, b]
-    a.save!
-    a.reload
-
-    assert_equal [c, b], a.ordered_related_artefacts
-  end
-
-  test "should store and return related artefacts in order, with a scope" do
-    a = Artefact.create!(slug: "a", name: "a", kind: "place", need_ids: ["100001"], owning_app: "x")
-    b = Artefact.create!(state: "live", slug: "b", name: "b", kind: "place", need_ids: ["100001"], owning_app: "x")
-    c = Artefact.create!(slug: "c", name: "c", kind: "place", need_ids: ["100001"], owning_app: "x")
-    d = Artefact.create!(state: "live", slug: "d", name: "d", kind: "place", need_ids: ["100001"], owning_app: "x")
-
-    a.related_artefacts = [d, c, b]
-    a.save!
-    a.reload
-
-    assert_equal [d, b], a.ordered_related_artefacts(a.related_artefacts.where(state: "live"))
-  end
-
-  test "published_related_artefacts should return all non-publisher artefacts, but only published publisher artefacts" do
-    # because currently only publisher has an idea of "published"
-
-    parent = Artefact.create!(slug: "parent", name: "Parent", kind: "guide", owning_app: "x")
-
-    a = Artefact.create!(slug: "a", name: "has no published editions", kind: "guide", owning_app: "publisher")
-    GuideEdition.create!(panopticon_id: a.id, title: "Unpublished", state: "draft")
-    parent.related_artefacts << a
-
-    b = Artefact.create!(slug: "b", name: "has a published edition", kind: "guide", owning_app: "publisher")
-    GuideEdition.create!(panopticon_id: b.id, title: "Published", state: "published")
-    parent.related_artefacts << b
-
-    c = Artefact.create!(slug: "c", name: "not a publisher artefact", kind: "place", owning_app: "x")
-    parent.related_artefacts << c
-    parent.save!
-
-    assert_equal [b.slug, c.slug], parent.published_related_artefacts.map(&:slug)
-  end
-
   test "should raise a not found exception if the slug doesn't match" do
     assert_raise Mongoid::Errors::DocumentNotFound do
       Artefact.from_param("something-fake")
@@ -398,13 +341,10 @@ class ArtefactTest < ActiveSupport::TestCase
   # should continue to work in the way it has been:
   # i.e. you can edit everything but the name/title for published content in panop
   test "on save title should not be applied to already published content" do
-    FactoryGirl.create(:live_tag, tag_id: "test-section", title: "Test section", tag_type: "section")
     artefact = FactoryGirl.create(:artefact,
         slug: "foo-bar",
         kind: "answer",
         name: "Foo bar",
-        primary_section: "test-section",
-        sections: ["test-section"],
         owning_app: "publisher",
     )
 
@@ -532,72 +472,6 @@ class ArtefactTest < ActiveSupport::TestCase
     end
   end
 
-  context "returning json representation" do
-    context "returning tags" do
-      setup do
-        FactoryGirl.create(:live_tag, :tag_type => 'section', :tag_id => 'crime', :title => 'Crime')
-        FactoryGirl.create(:live_tag, :tag_type => 'section', :tag_id => 'justice', :title => 'Justice', :description => "All about justice")
-        @a = FactoryGirl.create(:artefact, :slug => 'fooey')
-      end
-
-      should "return empty array of tags and tag_ids" do
-        hash = @a.as_json
-
-        assert_equal [], hash['tag_ids']
-        assert_equal [], hash['tags']
-      end
-
-      context "for an artefact with tags" do
-        setup do
-          @a.sections = ['justice']
-          @a.save!
-        end
-
-        should "return an array of tag_id strings in tag_ids" do
-          hash = @a.as_json
-
-          assert_equal ['justice'], hash['tag_ids']
-        end
-
-        should "return an array of tag objects in tags" do
-          hash = @a.as_json
-
-          expected = [
-            {
-              :id => 'justice',
-              :title => 'Justice',
-              :type => 'section',
-              :description => 'All about justice',
-              :short_description => nil
-            },
-          ]
-          assert_equal expected, hash['tags']
-        end
-
-        should "omit non-existent tags referenced from the tag_ids array" do
-          @a.tag_ids << 'batman'
-          hash = @a.as_json
-
-          assert_equal %w(justice), hash['tags'].map {|t| t[:id] }
-        end
-      end
-    end
-  end
-
-  context "artefact related external links" do
-    should "have none by default" do
-      artefact = FactoryGirl.create(:artefact)
-      assert_equal 0, artefact.external_links.length
-    end
-
-    should "contain the title and URL of the link" do
-      artefact = FactoryGirl.create(:artefact)
-      artefact.external_links << ArtefactExternalLink.new(:title => "Foo", :url => "http://bar.com")
-      assert_equal 1, artefact.external_links.length
-      assert_equal "Foo", artefact.external_links.first.title
-    end
-  end
-
   should "have an archived? helper method" do
     published_artefact = FactoryGirl.create(:artefact, :slug => "scooby", :state => "live")
     archived_artefact = FactoryGirl.create(:artefact, :slug => "doo", :state => "archived")
@@ -605,83 +479,4 @@ class ArtefactTest < ActiveSupport::TestCase
     refute published_artefact.archived?
     assert archived_artefact.archived?
   end
-
-  should "have a related_items method which discards artefacts that are archived or completed transactions" do
-    generic = FactoryGirl.create(:artefact, slug: "generic")
-    archived = FactoryGirl.create(:artefact, :slug => "archived", :state => "archived")
-    completed = FactoryGirl.create(:artefact, slug: "completed-transaction", kind: "completed_transaction")
-
-    assert_equal [generic], Artefact.relatable_items
-  end
-
-  context "related artefacts grouped by section tags" do
-    setup do
-      FactoryGirl.create(:live_tag, :tag_id => "fruit", :tag_type => 'section', :title => "Fruit")
-      FactoryGirl.create(:live_tag, :tag_id => "fruit/simple", :tag_type => 'section', :title => "Simple fruits", :parent_id => "fruit")
-      FactoryGirl.create(:live_tag, :tag_id => "fruit/aggregate", :tag_type => 'section', :title => "Aggregrate fruits", :parent_id => "fruit")
-      FactoryGirl.create(:live_tag, :tag_id => "vegetables", :tag_type => 'section', :title => "Vegetables")
-
-      @artefact = Artefact.create!(slug: "apple", name: "Apple", sections: [], kind: "guide", need_ids: ["100001"], owning_app: "x")
-    end
-
-    context "when related items are present in all groups" do
-      setup do
-        @artefact.sections = ["fruit/simple"]
-
-        @artefact.related_artefacts = [
-          Artefact.create!(slug: "pear", name: "Pear", kind: "guide", sections: ["fruit/simple"], need_ids: ["100001"], owning_app: "x"),
-          Artefact.create!(slug: "pineapple", name: "Pineapple", kind: "guide", sections: ["fruit/aggregate"], need_ids: ["100001"], owning_app: "x"),
-          Artefact.create!(slug: "broccoli", name: "Broccoli", kind: "guide", sections: ["vegetables"], need_ids: ["100001"], owning_app: "x")
-        ]
-        @artefact.save!
-        @artefact.reload
-      end
-
-      should "return a hash of artefacts in the same subsection" do
-        artefacts = @artefact.related_artefacts_grouped_by_distance
-        assert_equal ["pear"], artefacts['subsection'].map(&:slug)
-      end
-
-      should "return a hash of other artefacts in the same parent section" do
-        artefacts = @artefact.related_artefacts_grouped_by_distance
-        assert_equal ["pineapple"], artefacts['section'].map(&:slug)
-      end
-
-      should "return a hash of artefacts in other sections" do
-        artefacts = @artefact.related_artefacts_grouped_by_distance
-        assert_equal ["broccoli"], artefacts['other'].map(&:slug)
-      end
-
-      should "return related artefacts in order, with a scope" do
-        a = Artefact.create!(state: "live", slug: "a", name: "a", kind: "place", need_ids: ["100001"], owning_app: "x")
-        b = Artefact.create!(slug: "b", name: "b", kind: "place", need_ids: ["100001"], owning_app: "x")
-        c = Artefact.create!(state: "live", slug: "c", name: "c", kind: "place", need_ids: ["100001"], owning_app: "x")
-
-        @artefact.related_artefacts = [c,b,a]
-        @artefact.save!
-        @artefact.reload
-
-        assert_equal [c, a], @artefact.related_artefacts_grouped_by_distance(@artefact.related_artefacts.where(state: "live"))["other"]
-      end
-    end
-
-    should "return an empty array for a group with no related artefacts" do
-      # @artefact with no related items created in setup block
-
-      assert_equal [], @artefact.related_artefacts_grouped_by_distance["subsection"]
-      assert_equal [], @artefact.related_artefacts_grouped_by_distance["section"]
-      assert_equal [], @artefact.related_artefacts_grouped_by_distance["other"]
-    end
-
-    should "return all related artefacts in 'other' when an artefact has no sections" do
-      @artefact.related_artefacts = [
-        Artefact.create!(slug: "pear", name: "Pear", kind: "guide", sections: ["fruit/simple"], need_ids: ["100001"], owning_app: "x"),
-        Artefact.create!(slug: "banana", name: "Banana", kind: "guide", sections: ["fruit/simple"], need_ids: ["100001"], owning_app: "x")
-      ]
-
-      assert_equal [], @artefact.related_artefacts_grouped_by_distance["subsection"]
-      assert_equal [], @artefact.related_artefacts_grouped_by_distance["section"]
-      assert_equal ["pear", "banana"], @artefact.related_artefacts_grouped_by_distance["other"].map(&:slug)
-    end
-  end
 end

data/test/models/edition_test.rb

@@ -14,8 +14,6 @@ class EditionTest < ActiveSupport::TestCase
     artefact = FactoryGirl.create(:artefact,
         kind: "answer",
         name: "Foo bar",
-        # primary_section: "test-section",
-        # sections: ["test-section"],
         owning_app: "publisher")
 
     AnswerEdition.create(state: "ready", slug: "childcare", panopticon_id: artefact.id,
@@ -490,13 +488,10 @@ class EditionTest < ActiveSupport::TestCase
   end
 
   test "should not change edition metadata if archived" do
-    FactoryGirl.create(:live_tag, tag_id: "test-section", title: "Test section", tag_type: "section")
     artefact = FactoryGirl.create(:artefact,
         slug: "foo-bar",
         kind: "answer",
         name: "Foo bar",
-        primary_section: "test-section",
-        sections: ["test-section"],
         owning_app: "publisher",
     )
 
@@ -588,9 +583,6 @@ class EditionTest < ActiveSupport::TestCase
   end
 
   test "should also delete associated artefact" do
-
-    FactoryGirl.create(:live_tag, tag_id: "test-section", title: "Test section", tag_type: "section")
-
     user1 = FactoryGirl.create(:user)
     edition = AnswerEdition.find_or_create_from_panopticon_data(@artefact.id, user1)
 
@@ -600,8 +592,6 @@ class EditionTest < ActiveSupport::TestCase
   end
 
   test "should not delete associated artefact if there are other editions of this publication" do
-
-    FactoryGirl.create(:live_tag, tag_id: "test-section", title: "Test section", tag_type: "section")
     user1 = FactoryGirl.create(:user)
     edition = AnswerEdition.find_or_create_from_panopticon_data(@artefact.id, user1)
     edition.update_attribute(:state, "published")
@@ -924,13 +914,10 @@ class EditionTest < ActiveSupport::TestCase
 
   test "should denormalise a creator's name when an edition is created" do
     user = FactoryGirl.create(:user)
-    FactoryGirl.create(:live_tag, tag_id: "test-section", title: "Test section", tag_type: "section")
     artefact = FactoryGirl.create(:artefact,
         slug: "foo-bar",
         kind: "answer",
         name: "Foo bar",
-        primary_section: "test-section",
-        sections: ["test-section"],
         owning_app: "publisher",
     )
 
@@ -1020,7 +1007,7 @@ class EditionTest < ActiveSupport::TestCase
     end
   end
 
-  test "should return related artefact" do
+  test "should return the artefact" do
     assert_equal "Foo bar", template_published_answer.artefact.name
   end
 
@@ -1093,74 +1080,6 @@ class EditionTest < ActiveSupport::TestCase
     end
   end
 
-  context "Tagging to collections" do
-    setup do
-      @edition = FactoryGirl.create(:guide_edition)
-    end
-
-    should "allow tagging to browse pages" do
-      sample_browse_pages = [
-        'education/school-admissions-transport',
-        'driving/drivers-lorries-buses'
-      ]
-
-      @edition.browse_pages = sample_browse_pages
-      @edition.save!; @edition.reload
-
-      assert_equal sample_browse_pages, @edition.browse_pages
-    end
-
-    should "allow tagging to a primary topic" do
-      sample_primary_topic = 'oil-and-gas/carbon-capture-and-storage'
-
-      @edition.primary_topic = sample_primary_topic
-      @edition.save!; @edition.reload
-
-      assert_equal sample_primary_topic, @edition.primary_topic
-    end
-
-    should "allow tagging to multiple additional topics" do
-      sample_additional_topics = [
-        'oil-and-gas/fields-and-wells',
-        'oil-and-gas/licensing'
-      ]
-
-      @edition.additional_topics = sample_additional_topics
-      @edition.save!; @edition.reload
-
-      assert_equal sample_additional_topics, @edition.additional_topics
-    end
-
-    should "validates topics" do
-      assert_includes Edition.validators.map(&:class), TopicValidator
-    end
-
-    should "validates browse pages" do
-      assert_includes Edition.validators.map(&:class), BrowsePageValidator
-    end
-
-    should "retain collections across new editions" do
-      edition = FactoryGirl.create(:guide_edition,
-        panopticon_id: @artefact.id,
-        state: "published",
-        primary_topic: 'oil-and-gas/carbon-capture-and-storage',
-        additional_topics: [
-          'oil-and-gas/fields-and-wells',
-          'oil-and-gas/licensing'
-        ],
-        browse_pages: [
-          'education/school-admissions-transport',
-          'driving/drivers-lorries-buses'
-        ]
-      )
-
-      new_edition = edition.build_clone
-      assert_equal edition.primary_topic, new_edition.primary_topic
-      assert_equal edition.additional_topics, new_edition.additional_topics
-      assert_equal edition.browse_pages, new_edition.browse_pages
-    end
-  end
-
   context "#latest_major_update" do
     should 'return the most recent published edition with a major change' do
       edition1 = FactoryGirl.create(:answer_edition, major_change: true,