From 3e334a3306f2ce5b004c59571cbe5926b32351c9 Mon Sep 17 00:00:00 2001
From: Paul Chavard <git@paul.chavard.net>
Date: Thu, 14 Nov 2019 16:11:22 +0100
Subject: [PATCH 1/2] Drop test_started_at

# Conflicts:
#	spec/models/procedure_spec.rb
---
 app/models/procedure.rb       | 3 +--
 spec/models/procedure_spec.rb | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/app/models/procedure.rb b/app/models/procedure.rb
index ddb533995..af4a5c8e9 100644
--- a/app/models/procedure.rb
+++ b/app/models/procedure.rb
@@ -1,7 +1,7 @@
 require Rails.root.join('lib', 'percentile')
 
 class Procedure < ApplicationRecord
-  self.ignored_columns = ['logo', 'logo_secure_token']
+  self.ignored_columns = ['logo', 'logo_secure_token', 'test_started_at']
 
   include ProcedureStatsConcern
 
@@ -366,7 +366,6 @@ class Procedure < ApplicationRecord
       }, &method(:clone_attachments))
     procedure.path = SecureRandom.uuid
     procedure.aasm_state = :brouillon
-    procedure.test_started_at = nil
     procedure.archived_at = nil
     procedure.published_at = nil
     procedure.lien_notice = nil
diff --git a/spec/models/procedure_spec.rb b/spec/models/procedure_spec.rb
index 0117b43df..c112a0e69 100644
--- a/spec/models/procedure_spec.rb
+++ b/spec/models/procedure_spec.rb
@@ -514,7 +514,6 @@ describe Procedure do
       it 'Not published nor archived' do
         expect(subject.archived_at).to be_nil
         expect(subject.published_at).to be_nil
-        expect(subject.test_started_at).to be_nil
         expect(subject.aasm_state).to eq "brouillon"
         expect(subject.path).not_to be_nil
       end

From c1c8ab7ac6ef70f24e838b72ccae6e8e817021de Mon Sep 17 00:00:00 2001
From: Paul Chavard <git@paul.chavard.net>
Date: Thu, 28 Nov 2019 10:33:39 +0100
Subject: [PATCH 2/2] =?UTF-8?q?Disable=20transition=20from=20publi=C3=A9e?=
 =?UTF-8?q?=20to=20brouillon?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/manager/procedures_controller.rb | 10 ----------
 app/models/procedure.rb                          |  8 --------
 app/views/manager/procedures/show.html.erb       |  4 ----
 3 files changed, 22 deletions(-)

diff --git a/app/controllers/manager/procedures_controller.rb b/app/controllers/manager/procedures_controller.rb
index 846e103de..4bc2dee8b 100644
--- a/app/controllers/manager/procedures_controller.rb
+++ b/app/controllers/manager/procedures_controller.rb
@@ -22,16 +22,6 @@ module Manager
       redirect_to manager_procedure_path(procedure)
     end
 
-    def draft
-      if procedure.dossiers.empty?
-        procedure.draft!
-        flash[:notice] = "La démarche a bien été passée en brouillon."
-      else
-        flash[:alert] = "Impossible de repasser en brouillon une démarche à laquelle sont rattachés des dossiers."
-      end
-      redirect_to manager_procedure_path(procedure)
-    end
-
     def hide
       procedure.hide!
       flash[:notice] = "La démarche a bien été supprimée, en cas d'erreur contactez un développeur."
diff --git a/app/models/procedure.rb b/app/models/procedure.rb
index af4a5c8e9..0bdc6f54e 100644
--- a/app/models/procedure.rb
+++ b/app/models/procedure.rb
@@ -112,10 +112,6 @@ class Procedure < ApplicationRecord
       transitions from: :publiee, to: :hidden
       transitions from: :archivee, to: :hidden
     end
-
-    event :draft, after: :after_draft do
-      transitions from: :publiee, to: :brouillon
-    end
   end
 
   def publish_or_reopen!(administrateur)
@@ -622,10 +618,6 @@ class Procedure < ApplicationRecord
     purge_export_files
   end
 
-  def after_draft
-    update!(published_at: nil)
-  end
-
   def update_juridique_required
     self.juridique_required ||= (cadre_juridique.present? || deliberation.attached?)
     true
diff --git a/app/views/manager/procedures/show.html.erb b/app/views/manager/procedures/show.html.erb
index 95216c8d4..49fef4973 100644
--- a/app/views/manager/procedures/show.html.erb
+++ b/app/views/manager/procedures/show.html.erb
@@ -39,10 +39,6 @@ as well as a link to its edit page.
       <%= link_to 'whitelister', whitelist_manager_procedure_path(procedure), method: :post, class: 'button' %>
     <% end %>
 
-    <% if procedure.publiee? && procedure.dossiers.empty? %>
-      <%= link_to 'repasser en test', draft_manager_procedure_path(procedure), method: :post, class: 'button' %>
-    <% end %>
-
     <% if !procedure.hidden? %>
       <%= link_to 'supprimer la démarche', hide_manager_procedure_path(procedure), method: :post, class: 'button', data: { confirm: "Confirmez-vous la suppression de la démarche ?" } %>
     <% end %>