From 2da724d68156cc03bbb0707df8e9a16f45f5f591 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 30 Jan 2018 16:03:52 +0100 Subject: [PATCH] Remove an unused Gestionnaire method and its tests The tests would fail with rails 5.1 --- app/models/gestionnaire.rb | 11 --------- spec/models/gestionnaire_spec.rb | 42 -------------------------------- 2 files changed, 53 deletions(-) diff --git a/app/models/gestionnaire.rb b/app/models/gestionnaire.rb index 19df23207..f9280b9f7 100644 --- a/app/models/gestionnaire.rb +++ b/app/models/gestionnaire.rb @@ -51,17 +51,6 @@ class Gestionnaire < ActiveRecord::Base Notification.where(already_read: false, dossier_id: follows.pluck(:dossier_id)).order("updated_at DESC") end - def notifications_for procedure - procedure_ids = followed_dossiers.pluck(:procedure_id) - - if procedure_ids.include?(procedure.id) - return followed_dossiers.where(procedure_id: procedure.id).sum do |dossier| - dossier.notifications.where(already_read: false).count - end - end - 0 - end - def dossiers_with_notifications_count_for_procedure(procedure) followed_dossiers_id = followed_dossiers.where(procedure: procedure).pluck(:id) Notification.unread.where(dossier_id: followed_dossiers_id).select(:dossier_id).distinct(:dossier_id).count diff --git a/spec/models/gestionnaire_spec.rb b/spec/models/gestionnaire_spec.rb index 7b92dd830..380dc2d36 100644 --- a/spec/models/gestionnaire_spec.rb +++ b/spec/models/gestionnaire_spec.rb @@ -88,48 +88,6 @@ describe Gestionnaire, type: :model do end end - describe '#notifications_for' do - subject { gestionnaire.notifications_for procedure } - - context 'when gestionnaire follow any dossier' do - it { is_expected.to eq 0 } - it { expect(gestionnaire.follows.count).to eq 0 } - it do - expect_any_instance_of(Dossier::ActiveRecord_AssociationRelation).not_to receive(:sum) - subject - end - end - - context 'when gestionnaire follow any dossier into the procedure past in params' do - before do - create :follow, gestionnaire: gestionnaire, dossier: create(:dossier, procedure: procedure_2) - end - - it { is_expected.to eq 0 } - it { expect(gestionnaire.follows.count).to eq 1 } - it do - expect_any_instance_of(Dossier::ActiveRecord_AssociationRelation).not_to receive(:sum) - subject - end - end - - context 'when gestionnaire follow a dossier with a notification into the procedure past in params' do - let(:dossier) { create(:dossier, procedure: procedure, state: 'en_construction') } - - before do - create :follow, gestionnaire: gestionnaire, dossier: dossier - create :notification, dossier: dossier - end - - it { is_expected.to eq 1 } - it { expect(gestionnaire.follows.count).to eq 1 } - it do - expect_any_instance_of(Dossier::ActiveRecord_AssociationRelation).to receive(:sum) - subject - end - end - end - describe '#procedure_filter' do subject { gestionnaire.procedure_filter }