From 9725f2a418ac3c67bb812760eb7a3b8af7a3a438 Mon Sep 17 00:00:00 2001
From: Paul Chavard <git@paul.chavard.net>
Date: Thu, 17 Jan 2019 12:04:05 +0100
Subject: [PATCH] Enable new champs editor for all

---
 app/controllers/admin/procedures_controller.rb              | 6 +-----
 app/views/admin/pieces_justificatives/show.html.haml        | 5 ++---
 .../_left_panel_admin_procedurescontroller_navbar.html.haml | 6 ++----
 config/features.rb                                          | 1 -
 spec/controllers/admin/procedures_controller_spec.rb        | 1 -
 spec/features/admin/procedure_creation_spec.rb              | 2 --
 6 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/app/controllers/admin/procedures_controller.rb b/app/controllers/admin/procedures_controller.rb
index 7773f39a4..19c0758aa 100644
--- a/app/controllers/admin/procedures_controller.rb
+++ b/app/controllers/admin/procedures_controller.rb
@@ -81,11 +81,7 @@ class Admin::ProceduresController < AdminController
         gestionnaire.assign_to_procedure(@procedure)
       end
 
-      if Flipflop.new_champs_editor?
-        redirect_to champs_procedure_path(@procedure)
-      else
-        redirect_to admin_procedure_types_de_champ_path(procedure_id: @procedure.id)
-      end
+      redirect_to champs_procedure_path(@procedure)
     end
   end
 
diff --git a/app/views/admin/pieces_justificatives/show.html.haml b/app/views/admin/pieces_justificatives/show.html.haml
index 51b70c0d0..ca2933c42 100644
--- a/app/views/admin/pieces_justificatives/show.html.haml
+++ b/app/views/admin/pieces_justificatives/show.html.haml
@@ -1,10 +1,9 @@
-- champs_editor_path = Flipflop.new_champs_editor? ? champs_procedure_path(@procedure) : admin_procedure_types_de_champ_path(@procedure)
 .row.white-back
   .alert.alert-info
     .form-group
       %p
         Pour vos nouveaux besoins de pièces jointes, nous vous invitons à
-        = link_to(champs_editor_path) do
+        = link_to(champs_procedure_path(@procedure)) do
           rajouter des champs
         \ <em>pièce justificative</em> à votre formulaire.
 
@@ -18,7 +17,7 @@
         %li Support des pièces de grande taille (jusqu’à 200 Mo par pièce)
         %li Pas de limite de soumission simultanée de plusieurs pièces, pour une expérience usager plus confortable
 
-    = link_to(champs_editor_path, class: 'btn btn-success') do
+    = link_to(champs_procedure_path(@procedure), class: 'btn btn-success') do
       Ajouter un champ PJ
 
   - if @procedure.has_old_pjs?
diff --git a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
index 9a139b589..0bd32e889 100644
--- a/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
+++ b/app/views/layouts/left_panels/_left_panel_admin_procedurescontroller_navbar.html.haml
@@ -38,8 +38,7 @@
           %p.missing-steps (à compléter)
 
     - if !@procedure.locked?
-      - champs_editor_path = Flipflop.new_champs_editor? ? champs_procedure_path(@procedure) : admin_procedure_types_de_champ_path(@procedure)
-      %a#onglet-champs{ href: champs_editor_path }
+      %a#onglet-champs{ href: champs_procedure_path(@procedure) }
         .procedure-list-element{ class: ('active' if active == 'Champs') }
           Champs
 
@@ -49,8 +48,7 @@
           Pièces jointes
 
     - if !@procedure.locked?
-      - annotations_editor_path = Flipflop.new_champs_editor? ? annotations_procedure_path(@procedure) : admin_procedure_types_de_champ_private_path(@procedure)
-      %a#onglet-private-champs{ href: annotations_editor_path }
+      %a#onglet-private-champs{ href: annotations_procedure_path(@procedure) }
         .procedure-list-element{ class: ('active' if active == 'Annotations privées') }
           Annotations privées
 
diff --git a/config/features.rb b/config/features.rb
index 13f6d592a..4c2516549 100644
--- a/config/features.rb
+++ b/config/features.rb
@@ -15,7 +15,6 @@ Flipflop.configure do
 
   feature :web_hook
   feature :enable_email_login_token
-  feature :new_champs_editor
 
   feature :operation_log_serialize_subject
 
diff --git a/spec/controllers/admin/procedures_controller_spec.rb b/spec/controllers/admin/procedures_controller_spec.rb
index c38ebe6af..1fe9df0fd 100644
--- a/spec/controllers/admin/procedures_controller_spec.rb
+++ b/spec/controllers/admin/procedures_controller_spec.rb
@@ -186,7 +186,6 @@ describe Admin::ProceduresController, type: :controller do
 
       context 'when procedure is correctly save' do
         before do
-          Flipflop::FeatureSet.current.test!.switch!(:new_champs_editor, true)
           post :create, params: { procedure: procedure_params }
         end
 
diff --git a/spec/features/admin/procedure_creation_spec.rb b/spec/features/admin/procedure_creation_spec.rb
index 558d4c8fd..78bfb5c15 100644
--- a/spec/features/admin/procedure_creation_spec.rb
+++ b/spec/features/admin/procedure_creation_spec.rb
@@ -5,10 +5,8 @@ feature 'As an administrateur I wanna create a new procedure', js: true do
   include ProcedureSpecHelper
 
   let(:administrateur) { create(:administrateur, :with_procedure) }
-  let(:test_strategy) { Flipflop::FeatureSet.current.test! }
 
   before do
-    test_strategy.switch!(:new_champs_editor, true)
     login_as administrateur, scope: :administrateur
     visit root_path
   end