govuk_content_models 33.0.0 → 34.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccc127a5ceb4e2937cf46d309811a181857a1134
-  data.tar.gz: 17c724516231fbd2aa3267e920efa9d919ceee6f
+  metadata.gz: 5e57d325ccc96b7ded00251c5fba3ab51e74d58d
+  data.tar.gz: 9bec9ac5c2b93270b66163442d8a771eb21e5398
 SHA512:
-  metadata.gz: 1bf5e48276ea1b721fd299d266196d55cbf69b4409f4bc888bd51d3c8bd164695018052fc60dd13f22e99907d2d95c867d220d0ab82d2c4c147f3386bc8c3042
-  data.tar.gz: dce39a0f4b6c0358f59530e3a4236f007aa6f041f16c60e292f43dafe0e79deef75a39f6738baa3d66a05086e73873862c8ee4ccbca79f2d3f4a65d4f29d02ff
+  metadata.gz: 9a34f277be32a2a43a9e6aee4579bf5c66f80614b836db8b3bfcc46a4b7251c01967af251e37cb140c4a77557741cc3bdd945fa22ba777eedb2f9ba352d95b90
+  data.tar.gz: 7cdf7ab729992789532203d469bacd8fd9bb53b66e298446406242067d8c506a55c2117310735961791b55ff3a0afe54f7f109cc5a0afd2f2e3c6493488d8766

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 34.0.0
+
+- Removes `legacy_source` tag [#368](https://github.com/alphagov/govuk_content_models/pull/368)
+
 ## 33.0.0
 
 - Changes `save_as_task` to `save_as_task!` [#364](https://github.com/alphagov/govuk_content_models/pull/364)

data/app/models/artefact.rb

@@ -17,7 +17,7 @@ class Artefact
 
   include Taggable
   stores_tags_for :sections, :writing_teams, :propositions,
-                  :keywords, :legacy_sources, :specialist_sectors, :organisations
+                  :keywords, :specialist_sectors, :organisations
   has_primary_tag_for :section
 
   field "name",                 type: String

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

data/test/models/artefact_tag_test.rb

@@ -3,9 +3,6 @@ require "test_helper"
 class ArtefactTagTest < ActiveSupport::TestCase
 
   TEST_KEYWORDS = [['cheese', 'Cheese'], ['bacon', 'Bacon']]
-  TEST_LEGACY_SOURCES = [
-    ['businesslink', 'Business Link'], ['directgov', 'Directgov'], ['dvla', 'DVLA']
-  ]
 
   setup do
     parent_section = FactoryGirl.create(:live_tag, :tag_id => 'crime', :tag_type => 'section', :title => 'Crime')
@@ -15,9 +12,6 @@ class ArtefactTagTest < ActiveSupport::TestCase
     TEST_KEYWORDS.each do |tag_id, title|
       FactoryGirl.create(:live_tag, :tag_id => tag_id, :tag_type => 'keyword', :title => title)
     end
-    TEST_LEGACY_SOURCES.each do |tag_id, title|
-      FactoryGirl.create(:live_tag, :tag_id => tag_id, :tag_type => 'legacy_source', :title => title)
-    end
   end
 
   test "return primary section title when asked for its section" do
@@ -43,25 +37,14 @@ class ArtefactTagTest < ActiveSupport::TestCase
     a = FactoryGirl.create(:artefact)
 
     a.sections = ['crime', 'crime/the-police']
-    a.legacy_sources = ['businesslink']
     a.keywords = ['bacon']
 
     expected_tags = [
       { "tag_id" => "crime", "tag_type" => "section" },
       { "tag_id" => "crime/the-police", "tag_type" => "section" },
-      { "tag_id" => "businesslink", "tag_type" => "legacy_source" },
       { "tag_id" => "bacon", "tag_type" => "keyword" },
     ]
-    assert_equal ["crime", "crime/the-police", "businesslink", "bacon"], a.tag_ids
+    assert_equal ["crime", "crime/the-police", "bacon"], a.tag_ids
     assert_equal expected_tags, a.attributes["tags"]
   end
-
-  test "has legacy_sources tag collection" do
-    a = FactoryGirl.build(:artefact)
-    a.legacy_sources = ['businesslink', 'dvla']
-    a.save
-
-    a = Artefact.first
-    assert_equal ["businesslink", "dvla"], a.legacy_source_ids
-  end
 end

data/test/models/artefact_test.rb

@@ -551,9 +551,6 @@ class ArtefactTest < ActiveSupport::TestCase
       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")
-        FactoryGirl.create(:live_tag, :tag_type => 'legacy_source', :tag_id => 'directgov', :title => 'Directgov')
-        FactoryGirl.create(:live_tag, :tag_type => 'legacy_source', :tag_id => 'businesslink', :title => 'Business Link')
-
         @a = FactoryGirl.create(:artefact, :slug => 'fooey')
       end
 
@@ -567,14 +564,13 @@ class ArtefactTest < ActiveSupport::TestCase
       context "for an artefact with tags" do
         setup do
           @a.sections = ['justice']
-          @a.legacy_sources = ['businesslink']
           @a.save!
         end
 
         should "return an array of tag_id strings in tag_ids" do
           hash = @a.as_json
 
-          assert_equal ['justice', 'businesslink'], hash['tag_ids']
+          assert_equal ['justice'], hash['tag_ids']
         end
 
         should "return an array of tag objects in tags" do
@@ -588,13 +584,6 @@ class ArtefactTest < ActiveSupport::TestCase
               :description => 'All about justice',
               :short_description => nil
             },
-            {
-              :id => 'businesslink',
-              :title => 'Business Link',
-              :type => 'legacy_source',
-              :description => nil,
-              :short_description => nil
-            }
           ]
           assert_equal expected, hash['tags']
         end
@@ -603,7 +592,7 @@ class ArtefactTest < ActiveSupport::TestCase
           @a.tag_ids << 'batman'
           hash = @a.as_json
 
-          assert_equal %w(justice businesslink), hash['tags'].map {|t| t[:id] }
+          assert_equal %w(justice), hash['tags'].map {|t| t[:id] }
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 33.0.0
+  version: 34.0.0
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext