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

Revert "Merge pull request #6142 from tchak/enable_brouillon_extend_conservation"

Browse source 
This reverts commit 48eb4d9778, reversing
changes made to 5539d5cb8c.

# Conflicts:
#	app/models/dossier.rb
#	db/schema.rb
This commit is contained in:
Paul Chavard 2021-05-04 16:03:29 +02:00
parent 4cba6e3b11
commit bcbfcdc537
8 changed files with 15 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

11
spec/models/dossier_spec.rb
View file

@ -52,15 +52,6 @@ describe Dossier do
is_expected.to include(just_expired_dossier)
is_expected.to include(long_expired_dossier)
end
context 'does not include an expiring dossier that has been postponed' do
before do
expiring_dossier.update(conservation_extension: 1.month)
expiring_dossier.reload
end
it { is_expected.not_to include(expiring_dossier) }
end
end
describe 'en_construction_close_to_expiration' do
@ -81,7 +72,7 @@ describe Dossier do
context 'does not include an expiring dossier that has been postponed' do
before do
expiring_dossier.update(conservation_extension: 1.month)
expiring_dossier.update(en_construction_conservation_extension: 1.month)
expiring_dossier.reload
end