govuk_content_models 42.0.0 → 42.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8bacf08397308954506f1db7f3367eff5bb87825
-  data.tar.gz: d87f23b5972b468378aeb9085dc3241ffe2de61f
+  metadata.gz: 3235aab91ee5afad9c8fcb1520da2a2f5189656c
+  data.tar.gz: 87a4c14074f2d3dd0c76488858508e350a56eedc
 SHA512:
-  metadata.gz: 74dcfde7b33e6dfd7b17af36967cfe065fe299a79c74e6d1d4024e0d100eacfbcaa4504b8f3a3d1bbf107b9bcfae117050da7181c6fa5a1a975ed97c44cca180
-  data.tar.gz: d0df800cf739c23c95372ce124df316b08d0a5feac079a4d90ce1e5cb167c235bb6c17ac11dc91fe182c346851923ed1d72cc909bcb52ae755012605b532876b
+  metadata.gz: 7b18bd52ae7fb325759105abd9d26bbd7c468221486590869a578021383e7e47ce6ef2157de62972008924798da718c41f0b80e0b331680583fea8a142d2f925
+  data.tar.gz: 89ba877b57e0d6e7fc643428f7108d4fac1d48e9487285a73c16d46e1ffa647c709f1a8795567dd02bcceb6fc3fb28660daa38f135a7e76a787f98208a418009

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 42.0.1
+
+- Fix bug in Attachable which prevents the upload of attachments.
+- Remove test files from the built gem.
+
 ## 42.0.0
 
 - Remove everything related to tagging and related links. We now use the content

data/app/traits/attachable.rb

@@ -59,10 +59,10 @@ module Attachable
               response = Attachable.asset_api_client.update_asset(self.send("#{field}_id"), file: instance_variable_get("@#{field}_file"))
             else
               response = Attachable.asset_api_client.create_asset(:file => instance_variable_get("@#{field}_file"))
-              self.send("#{field}_id=", response.id.split('/').last)
+              self.send("#{field}_id=", response["id"].split('/').last)
             end
 
-            self.send("#{field}_url=", response.file_url) if self.respond_to?("#{field}_url=")
+            self.send("#{field}_url=", response["file_url"]) if self.respond_to?("#{field}_url=")
           rescue StandardError
             errors.add("#{field}_id".to_sym, "could not be uploaded")
           end

data/govuk_content_models.gemspec

@@ -8,9 +8,8 @@ Gem::Specification.new do |gem|
   gem.summary       = %q{Shared models for Panopticon and Publisher, as a Rails Engine}
   gem.homepage      = "https://github.com/alphagov/govuk_content_models"
 
-  gem.files         = `git ls-files`.split($\)
+  gem.files         = `git ls-files`.split($\).reject { |f| f.include?('test/') }
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "govuk_content_models"
   gem.require_paths = ["lib", "app"]
   gem.version       = GovukContentModels::VERSION

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 42.0.0
+  version: 42.0.1
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-11 00:00:00.000000000 Z
+date: 2016-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -393,46 +393,6 @@ files:
 - lib/govuk_content_models/test_helpers/local_services.rb
 - lib/govuk_content_models/version.rb
 - lib/mongoid/monkey_patches.rb
