govuk_content_models 34.0.0 → 35.0.0

data/test/models/tag_test.rb

@@ -156,13 +156,6 @@ class TagTest < ActiveSupport::TestCase
       assert_equal 'live', tag.state
     end
 
-    should "not mass-assign the state attribute" do
-      tag = Tag.create(@atts.merge(state: 'live'))
-      tag.reload
-
-      refute_equal 'live', tag.state
-    end
-
     should "not be created in another state" do
       tag = Tag.new(@atts)
       tag.state = 'foo'
@@ -187,7 +180,7 @@ class TagTest < ActiveSupport::TestCase
       tag.publish!
       tag.reload
 
-      assert_raises StateMachine::InvalidTransition do
+      assert_raises StateMachines::InvalidTransition do
         tag.publish!
       end
     end

data/test/models/travel_advice_edition_test.rb

@@ -19,7 +19,7 @@ class TravelAdviceEditionTest < ActiveSupport::TestCase
     ed.change_description = "Some things"
     ed.synonyms = ["Foo", "Bar"]
     ed.parts.build(:title => "Part One", :slug => "one")
-    ed.safely.save!
+    ed.save!
 
     ed = TravelAdviceEdition.first
     assert_equal "Travel advice for Aruba", ed.title
@@ -319,6 +319,7 @@ class TravelAdviceEditionTest < ActiveSupport::TestCase
       @published = FactoryGirl.create(:published_travel_advice_edition, :country_slug => 'aruba',
                                       :published_at => 3.days.ago, :change_description => 'Stuff changed')
       @ed = FactoryGirl.create(:travel_advice_edition, :country_slug => 'aruba')
+      @published.reload
     end
 
     should "publish the edition and archive related editions" do
@@ -358,6 +359,7 @@ class TravelAdviceEditionTest < ActiveSupport::TestCase
                                       :published_at => 3.days.ago, :change_description => 'Stuff changed')
       @published.reviewed_at = 2.days.ago
       @published.save!
+      @published.reload
 
       Timecop.freeze(1.days.ago) do
         # this is done to make sure there's a significant difference in time

data/test/models/user_test.rb

@@ -64,7 +64,7 @@ class UserTest < ActiveSupport::TestCase
   test "should find and update the user with oauth params" do
     attributes = {uid: "1234abcd", name: "Old", email: "old@m.com",
         permissions: ["everything"]}
