Merge branch 'develop' into staging

This commit is contained in:
Simon Lehericey 2017-03-13 14:13:45 +01:00
commit aa4893631f

View file

@ -183,10 +183,6 @@ describe Procedure do
expect(subject.received_mail.id).not_to be nil expect(subject.received_mail.id).not_to be nil
expect(subject.received_mail.procedure_id).not_to eq procedure.received_mail.procedure_id expect(subject.received_mail.procedure_id).not_to eq procedure.received_mail.procedure_id
expect(subject.received_mail.procedure_id).not_to be nil expect(subject.received_mail.procedure_id).not_to be nil
expect(subject.received_mail.created_at).not_to eq procedure.received_mail.created_at
expect(subject.received_mail.created_at).not_to be nil
expect(subject.received_mail.updated_at).not_to eq procedure.received_mail.updated_at
expect(subject.received_mail.updated_at).not_to be nil
end end
it 'should not duplicate default mail_template' do it 'should not duplicate default mail_template' do