govuk_content_models 7.3.1 → 8.0.0

data/app/models/action.rb

@@ -5,7 +5,6 @@ class Action
 
   STATUS_ACTIONS = [
     CREATE              = "create",
-    START_WORK          = "start_work",
     REQUEST_REVIEW      = "request_review",
     APPROVE_REVIEW      = "approve_review",
     APPROVE_FACT_CHECK  = "approve_fact_check",

data/app/models/edition.rb

@@ -30,7 +30,6 @@ class Edition
 
   belongs_to :assigned_to, class_name: "User"
 
-  scope :lined_up,            where(state: "lined_up")
   scope :draft,               where(state: "draft")
   scope :amends_needed,       where(state: "amends_needed")
   scope :in_review,           where(state: "in_review")

data/app/models/overview_dashboard.rb

@@ -9,7 +9,6 @@ class OverviewDashboard
   field :dashboard_type,      type: String
   field :result_group,        type: Integer
   field :count,               type: Integer
-  field :lined_up,            type: Integer
   field :draft,               type: Integer
   field :amends_needed,       type: Integer
   field :in_review,           type: Integer

data/app/models/specialist_document_edition.rb

@@ -43,7 +43,6 @@ class SpecialistDocumentEdition
 
   belongs_to :assigned_to, class_name: "User"
 
-  scope :lined_up,            where(state: "lined_up")
   scope :draft,               where(state: "draft")
   scope :amends_needed,       where(state: "amends_needed")
   scope :in_review,           where(state: "in_review")

data/app/models/workflow.rb

@@ -13,11 +13,11 @@ module Workflow
     before_save :denormalise_users
     after_create :notify_siblings_of_new_edition
 
-    field :state, type: String, default: "lined_up"
+    field :state, type: String, default: "draft"
     belongs_to :assigned_to, class_name: "User"
     embeds_many :actions
 
-    state_machine initial: :lined_up do
+    state_machine initial: :draft do
       after_transition on: :request_amendments do |edition, transition|
         edition.mark_as_rejected
       end
@@ -26,10 +26,6 @@ module Workflow
         edition.was_published
       end
 
-      event :start_work do
-        transition lined_up: :draft
-      end
-
       event :request_review do
         transition [:draft, :amends_needed] => :in_review
       end
@@ -43,12 +39,12 @@ module Workflow
       end
 
       event :request_amendments do
-        transition [:fact_check_received, :in_review] => :amends_needed
+        transition [:fact_check_received, :in_review, :ready, :fact_check] => :amends_needed
       end
 
       # Editions can optionally be sent out for fact check
       event :send_fact_check do
-        transition ready: :fact_check
+        transition [:ready, :fact_check_received] => :fact_check
       end
 
       # If no response is received to a fact check request we can skip
@@ -76,10 +72,6 @@ module Workflow
         transition all => :archived, :unless => :archived?
       end
     end
-
-    # alias_method :created_by, :creator
-    # alias_method :published_by, :publisher
-    # alias_method :archived_by, :archiver
   end
 
   def fact_checked?

data/app/models/workflow_actor.rb

@@ -6,7 +6,7 @@ require "programme_edition"
 require "transaction_edition"
 
 module WorkflowActor
-  SIMPLE_WORKFLOW_ACTIONS = %W[start_work request_review
+  SIMPLE_WORKFLOW_ACTIONS = %W[request_review
     request_amendments approve_review approve_fact_check archive]
 
   def record_action(edition, type, options={})

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 = "7.3.1"
+  VERSION = "8.0.0"
 end

data/test/models/edition_test.rb

@@ -147,7 +147,7 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal new_edition.class, AnswerEdition
     assert_equal new_edition.version_number, 2
     assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "lined_up"
+    assert_equal new_edition.state, "draft"
     assert_equal new_edition.department, "Test dept"
     assert_equal new_edition.overview, "I am a test overview"
     assert_equal new_edition.alternative_title, "Alternative test title"
@@ -169,7 +169,7 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal new_edition.class, AnswerEdition
     assert_equal new_edition.version_number, 2
     assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "lined_up"
+    assert_equal new_edition.state, "draft"
     assert_equal new_edition.department, "Test dept"
     assert_equal new_edition.overview, "I am a test overview"
     assert_equal new_edition.alternative_title, "Alternative test title"
@@ -193,7 +193,7 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal new_edition.class, AnswerEdition
     assert_equal new_edition.version_number, 2
     assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "lined_up"
+    assert_equal new_edition.state, "draft"
     assert_equal new_edition.department, "Test dept"
     assert_equal new_edition.overview, "I am a test overview"
     assert_equal new_edition.alternative_title, "Alternative test title"
@@ -216,7 +216,7 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal new_edition.class, TransactionEdition
     assert_equal new_edition.version_number, 2
     assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "lined_up"
+    assert_equal new_edition.state, "draft"
     assert_equal new_edition.department, "Test dept"
     assert_equal new_edition.overview, "I am a test overview"
     assert_equal new_edition.alternative_title, "Alternative test title"
@@ -239,7 +239,7 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal new_edition.class, TransactionEdition
     assert_equal new_edition.version_number, 2
     assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "lined_up"
+    assert_equal new_edition.state, "draft"
     assert_equal new_edition.department, "Test dept"
     assert_equal new_edition.overview, "I am a test overview"
     assert_equal new_edition.alternative_title, "Alternative test title"
@@ -261,7 +261,7 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal new_edition.class, TransactionEdition
     assert_equal new_edition.version_number, 2
     assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "lined_up"
+    assert_equal new_edition.state, "draft"
     assert_equal new_edition.department, "Test dept"
     assert_equal new_edition.overview, "I am a test overview"
     assert_equal new_edition.alternative_title, "Alternative test title"
@@ -283,7 +283,7 @@ class EditionTest < ActiveSupport::TestCase
     assert_equal new_edition.class, GuideEdition
     assert_equal new_edition.version_number, 2
     assert_equal new_edition.panopticon_id, @artefact.id.to_s
-    assert_equal new_edition.state, "lined_up"
+    assert_equal new_edition.state, "draft"
     assert_equal new_edition.department, "Test dept"
     assert_equal new_edition.overview, "I am a test overview"
     assert_equal new_edition.alternative_title, "Alternative test title"
@@ -756,7 +756,6 @@ class EditionTest < ActiveSupport::TestCase
     user = User.create(name: "Mary")
 
     edition = ProgrammeEdition.new(title: "Childcare", slug: "childcare", panopticon_id: @artefact.id)
-    user.start_work(edition)
     assert edition.can_request_review?
     user.request_review(edition,{comment: "Review this programme please."})
     assert ! user.request_amendments(edition, {comment: "Well Done, but work harder"})
@@ -797,13 +796,11 @@ class EditionTest < ActiveSupport::TestCase
 
   test "a draft edition cannot be published" do
     edition = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, state: "draft")
-    edition.start_work
     refute edition.can_publish?
   end
 
   test "a draft edition can be emergency published" do
     edition = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, state: "draft")