-- test/fixtures/uploads/image.jpg
-- test/models/action_test.rb
-- test/models/artefact_action_test.rb
-- test/models/artefact_external_link_test.rb
-- test/models/artefact_test.rb
-- test/models/business_support/business_size_test.rb
-- test/models/business_support/business_type_test.rb
-- test/models/business_support/location_test.rb
-- test/models/business_support/purpose_test.rb
-- test/models/business_support/sector_test.rb
-- test/models/business_support/stage_test.rb
-- test/models/business_support/support_type_test.rb
-- test/models/business_support_edition_test.rb
-- test/models/campaign_edition_test.rb
-- test/models/completed_transaction_edition_test.rb
-- test/models/downtime_test.rb
-- test/models/edition_scheduled_for_publishing_test.rb
-- test/models/edition_test.rb
-- test/models/help_page_edition_test.rb
-- test/models/licence_edition_test.rb
-- test/models/local_service_test.rb
-- test/models/local_transaction_edition_test.rb
-- test/models/overview_dashboard_test.rb
-- test/models/parted_test.rb
-- test/models/prerendered_entity_tests.rb
-- test/models/rendered_manual_test.rb
-- test/models/simple_smart_answer_edition_test.rb
-- test/models/simple_smart_answer_node_test.rb
-- test/models/simple_smart_answer_option_test.rb
-- test/models/time_zone_test.rb
-- test/models/transaction_edition_test.rb
-- test/models/travel_advice_edition_test.rb
-- test/models/user_test.rb
-- test/models/video_edition_test.rb
-- test/models/workflow_test.rb
-- test/test_helper.rb
-- test/traits/attachable_test.rb
-- test/validators/link_validator_test.rb
-- test/validators/safe_html_validator_test.rb
-- test/validators/slug_validator_test.rb
 homepage: https://github.com/alphagov/govuk_content_models
 licenses: []
 metadata: {}
@@ -457,44 +417,4 @@ rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: Shared models for Panopticon and Publisher, as a Rails Engine
-test_files:
-- test/fixtures/uploads/image.jpg
-- test/models/action_test.rb
-- test/models/artefact_action_test.rb
-- test/models/artefact_external_link_test.rb
-- test/models/artefact_test.rb
-- test/models/business_support/business_size_test.rb
-- test/models/business_support/business_type_test.rb
-- test/models/business_support/location_test.rb
-- test/models/business_support/purpose_test.rb
-- test/models/business_support/sector_test.rb
-- test/models/business_support/stage_test.rb
-- test/models/business_support/support_type_test.rb
-- test/models/business_support_edition_test.rb
-- test/models/campaign_edition_test.rb
-- test/models/completed_transaction_edition_test.rb
-- test/models/downtime_test.rb
-- test/models/edition_scheduled_for_publishing_test.rb
-- test/models/edition_test.rb
-- test/models/help_page_edition_test.rb
-- test/models/licence_edition_test.rb
-- test/models/local_service_test.rb
-- test/models/local_transaction_edition_test.rb
-- test/models/overview_dashboard_test.rb
-- test/models/parted_test.rb
-- test/models/prerendered_entity_tests.rb
-- test/models/rendered_manual_test.rb
-- test/models/simple_smart_answer_edition_test.rb
-- test/models/simple_smart_answer_node_test.rb
-- test/models/simple_smart_answer_option_test.rb
-- test/models/time_zone_test.rb
-- test/models/transaction_edition_test.rb
-- test/models/travel_advice_edition_test.rb
-- test/models/user_test.rb
-- test/models/video_edition_test.rb
-- test/models/workflow_test.rb
-- test/test_helper.rb
-- test/traits/attachable_test.rb
-- test/validators/link_validator_test.rb
-- test/validators/safe_html_validator_test.rb
-- test/validators/slug_validator_test.rb
+test_files: []

data/test/models/action_test.rb

@@ -1,13 +0,0 @@
-require "test_helper"
-
-class ActionTest < ActiveSupport::TestCase
-  test "#to_s should return the humanized version of the request type" do
-    assert_equal "Approve review", Action.new(request_type: 'approve_review').to_s
-  end
-
-  test "#to_s should contain the scheduled time when request type is SCHEDULE_FOR_PUBLISHING" do
-    assert_equal "Scheduled for publishing on 12/12/2014 00:00",
-      Action.new(:request_type => 'schedule_for_publishing',
-                 :request_details => { 'scheduled_time' => Date.parse('12/12/2014').to_time.utc }).to_s
-  end
-end

data/test/models/artefact_action_test.rb