-    User.create!(attributes, without_protection: true)
+    User.create!(attributes)
     auth_hash = {
       "uid" => "1234abcd",
       "info" => {

data/test/models/video_edition_test.rb

@@ -11,7 +11,7 @@ class VideoEditionTest < ActiveSupport::TestCase
     v.video_summary = "Coke smoothie"
     v.body = "Description of video"
     v.caption_file_id = 'file-to-an-asset-of-the-caption-file'
-    v.safely.save!
+    v.save!
 
     v = VideoEdition.first
     assert_equal "http://www.youtube.com/watch?v=qySFp3qnVmM", v.video_url

data/test/models/workflow_test.rb

@@ -6,8 +6,8 @@ class WorkflowTest < ActiveSupport::TestCase
   end
 
   def template_users
-    user = User.create(name: "Bob")
-    other_user = User.create(name: "James")
+    user = FactoryGirl.create(:user, name: "Bob")
+    other_user = FactoryGirl.create(:user, name: "James")
     return user, other_user
   end
 
@@ -24,8 +24,8 @@ class WorkflowTest < ActiveSupport::TestCase
   end
 
   def publisher_and_guide
-    user = User.create(name: "Ben")
-    other_user = User.create(name: "James")
+    user = FactoryGirl.create(:user, name: "Ben")
+    other_user = FactoryGirl.create(:user, name: "James")
 
     guide = user.create_edition(:guide, panopticon_id: @artefact.id, overview: "My Overview", title: "My Title", slug: "my-title")
     edition = guide
@@ -40,8 +40,8 @@ class WorkflowTest < ActiveSupport::TestCase
   end
 
   def template_user_and_published_transaction
-    user = User.create(name: "Ben")
-    other_user = User.create(name: "James")
+    user = FactoryGirl.create(:user, name: "Ben")
+    other_user = FactoryGirl.create(:user, name: "James")
 
     transaction = user.create_edition(:transaction, title: "My title", slug: "my-title", panopticon_id: @artefact.id, need_to_know: "Credit card required")
     transaction.save
@@ -110,7 +110,7 @@ class WorkflowTest < ActiveSupport::TestCase
 
   test "a guide should be marked as having reviewables if requested for review" do
     guide = template_guide
-    user = User.create(name:"Ben")
+    user = FactoryGirl.create(:user, name: "Ben")
     refute guide.in_review?
     assert_nil guide.review_requested_at
 
@@ -131,8 +131,8 @@ class WorkflowTest < ActiveSupport::TestCase
   end
 
   test "guide workflow" do
-    user = User.create(name: "Ben")
-    other_user = User.create(name: "James")
+    user = FactoryGirl.create(:user, name: "Ben")
+    other_user = FactoryGirl.create(:user, name: "James")
 
     guide = user.create_edition(:guide, title: "My Title", slug: "my-title", panopticon_id: @artefact.id)
     edition = guide
@@ -150,8 +150,8 @@ class WorkflowTest < ActiveSupport::TestCase
   end
 
   test "when fact check has been initiated it can be skipped" do
-    user = User.create(name: "Ben")
-    other_user = User.create(name: "James")
+    user = FactoryGirl.create(:user, name: "Ben")
+    other_user = FactoryGirl.create(:user, name: "James")
 
     edition = user.create_edition(:guide, panopticon_id: @artefact.id, overview: "My Overview", title: "My Title", slug: "my-title")
 
@@ -167,8 +167,8 @@ class WorkflowTest < ActiveSupport::TestCase
 
   # until we improve the validation to produce few or no false positives
   test "when processing fact check, it is not validated" do
-    user = User.create(name: "Ben")
-    other_user = User.create(name: "James")
+    user = FactoryGirl.create(:user, name: "Ben")
+    other_user = FactoryGirl.create(:user, name: "James")
 
     guide = user.create_edition(:guide, panopticon_id: FactoryGirl.create(:artefact).id, overview: "My Overview", title: "My Title", slug: "my-title")
     edition = guide
@@ -182,8 +182,8 @@ class WorkflowTest < ActiveSupport::TestCase
   end
 
   test "fact_check_received can go back to out for fact_check" do
-    user = User.create(name: "Ben")
-    other_user = User.create(name: "James")
+    user = FactoryGirl.create(:user, name: "Ben")
+    other_user = FactoryGirl.create(:user, name: "James")
 
     guide = user.create_edition(:guide, panopticon_id: FactoryGirl.create(:artefact).id, overview: "My Overview", title: "My Title", slug: "my-title")
     edition = guide
@@ -198,8 +198,8 @@ class WorkflowTest < ActiveSupport::TestCase
   end
 
   test "when processing fact check, an edition can request for amendments" do
-    user = User.create(name: "Ben")
-    other_user = User.create(name: "James")
+    user = FactoryGirl.create(:user, name: "Ben")
+    other_user = FactoryGirl.create(:user, name: "James")
 
     guide = user.create_edition(:guide, panopticon_id: FactoryGirl.create(:artefact).id, overview: "My Overview", title: "My Title", slug: "my-title")
     edition = guide
@@ -214,9 +214,9 @@ class WorkflowTest < ActiveSupport::TestCase
   end
 
   test "ready items may require further amendments" do
-    user = User.create(name: "Ben")
-    other_user = User.create(name: "James")
-    another_user = User.create(name: "Fiona")
+    user = FactoryGirl.create(:user, name: "Ben")
+    other_user = FactoryGirl.create(:user, name: "James")
+    FactoryGirl.create(:user, name: "Fiona")
 
     guide = user.create_edition(:guide, panopticon_id: FactoryGirl.create(:artefact).id, overview: "My Overview", title: "My Title", slug: "my-title")
     edition = guide
@@ -234,8 +234,8 @@ class WorkflowTest < ActiveSupport::TestCase
   end
 
   test "check counting reviews" do
-    user = User.create(name: "Ben")
-    other_user = User.create(name: "James")
+    user = FactoryGirl.create(:user, name: "Ben")
+    other_user = FactoryGirl.create(:user, name: "James")
 
     guide = user.create_edition(:guide, title: "My Title", slug: "my-title", panopticon_id: @artefact.id)
     edition = guide
@@ -254,7 +254,7 @@ class WorkflowTest < ActiveSupport::TestCase
   end
 
   test "user should not be able to review a guide they requested review for" do
-    user = User.create(name: "Ben")
+    user = FactoryGirl.create(:user, name: "Ben")
 
     guide = user.create_edition(:guide, title: "My Title", slug: "my-title", panopticon_id: @artefact.id)
     edition = guide
@@ -265,7 +265,7 @@ class WorkflowTest < ActiveSupport::TestCase
   end
 
   test "user should not be able to okay a guide they requested review for" do
-    user = User.create(name: "Ben")
+    user = FactoryGirl.create(:user, name: "Ben")
 
     guide = user.create_edition(:guide, title: "My Title", slug: "my-title", panopticon_id: @artefact.id)
     edition = guide
@@ -368,7 +368,7 @@ class WorkflowTest < ActiveSupport::TestCase
   end
 
   test "important_note returns last non-resolved important note" do
-    user = User.create(name: "Ben")
+    user = FactoryGirl.create(:user, name: "Ben")
     edition = template_guide
     user.record_note(edition, 'this is an important note', Action::IMPORTANT_NOTE)
     request_review(user, edition)
@@ -396,7 +396,7 @@ class WorkflowTest < ActiveSupport::TestCase
 
     should "return the new edition" do
       new_version = @user.new_version(@edition)
-      assert_include new_version.previous_siblings.to_a, @edition
+      assert_includes new_version.previous_siblings.to_a, @edition
     end
 
     context "creating an edition of a different type" do

data/test/test_helper.rb

@@ -5,19 +5,22 @@ require "bundler/setup"
 require "active_support/test_case"
 require "shoulda/context"
 require "minitest/autorun"
+require "mocha/mini_test"
 require "mongoid"
 require "govuk_content_models/require_all"
 require "database_cleaner"
 require "gds_api/test_helpers/panopticon"
-require "webmock/test_unit"
+require "webmock/minitest"
 require "govuk_content_models/test_helpers/factories"
 require 'govuk_content_models/test_helpers/action_processor_helpers'
 require "timecop"
+require "byebug"
 
 # The models depend on a zone being set, so tests will fail if we don't
 Time.zone = "London"
 
 Mongoid.load! File.expand_path("../../config/mongoid.yml", __FILE__)
+Mongoid::Tasks::Database.create_indexes
 WebMock.disable_net_connect!
 
 DatabaseCleaner.strategy = :truncation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 34.0.0
+  version: 35.0.0
 platform: ruby
 authors:
 - Paul Battley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -72,30 +72,44 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.5'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
-  name: plek
+  name: state_machines
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: state_machines-mongoid
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: state_machine
+  name: plek
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -114,28 +128,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 1.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 1.5.1
 - !ruby/object:Gem::Dependency
   name: factory_girl
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 4.5.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 4.5.0
 - !ruby/object:Gem::Dependency
   name: gem_publisher
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +170,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 1.1.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.13.3
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
@@ -198,28 +212,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.7
+        version: 1.22.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.8.7
+        version: 1.22.6
 - !ruby/object:Gem::Dependency
   name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -234,34 +248,62 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.5.9.2
+- !ruby/object:Gem::Dependency
+  name: govuk-lint
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.5.1
+- !ruby/object:Gem::Dependency
+  name: pry-byebug
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.6.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.4.4
+        version: 1.6.4
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.17
+        version: 4.2.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.2.17
+        version: 4.2.5.1
 description: Shared models for Panopticon and Publisher
 email:
 - pbattley@gmail.com