From 9136c9dfa0ed6fef887a5eaad1465280881159d9 Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Thu, 17 Jan 2019 11:52:38 +0100 Subject: [PATCH] Enable support_form for all --- app/helpers/application_helper.rb | 9 ++------- config/features.rb | 1 - spec/views/layouts/_new_header_spec.rb | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b1bda2b01..d167a0609 100644 --- a/app/helpers/application_helper.rb +++ b/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 + params = { tags: tags, type: type, dossier_id: dossier_id }.compact + link_to title, contact_url(params), options end def root_path_for_profile(nav_bar_profile) diff --git a/config/features.rb b/config/features.rb index 6be7eecb5..3595ff306 100644 --- a/config/features.rb +++ b/config/features.rb @@ -17,7 +17,6 @@ Flipflop.configure do feature :web_hook feature :publish_draft - feature :support_form feature :enable_email_login_token feature :new_champs_editor diff --git a/spec/views/layouts/_new_header_spec.rb b/spec/views/layouts/_new_header_spec.rb index 9c81e7118..17980f07e 100644 --- a/spec/views/layouts/_new_header_spec.rb +++ b/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