@@ -1,130 +0,0 @@
-require "test_helper"
-
-def merge_attributes(original, *update_hashes)
-  # Merge multiple attribute hashes: this also differs from Hash#merge in that
-  # it converts symbolic keys to strings
-  if update_hashes.empty?
-    return original
-  else
-    first_update, *other_updates = update_hashes
-    updated = first_update.reduce(original) do |old, pair|
-      key, value = pair
-      old.merge(key.to_s => value)
-    end
-    merge_attributes(updated, *other_updates)
-  end
-end
-
-class ArtefactActionTest < ActiveSupport::TestCase
-
-  DEFAULTS = {
-    "active" => false,
-    "need_ids" => [],
-    "state" => "draft",
-    "paths" => [],
-    "prefixes" => [],
-    "language" => "en",
-  }
-
-  def base_fields
-    {
-      slug: "an-artefact",
-      name: "An artefact",
-      kind: "answer",
-      owning_app: "publisher"
-    }
-  end
-
-  def setup
-    @artefact = Artefact.create!(base_fields)
-  end
-
-  test "a new artefact should have a create action" do
-    @artefact.reload
-
-    assert_equal 1, @artefact.actions.size
-    action = @artefact.actions.first
-    assert_equal "create", action[:action_type]
-    assert_equal merge_attributes(DEFAULTS, base_fields), action.snapshot
-    assert action.created_at, "Action has no creation timestamp"
-  end
-
-  test "an updated artefact should have two actions" do
-    @artefact.description = "An artefact of shining wonderment."
-    @artefact.save!
-    @artefact.reload
-
-    assert_equal 2, @artefact.actions.size
-    assert_equal ["create", "update"], @artefact.actions.map(&:action_type)
-    create_snapshot = merge_attributes(DEFAULTS, base_fields)
-    update_snapshot = create_snapshot.merge("description" => @artefact.description)
-    assert_equal create_snapshot, @artefact.actions[0].snapshot
-    assert_equal update_snapshot, @artefact.actions[1].snapshot
-    @artefact.actions.each do |action|
-      assert action.created_at, "Action has no creation timestamp"
-    end
-  end
-
-  test "saving with no tracked changes will not create a new snapshot" do
-    @artefact.updated_at = Time.zone.now + 5.minutes
-    @artefact.save!
-    assert_equal 1, @artefact.actions.size
-  end
-
-  test "updating attributes as a user should record a user action" do
-    user = FactoryGirl.create :user
-    updates = {description: "Shiny shiny description"}
-    @artefact.update_attributes_as user, updates
-    @artefact.reload
-
-    assert_equal "Shiny shiny description", @artefact.description
-    assert_equal 2, @artefact.actions.size
-    assert_equal ["create", "update"], @artefact.actions.map(&:action_type)
-    assert_equal user, @artefact.actions.last.user
-    assert_equal(
-        merge_attributes(DEFAULTS, base_fields, updates),
-        @artefact.actions.last.snapshot
-    )
-  end
-
-  test "saving a task should record the task action" do
-    @artefact.description = "Updated automatically"
-    @artefact.save_as_task!('TaggingUpdater')
-    @artefact.reload
-
-    assert_equal 2, @artefact.actions.size
-    assert_equal ["create", "update"], @artefact.actions.map(&:action_type)
-
-    assert_equal 'TaggingUpdater', @artefact.actions.last.task_performed_by
-    assert_equal nil, @artefact.actions.last.user
-  end
-
-  test "saving as a user should record a user action" do
-    user = FactoryGirl.create :user
-    updates = {description: "Shiny shiny description"}
-    @artefact.description = updates[:description]
-    @artefact.save_as user
-    @artefact.reload
-
-    assert_equal "Shiny shiny description", @artefact.description
-    assert_equal 2, @artefact.actions.size
-    assert_equal ["create", "update"], @artefact.actions.map(&:action_type)
-    assert_equal user, @artefact.actions.last.user
-    assert_equal(
-        merge_attributes(DEFAULTS, base_fields, updates),
-        @artefact.actions.last.snapshot
-    )
-  end
-
-  test "saving as a user with an action type" do
-    user = FactoryGirl.create :user
-    updates = {description: "Shiny shiny description"}
-    @artefact.description = updates[:description]
-    @artefact.save_as user, action_type: "awesome"
-    @artefact.reload
-
-    assert_equal user, @artefact.actions.last.user
-    assert_equal "awesome", @artefact.actions.last.action_type
-  end
-
-end