-    edition.start_work
     assert edition.can_emergency_publish?
   end
 
@@ -833,7 +830,7 @@ class EditionTest < ActiveSupport::TestCase
     @user1 = FactoryGirl.create(:user)
     @user2 = FactoryGirl.create(:user)
 
-    edition = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, state: "lined_up")
+    edition = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id, state: "draft")
     @user1.assign edition, @user2
 
     assert_equal @user2, edition.assigned_to

data/test/models/overview_dashboard_test.rb

@@ -27,7 +27,6 @@ private
 
   def row_status
     {
-      lined_up: 1,
       draft: 1,
       ammends_needed: 1,
       in_review: 1,

data/test/models/workflow_test.rb

@@ -13,14 +13,12 @@ class WorkflowTest < ActiveSupport::TestCase
 
   def template_programme
     p = ProgrammeEdition.new(slug:"childcare", title:"Children", panopticon_id: @artefact.id)
-    p.start_work
     p.save
     p
   end
 
   def template_guide
     edition = FactoryGirl.create(:guide_edition, slug: "childcare", title: "One", panopticon_id: @artefact.id)
-    edition.start_work
     edition.save
     edition
   end
@@ -31,7 +29,6 @@ class WorkflowTest < ActiveSupport::TestCase
 
     guide = user.create_edition(:guide, panopticon_id: @artefact.id, overview: "My Overview", title: "My Title", slug: "my-title", alternative_title: "My Other Title")
     edition = guide
-    user.start_work(edition)
     user.request_review(edition,{comment: "Review this guide please."})
     other_user.approve_review(edition, {comment: "I've reviewed it"})
     user.send_fact_check(edition,{comment: "Review this guide please.", email_addresses: "test@test.com"})
@@ -50,8 +47,6 @@ class WorkflowTest < ActiveSupport::TestCase
     transaction.expectation_ids = [expectation.id]
     transaction.save
 
-    transaction.start_work
-    transaction.save
     user.request_review(transaction, {comment: "Review this guide please."})
     transaction.save
     other_user.approve_review(transaction, {comment: "I've reviewed it"})
@@ -79,28 +74,13 @@ class WorkflowTest < ActiveSupport::TestCase
     assert_equal "AnswerEdition", new_edition._type
   end
 
-  test "a new answer is lined up" do
-    g = AnswerEdition.new(slug: "childcare", panopticon_id: @artefact.id, title: "My new answer")
-    assert g.lined_up?
-  end
-
-  test "starting work on an answer removes it from lined up" do
+  test "a new answer is in draft" do
     g = AnswerEdition.new(slug: "childcare", panopticon_id: @artefact.id, title: "My new answer")
-    g.save!
-    user = User.create(name: "Ben")
-    user.start_work(g)
-    assert_equal false, g.lined_up?
-  end
-
-  test "a new guide has lined_up but isn't published" do
-    g = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id)
-    assert g.lined_up?
-    refute g.published?
+    assert g.draft?
   end
 
