Merge pull request #3294 from tchak/cleanup-feature-flag

Enable support_form and champ_siret for all

app/helpers/application_helper.rb

@@ -85,13 +85,8 @@ module ApplicationHelper
     tags, type, dossier_id = options.values_at(:tags, :type, :dossier_id)
     options.except!(:tags, :type, :dossier_id)
 
-    if Flipflop.support_form?
     params = { tags: tags, type: type, dossier_id: dossier_id }.compact
     link_to title, contact_url(params), options
-    else
-      mail_to CONTACT_EMAIL, title,
-        options.merge(subject: "Question à propos de demarches-simplifiees.fr")
-    end
   end
 
   def root_path_for_profile(nav_bar_profile)

app/helpers/procedure_helper.rb

@@ -64,7 +64,6 @@ module ProcedureHelper
   private
 
   TOGGLES = {
-    TypeDeChamp.type_champs.fetch(:siret)           => :champ_siret?,
     TypeDeChamp.type_champs.fetch(:integer_number)  => :champ_integer_number?,
     TypeDeChamp.type_champs.fetch(:repetition)      => :champ_repetition?
   }

app/services/types_de_champ_service.rb

@@ -2,7 +2,6 @@ class TypesDeChampService
   include Rails.application.routes.url_helpers
 
   TOGGLES = {
-    TypeDeChamp.type_champs.fetch(:siret)                 => :champ_siret?,
     TypeDeChamp.type_champs.fetch(:integer_number)        => :champ_integer_number?,
     TypeDeChamp.type_champs.fetch(:repetition)            => :champ_repetition?
   }

config/features.rb

@@ -7,8 +7,6 @@ Flipflop.configure do
   strategy :default
 
   group :champs do
-    feature :champ_siret,
-      title: "Champ SIRET"
     feature :champ_integer_number,
       title: "Champ nombre entier"
     feature :champ_repetition,
@@ -17,7 +15,6 @@ Flipflop.configure do
 
   feature :web_hook
   feature :publish_draft
-  feature :support_form
   feature :enable_email_login_token
   feature :new_champs_editor
 

spec/views/layouts/_new_header_spec.rb

@@ -3,7 +3,6 @@ require 'spec_helper'
 describe 'layouts/_new_header.html.haml', type: :view do
   describe 'logo link' do
     before do
-      Flipflop::FeatureSet.current.test!.switch!(:support_form, true)
       sign_in user
       allow(controller).to receive(:nav_bar_profile).and_return(profile)
       render