data/test/models/artefact_external_link_test.rb

@@ -1,32 +0,0 @@
-require "test_helper"
-
-class ArtefactExternalLinkTest < ActiveSupport::TestCase
-  context "validating a link" do
-    should "not be valid without a title or URL" do
-      refute ArtefactExternalLink.new.valid?
-    end
-
-    should "not be valid with URL missing" do
-      refute ArtefactExternalLink.new(:title => "Foo").valid?
-    end
-
-    should "not be valid with title missing" do
-      refute ArtefactExternalLink.new(:url => "http://bar.com").valid?
-    end
-
-    should "be valid with both fields supplied" do
-      link = ArtefactExternalLink.new(:title => "Foo", :url => "http://bar.com")
-      assert link.valid?
-    end
-
-    should "only be valid if the URL is valid" do
-      link = ArtefactExternalLink.new(:title => "Foo", :url => "notreal://foo.com")
-      refute link.valid?
-    end
-
-    should "be valid with an https URL" do
-      link = ArtefactExternalLink.new(:title => "Foo", :url => "https://bar.com")
-      assert link.valid?
-    end
-  end
-end

data/test/models/artefact_test.rb

@@ -1,482 +0,0 @@
-require "test_helper"
-
-class ArtefactTest < ActiveSupport::TestCase
-  context "validating slug" do
-    should "allow nice clean slugs" do
-      a = FactoryGirl.build(:artefact, slug: "its-a-nice-day")
-      assert a.valid?
-    end
-
-    should "not allow apostrophes in slugs" do
-      a = FactoryGirl.build(:artefact, slug: "it's-a-nice-day")
-      refute a.valid?
-      assert a.errors[:slug].any?
-    end
-
-    should "not allow spaces in slugs" do
-      a = FactoryGirl.build(:artefact, slug: "it is-a-nice-day")
-      refute a.valid?
-      assert a.errors[:slug].any?
-    end
-
-    should "allow slashes in slugs when the namespace is 'done'" do
-      a = FactoryGirl.build(:artefact, slug: "done/its-a-nice-day")
-      assert a.valid?
-    end
-
-    should "not allow slashes in slugs when the namespace is not 'done'" do
-      a = FactoryGirl.build(:artefact, slug: "something-else/its-a-nice-day")
-      refute a.valid?
-      assert a.errors[:slug].any?
-    end
-
-    should "allow travel-advice to have a slug prefixed with 'foreign-travel-advice/'" do
-      a = FactoryGirl.build(:artefact, slug: "foreign-travel-advice/aruba", kind: "travel-advice")
-      assert a.valid?
-    end
-
-    should "not allow multiple slashes in travel-advice artefacts" do
-      a = FactoryGirl.build(:artefact, slug: "foreign-travel-advice/aruba/foo", kind: "travel-advice")
-      refute a.valid?
-      assert a.errors[:slug].any?
-    end
-
-    should "not allow a foreign-travel-advice prefix for non-travel-advice artefacts" do
-      a = FactoryGirl.build(:artefact, slug: "foreign-travel-advice/aruba", kind: "answer")
-      refute a.valid?
-      assert a.errors[:slug].any?
-    end
-
-    should "allow a government prefix for Inside Government artefacts" do
-      a = FactoryGirl.build(:artefact, slug: "government/slug", kind: "case_study")
-      assert a.valid?
-    end
-
-    should "allow a government prefix and multiple path parts for Inside Government artefacts" do
-      a = FactoryGirl.build(:artefact, slug: "government/something/somewhere/somehow/slug", kind: "case_study")
-      assert a.valid?
-    end
-
-    should "not allow a government prefix with invalid path parts" do
-      a = FactoryGirl.build(:artefact, slug: "government/SomeThing/some.where/somehow/slug", kind: "case_study")
-      refute a.valid?
-    end
-
-    should "require a government prefix for Inside Government artefacts" do
-      a = FactoryGirl.build(:artefact, slug: "slug", kind: "case_study")
-      refute a.valid?
-    end
-
-    should "not require a government prefix for Detailed Guides" do
-      a = FactoryGirl.build(:artefact, slug: "slug", kind: "detailed_guide")
-      assert a.valid?
-    end
-
-    context "help page special case" do
-      should "allow a help page to have a help/ prefix on the slug" do
-        a = FactoryGirl.build(:artefact, :slug => "help/foo", :kind => "help_page")
-        assert a.valid?
-      end
-
-      should "require a help page to have a help/ prefix on the slug" do
-        a = FactoryGirl.build(:artefact, :slug => "foo", :kind => "help_page")
-        refute a.valid?
-        assert_equal 1, a.errors[:slug].count
-      end
-
-      should "not allow other kinds to have a help/ prefix" do
-        a = FactoryGirl.build(:artefact, :slug => "help/foo", :kind => "answer")
-        refute a.valid?
-        assert_equal 1, a.errors[:slug].count
-      end
-    end
-  end
-
-  context "#need_ids" do
-    should "be empty by default" do
-      assert_empty FactoryGirl.build(:artefact).need_ids
-    end
-
-    should "do validations if nil" do
-      artefact = FactoryGirl.create(:artefact, need_ids: ["100001"])
-      artefact.need_ids = nil
-
-      assert_nothing_raised { artefact.valid? }
-    end
-
-    should "filter out empty strings" do
-      artefact = FactoryGirl.create(:artefact, need_ids: ["", "100002"])
-      assert_equal ["100002"], artefact.reload.need_ids
-    end
-
-    should "store multiple needs related to an artefact" do
-      artefact = FactoryGirl.create(:artefact, need_ids: ["100001", "100002"])
-      assert_equal ["100001", "100002"], artefact.reload.need_ids
-    end
-
-    should "be six-digit integers" do
-      artefact = FactoryGirl.build(:artefact, need_ids: ["B1231"])
-
-      refute artefact.valid?
-      assert_includes artefact.errors[:need_ids], "must be six-digit integer strings"
-    end
-
-    should "not validate need ids that were migrated from the singular need_id field" do
-      artefact = FactoryGirl.create(:artefact)
-      # simulate what happened during migration
-      artefact.set(need_ids: ['As an employer
-                                I need to know which type of DBS check an employee needs
-                                so that I can apply for the correct one'])
-
-      artefact.need_ids << "100045"
-
-      assert artefact.valid?
-    end
-
-    context "for backwards compatibility" do
-      setup do
-        @artefact = FactoryGirl.create(:artefact)
-      end
-
-      should "append to need_ids when need_id is assigned" do
-        @artefact.need_id = "100045"
-
-        assert_equal "100045", @artefact.need_id
-        assert_includes @artefact.need_ids, "100045"
-      end
-
-      should "append to existing need_ids when need_id is assigned" do
-        @artefact.set(need_ids: ["100044"])
-        @artefact.set(need_id: "100044")
-
-        @artefact.need_id = "100045"
-
-        assert_equal "100045", @artefact.need_id
-        assert_equal %w(100044 100045), @artefact.need_ids
-      end
-
-      # this should only matter till the time we have both fields
-      # need_id and need_ids. can delete this test once we unset need_id.
-      should "keep need_ids unchanged when need_id is removed" do
-        @artefact.set(need_ids: %w(100044 100045))
-        @artefact.set(need_id: "100044")
-
-        @artefact.need_id = nil
-
-        assert_equal nil, @artefact.need_id
-        assert_equal %w(100044 100045), @artefact.need_ids
-      end
-    end
-  end
-
-  context "validating paths and prefixes" do
-    setup do
-      @a = FactoryGirl.build(:artefact)
-    end
-
-    should "be valid when empty" do
-      @a.paths = []
-      @a.prefixes = []
-      assert @a.valid?
-
-      @a.paths = nil
-      @a.prefixes = nil
-      assert @a.valid?
-    end
-
-    should "be valid when set to array of absolute URL paths" do
-      @a.paths = ["/foo.json"]
-      @a.prefixes = ["/foo", "/bar"]
-      assert @a.valid?
-    end
-
-    should "be invalid if an entry is not a valid absolute URL path" do
-      [
-        "not a URL path",
-        "http://foo.example.com/bar",
-        "bar/baz",
-        "/foo/bar?baz=qux",
-      ].each do |path|
-        @a.paths = ["/foo.json", path]
-        @a.prefixes = ["/foo", path]
-        refute @a.valid?
-        assert_equal 1, @a.errors[:paths].count
-        assert_equal 1, @a.errors[:prefixes].count
-      end
-    end
-
-    should "be invalid with consecutive or trailing slashes" do
-      [
-        "/foo//bar",
-        "/foo/bar///",
-        "//bar/baz",
-        "//",
-        "/foo/bar/",
-      ].each do |path|
-        @a.paths = ["/foo.json", path]
-        @a.prefixes = ["/foo", path]
-        refute @a.valid?
-        assert_equal 1, @a.errors[:paths].count
-        assert_equal 1, @a.errors[:prefixes].count
-      end
-    end
-
-    should "skip validating these if they haven't changed" do
-      # This validation can be expensive, so skip it where unnecessary.
-      @a.paths = ["foo"]
-      @a.prefixes = ["bar"]
-      @a.save :validate => false
-
-      assert @a.valid?
-    end
-  end
-
-  should "validate redirect_url" do
-    artefact = FactoryGirl.create(:artefact)
-
-    artefact.redirect_url = "foobar"
-    refute artefact.valid?
-
-    artefact.redirect_url = "/foobar"
-    assert artefact.valid?
-
-    artefact.redirect_url = "/foobar?an=argument"
-    assert artefact.valid?
-
-    artefact.redirect_url = "/foobar#chapter"
-    assert artefact.valid?
-
-    artefact.redirect_url = "http://foo.bar/"
-    refute artefact.valid?
-
-    [
-      "\jkhsdfgjkhdjskfgh//fdf#th",
-      "not a URL path",
-      "bar/baz",
-      "/foo//bar",
-    ].each do |invalid_path|
-      artefact.redirect_url = invalid_path
-      refute artefact.valid?
-    end
-  end
-
-  test "should translate kind into internally normalised form" do
-    a = Artefact.new(kind: "benefit / scheme")
-    a.normalise
-    assert_equal "programme", a.kind
-  end
-
-  test "should not translate unknown kinds" do
-    a = Artefact.new(kind: "other")
-    a.normalise
-    assert_equal "other", a.kind
-  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")
-    end
-  end
-
-  should "update the edition's slug when a draft artefact is saved" do
-    artefact = FactoryGirl.create(:draft_artefact)
-    edition = FactoryGirl.create(:answer_edition, panopticon_id: artefact.id)
-
-    artefact.slug = "something-something-draft"
-    artefact.save!
-
-    edition.reload
-    assert_equal artefact.slug, edition.slug
-  end
-
-  should "not touch the updated_at field on the editions when the artefact is saved but the slug hasn't changed" do
-    artefact = FactoryGirl.create(:draft_artefact)
-    edition = FactoryGirl.create(:answer_edition, panopticon_id: artefact.id)
-    old_updated_at = 2.days.ago.to_time
-    edition.set(updated_at: old_updated_at)
-
-    artefact.language = "cy"
-    artefact.save!
-
-    edition.reload
-    assert_equal old_updated_at.utc.iso8601, edition.updated_at.utc.iso8601
-  end
-
-  should "not update the edition's slug when a live artefact is saved" do
-    artefact = FactoryGirl.create(:live_artefact, slug: "something-something-live")
-    edition = FactoryGirl.create(:answer_edition, panopticon_id: artefact.id, slug: "something-else")
-
-    artefact.save!
-
-    edition.reload
-    assert_equal "something-else", edition.slug
-  end
-
-  should "not update the edition's slug when an archived artefact is saved" do
-    artefact = FactoryGirl.create(:live_artefact, slug: "something-something-live")
-    edition = FactoryGirl.create(:answer_edition, panopticon_id: artefact.id, slug: "something-else")
-
-    artefact.state = 'archived'
-    artefact.save!
-
-    edition.reload
-    assert_equal "something-else", edition.slug
-  end
-
-  test "should not let you edit the slug if the artefact is live" do
-    artefact = FactoryGirl.create(:artefact,
-        slug: "too-late-to-edit",
-        kind: "answer",
-        name: "Foo bar",
-        owning_app: "publisher",
-        state: "live"
-    )
-
-    artefact.slug = "belated-correction"
-    refute artefact.save
-
-    assert_equal "too-late-to-edit", artefact.reload.slug
-  end
-
-  # 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
-    artefact = FactoryGirl.create(:artefact,
-        slug: "foo-bar",
-        kind: "answer",
-        name: "Foo bar",
-        owning_app: "publisher",
-    )
-
-    user1 = FactoryGirl.create(:user)
-    edition = AnswerEdition.find_or_create_from_panopticon_data(artefact.id, user1)
-    edition.state = "published"
-    edition.save!
-
-    assert_equal artefact.name, edition.title
-
-    artefact.name = "Babar"
-    artefact.save
-
-    edition.reload
-    assert_not_equal artefact.name, edition.title
-  end
-
-  test "should indicate when any editions have been published for this artefact" do
-    artefact = FactoryGirl.create(:artefact,
-        slug: "foo-bar",
-        kind: "answer",
-        name: "Foo bar",
-        owning_app: "publisher",
-    )
-    user1 = FactoryGirl.create(:user)
-    edition = AnswerEdition.find_or_create_from_panopticon_data(artefact.id, user1)
-
-    refute artefact.any_editions_published?
-
-    edition.state = "published"
-    edition.save!
-
-    assert artefact.any_editions_published?
-  end
-
-  test "should have 'video' as a supported FORMAT" do
-    assert_includes Artefact::FORMATS, "video"
-  end
-
-  test "should find the default owning_app for a format" do
-    assert_equal "publisher", Artefact.default_app_for_format("guide")
-  end
-
-  test "should allow creation of artefacts with 'video' as the kind" do
-    artefact = Artefact.create!(slug: "omlette-du-fromage", name: "Omlette du fromage", kind: "video", owning_app: "Dexter's Lab")
-
-    refute artefact.nil?
-    assert_equal "video", artefact.kind
-  end
-
-  test "should archive all editions when archived" do
-    artefact = FactoryGirl.create(:artefact, state: "live")
-    editions = ["draft", "ready", "published", "archived"].map { |state|
-      FactoryGirl.create(:programme_edition, panopticon_id: artefact.id, state: state)
-    }
-    user1 = FactoryGirl.create(:user)
-
-    artefact.update_attributes_as(user1, state: "archived")
-    artefact.save!
-
-    editions.each(&:reload)
-    editions.each do |edition|
-      assert_equal "archived", edition.state
-    end
-    # remove the previously already archived edition, as no note will have been added
-    editions.pop
-    editions.each do |edition|
-      assert_equal "Artefact has been archived. Archiving this edition.", edition.actions.first.comment
-    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")
-    artefact.state = "archived"
-    artefact.save
-    assert_raise RuntimeError do
-      edition.update_attributes({state: "archived", title: "Shabba", slug: "do-not-allow"})
-    end
-  end
-
-  should "not remove double dashes in a Detailed Guide slug" do
-    a = FactoryGirl.create(:artefact, slug: "duplicate-slug--1", kind: "detailed_guide")
-    a.reload
-
-    assert_equal "duplicate-slug--1", a.slug
-  end
-
-  context "artefact language" do
-    should "return english by default" do
-      a = FactoryGirl.create(:artefact)
-
-      assert_equal 'en', a.language
-    end
-
-    should "accept welsh language" do
-      a = FactoryGirl.build(:artefact)
-      a.language = 'cy'
-      a.save
-
-      a = Artefact.first
-      assert_equal 'cy', a.language
-    end
-
-    should "reject a language which is not english or welsh" do
-      a = FactoryGirl.build(:artefact)
-      a.language = 'pirate'
-
-      assert ! a.valid?
-    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")
-
-    refute published_artefact.archived?
-    assert archived_artefact.archived?
-  end
-end