diff --git a/app/controllers/admin/previsualisations_controller.rb b/app/controllers/admin/previsualisations_controller.rb index a2cb7efac..278fb58d4 100644 --- a/app/controllers/admin/previsualisations_controller.rb +++ b/app/controllers/admin/previsualisations_controller.rb @@ -5,7 +5,7 @@ class Admin::PrevisualisationsController < AdminController @procedure @dossier = Dossier.new(id: 0, procedure: @procedure) - PrevisualisationService.destroy_all_champs @dossier + PrevisualisationService.delete_all_champs @dossier @dossier.build_default_champs @champs = @dossier.ordered_champs diff --git a/app/services/previsualisation_service.rb b/app/services/previsualisation_service.rb index 1dc0f7739..7f8a9e692 100644 --- a/app/services/previsualisation_service.rb +++ b/app/services/previsualisation_service.rb @@ -1,5 +1,5 @@ class PrevisualisationService - def self.destroy_all_champs dossier - Champ.where(dossier_id: dossier.id, type_de_champ_id: dossier.procedure.types_de_champ.ids).destroy_all + def self.delete_all_champs dossier + Champ.where(dossier_id: dossier.id, type_de_champ_id: dossier.procedure.types_de_champ.ids).delete_all end end diff --git a/spec/services/previsualisation_service_spec.rb b/spec/services/previsualisation_service_spec.rb index 64bd03735..a0c59501b 100644 --- a/spec/services/previsualisation_service_spec.rb +++ b/spec/services/previsualisation_service_spec.rb @@ -1,8 +1,8 @@ require 'spec_helper' describe PrevisualisationService do - describe '.destroy_all_champs' do - subject { described_class.destroy_all_champs dossier } + describe '.delete_all_champs' do + subject { described_class.delete_all_champs dossier } let(:procedure_1) { create :procedure, :with_type_de_champ } let(:procedure_2) { create :procedure, :with_type_de_champ } @@ -14,7 +14,7 @@ describe PrevisualisationService do it { expect(TypeDeChamp.all.size).to eq 2 } it { expect(Champ.all.size).to eq 2 } - context 'when function destroy_all_champs is call' do + context 'when function delete_all_champs is call' do let(:dossier) { dossier_1 } before do