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

[fix 363] Dossier: remove next_step! action = comment

Browse source
This commit is contained in:
Simon Lehericey 2017-12-05 16:45:58 +01:00 committed by LeSim
parent 4adbb09e9c
commit 629cccbf27
3 changed files with 1 additions and 115 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/commentaires_controller.rb
View file

@ -19,11 +19,9 @@ class CommentairesController < ApplicationController
if is_gestionnaire?
@commentaire.email = current_gestionnaire.email
@commentaire.dossier = current_gestionnaire.dossiers.find_by(id: dossier_id) || current_gestionnaire.avis.find_by!(dossier_id: dossier_id).dossier
@commentaire.dossier.next_step! 'gestionnaire', 'comment'
else
@commentaire.email = current_user.email
@commentaire.dossier = current_user.dossiers.find_by(id: dossier_id) || current_user.invites.find_by!(dossier_id: dossier_id).dossier
@commentaire.dossier.next_step! 'user', 'comment' if current_user.email == @commentaire.dossier.user.email
end
@commentaire.file = params["file"]

2
app/models/dossier.rb
View file

@ -145,7 +145,7 @@ class Dossier < ActiveRecord::Base
end
def next_step! role, action, motivation = nil
unless %w(initiate follow update comment receive refuse without_continuation close).include?(action)
unless %w(initiate follow update receive refuse without_continuation close).include?(action)
fail 'action is not valid'
end

112
spec/models/dossier_spec.rb
View file

@ -148,12 +148,6 @@ describe Dossier do
it { is_expected.to eq('brouillon') }
end
context 'when he posts a comment' do
let(:action) { 'comment' }
it { is_expected.to eq('brouillon') }
end
context 'when he initiate a dossier' do
let(:action) { 'initiate' }
@ -175,23 +169,11 @@ describe Dossier do
it { is_expected.to eq('en_construction') }
end
context 'when is post a comment' do
let(:action) { 'comment' }
it { is_expected.to eq('en_construction') }
end
end
context 'when gestionnaire is connect' do
let(:role) { 'gestionnaire' }
context 'when is post a comment' do
let(:action) { 'comment' }
it { is_expected.to eq('en_construction') }
end
context 'when is follow' do
let(:action) { 'follow' }
@ -205,25 +187,9 @@ describe Dossier do
dossier.en_instruction!
end
context 'when user is connected' do
let(:role) { 'user' }
context 'when he posts a comment' do
let(:action) { 'comment' }
it { is_expected.to eq('en_instruction') }
end
end
context 'when gestionnaire is connect' do
let(:role) { 'gestionnaire' }
context 'when he posts a comment' do
let(:action) { 'comment' }
it { is_expected.to eq('en_instruction') }
end
context 'when he closes the dossier' do
let(:action) { 'close' }
@ -231,84 +197,6 @@ describe Dossier do
end
end
end
context 'when dossier is at state refuse' do
before do
dossier.refuse!
end
context 'when user is connected' do
let(:role) { 'user' }
context 'when he posts a comment' do
let(:action) { 'comment' }
it { is_expected.to eq('refuse') }
end
end
context 'when gestionnaire is connect' do
let(:role) { 'gestionnaire' }
context 'when he posts a comment' do
let(:action) { 'comment' }
it { is_expected.to eq('refuse') }
end
end
end
context 'when dossier is at state sans_suite' do
before do
dossier.sans_suite!
end
context 'when user is connected' do
let(:role) { 'user' }
context 'when he posts a comment' do
let(:action) { 'comment' }
it { is_expected.to eq('sans_suite') }
end
end
context 'when gestionnaire is connect' do
let(:role) { 'gestionnaire' }
context 'when he posts a comment' do
let(:action) { 'comment' }
it { is_expected.to eq('sans_suite') }
end
end
end
context 'when dossier is at state accepte' do
before do
dossier.accepte!
end
context 'when user is connect' do
let(:role) { 'user' }
context 'when is post a comment' do
let(:action) { 'comment' }
it { is_expected.to eq('accepte') }
end
end
context 'when gestionnaire is connect' do
let(:role) { 'gestionnaire' }
context 'when is post a comment' do
let(:action) { 'comment' }
it { is_expected.to eq('accepte') }
end
end
end
end
end