Merge commit '8aab0cdfed8883475f6c49a06d5614f8e05d2f45' into feature/…

…import-2023-11-16
govpf · Mar 7, 2024 · 0697d28 · 0697d28
2 parents a162238 + 8aab0cd
commit 0697d28
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 8 deletions.
diff --git a/app/components/conditions/routing_rules_component/routing_rules_component.html.haml b/app/components/conditions/routing_rules_component/routing_rules_component.html.haml
@@ -28,5 +28,4 @@
               %td.operator= operator_tag(operator_name, targeted_champ, row_index)
               %td.value= right_operand_tag(targeted_champ, value, row_index)
               %td.delete-column= delete_condition_tag(row_index)
-      - if @groupe_instructeur.procedure.feature_enabled?(:multi_line_routing)
-        .flex.justify-end.mt-2= add_condition_tag
+      .flex.justify-end.mt-2= add_condition_tag
diff --git a/app/views/instructeurs/dossiers/_header_bottom.html.haml b/app/views/instructeurs/dossiers/_header_bottom.html.haml
@@ -23,6 +23,6 @@
       = dynamic_tab_item(t('views.instructeurs.dossiers.tab_steps.involved_persons'),
         personnes_impliquees_instructeur_dossier_path(dossier.procedure, dossier))
 
-      - if dossier.procedure.routing_enabled? && dossier.procedure.feature_enabled?(:rerouting)
+      - if dossier.procedure.routing_enabled?
         = dynamic_tab_item(t('views.instructeurs.dossiers.tab_steps.reaffectation'),
           reaffectation_instructeur_dossier_path(dossier.procedure, dossier))
diff --git a/config/initializers/flipper.rb b/config/initializers/flipper.rb
@@ -21,10 +21,8 @@ def setup_features(features)
   :attestation_v2,
   :procedure_routage_api,
   :groupe_instructeur_api_hack,
-  :rerouting,
   :cojo_type_de_champ,
-  :sva,
-  :multi_line_routing
+  :sva
 ]
 
 def database_exists?

diff --git a/spec/models/dossier_assignment_spec.rb b/spec/models/dossier_assignment_spec.rb
@@ -3,8 +3,6 @@
 RSpec.describe DossierAssignment, type: :model do
   include Logic
 
-  before { Flipper.enable(:routing_rules, procedure) }
-
   context 'Assignment from routing engine' do
     let(:procedure) do
       create(:procedure,