-  test "when work started a new guide has draft but isn't published" do
+  test "a new guide has draft but isn't published" do
     g = FactoryGirl.create(:guide_edition, panopticon_id: @artefact.id)
-    g.start_work
     assert g.draft?
     refute g.published?
   end
@@ -119,7 +99,7 @@ class WorkflowTest < ActiveSupport::TestCase
 
     guide = user.create_edition(:guide, title: "My Title", slug: "my-title", panopticon_id: @artefact.id)
     edition = guide
-    user.start_work(edition)
+
     assert edition.can_request_review?
     user.request_review(edition,{comment: "Review this guide please."})
     refute edition.can_request_review?
@@ -138,7 +118,6 @@ class WorkflowTest < ActiveSupport::TestCase
 
     edition = user.create_edition(:guide, panopticon_id: @artefact.id, overview: "My Overview", title: "My Title", slug: "my-title", alternative_title: "My Other Title")
 
-    user.start_work(edition)
     user.request_review(edition,{comment: "Review this guide please."})
     other_user.approve_review(edition, {comment: "I've reviewed it"})
     user.send_fact_check(edition,{comment: "Review this guide please.", email_addresses: "test@test.com"})
@@ -156,7 +135,7 @@ class WorkflowTest < ActiveSupport::TestCase
 
     guide = user.create_edition(:guide, panopticon_id: FactoryGirl.create(:artefact).id, overview: "My Overview", title: "My Title", slug: "my-title", alternative_title: "My Other Title")
     edition = guide
-    user.start_work(edition)
+
     user.request_review(edition,{comment: "Review this guide please."})
     other_user.approve_review(edition, {comment: "I've reviewed it"})
     user.send_fact_check(edition,{comment: "Review this guide please.", email_addresses: "test@test.com"})
@@ -165,6 +144,52 @@ class WorkflowTest < ActiveSupport::TestCase
     assert_equal "Text.<l>content that the SafeHtml validator would catch</l>", edition.actions.last.comment
   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")
