DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
Enable support_form and champ_siret for all
This commit is contained in:
Pierre de La Morinerie 2019-01-17 15:22:48 +01:00 • committed by GitHub
commit 00244effdb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 2 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/helpers/application_helper.rb
View file

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

1
app/helpers/procedure_helper.rb
View file

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

1
app/services/types_de_champ_service.rb
View file

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

3
config/features.rb
View file

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

1
spec/views/layouts/_new_header_spec.rb
View file

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