+
+    guide = user.create_edition(:guide, panopticon_id: FactoryGirl.create(:artefact).id, overview: "My Overview", title: "My Title", slug: "my-title", alternative_title: "My Other Title")
+    edition = guide
+
+    user.request_review(edition,{comment: "Review this guide please."})
+    other_user.approve_review(edition, {comment: "I've reviewed it"})
+    user.send_fact_check(edition,{comment: "Review this guide please.", email_addresses: "test@test.com"})
+    user.receive_fact_check(edition, {comment: "Text.<l>content that the SafeHtml validator would catch</l>"})
+    user.send_fact_check(edition,{comment: "Out of office reply triggered receive_fact_check", email_addresses: "test@test.com"})
+
+    assert(edition.actions.last.comment.include? "Out of office reply triggered receive_fact_check\n\nResponses should be sent to:")
+  end
+
+  test "when processing fact check, an edition can request for amendments" do
+    user = User.create(name: "Ben")
+    other_user = User.create(name: "James")
+
+    guide = user.create_edition(:guide, panopticon_id: FactoryGirl.create(:artefact).id, overview: "My Overview", title: "My Title", slug: "my-title", alternative_title: "My Other Title")
+    edition = guide
+
+    user.request_review(edition,{comment: "Review this guide please."})
+    other_user.approve_review(edition, {comment: "I've reviewed it"})
+    user.send_fact_check(edition,{comment: "Review this guide please.", email_addresses: "test@test.com"})
+    other_user.request_amendments(edition,{comment: "More amendments are required", email_addresses: "foo@bar.com"})
+
+    assert_equal "More amendments are required", edition.actions.last.comment
+  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")
+
+    guide = user.create_edition(:guide, panopticon_id: FactoryGirl.create(:artefact).id, overview: "My Overview", title: "My Title", slug: "my-title", alternative_title: "My Other Title")
+    edition = guide
+
+    user.request_review(edition,{comment: "Review this guide please."})
+    other_user.approve_review(edition, {comment: "I've reviewed it"})
+    another_user.request_amendments(edition,{comment: "More amendments are required", email_addresses: "foo@bar.com"})
+
+    assert_equal "More amendments are required", edition.actions.last.comment
+  end
+
   test "check counting reviews" do
     user = User.create(name: "Ben")
     other_user = User.create(name: "James")
@@ -174,7 +199,6 @@ class WorkflowTest < ActiveSupport::TestCase
 
     assert_equal 0, guide.rejected_count
 
-    user.start_work(edition)
     user.request_review(edition,{comment: "Review this guide please."})
     other_user.request_amendments(edition, {comment: "I've reviewed it"})
 
@@ -191,7 +215,7 @@ class WorkflowTest < ActiveSupport::TestCase
 
     guide = user.create_edition(:guide, title: "My Title", slug: "my-title", panopticon_id: @artefact.id)
     edition = guide
-    user.start_work(edition)
+
     assert edition.can_request_review?
     user.request_review(edition,{comment: "Review this guide please."})
     refute user.request_amendments(edition, {comment: "Well Done, but work harder"})
@@ -202,7 +226,7 @@ class WorkflowTest < ActiveSupport::TestCase
 
     guide = user.create_edition(:guide, title: "My Title", slug: "my-title", panopticon_id: @artefact.id)
     edition = guide
-    user.start_work(edition)
+
     assert edition.can_request_review?
     user.request_review(edition,{comment: "Review this guide please."})
     refute user.approve_review(edition, "")
@@ -227,7 +251,7 @@ class WorkflowTest < ActiveSupport::TestCase
     user, other_user = template_users
 
     edition = user.create_edition(:programme, panopticon_id: @artefact.id, title: "My title", slug: "my-slug")
-    user.start_work(edition)
+
     assert edition.can_request_review?
     user.request_review(edition,{comment: "Review this guide please."})
     refute edition.can_request_review?
@@ -237,6 +261,7 @@ class WorkflowTest < ActiveSupport::TestCase
     user.request_review(edition,{comment: "Review this guide please."})
     assert edition.can_approve_review?
     other_user.approve_review(edition, {comment: "Looks good to me"})
+    assert edition.can_request_amendments?
     assert edition.can_publish?
   end
 
@@ -244,7 +269,7 @@ class WorkflowTest < ActiveSupport::TestCase
     user, other_user = template_users
 
     edition = user.create_edition(:programme, panopticon_id: @artefact.id, title: "My title", slug: "my-slug")
-    user.start_work(edition)
+
     assert edition.can_request_review?
     user.request_review(edition,{comment: "Review this programme please."})
     refute user.approve_review(edition, "")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: govuk_content_models
 version: !ruby/object:Gem::Version
-  version: 7.3.1
+  version: 8.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bson_ext
@@ -456,7 +456,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1906730363946367284
+      hash: 1977371837260361132
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -465,7 +465,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1906730363946367284
+      hash: 1977371837260361132
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23