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

Merge branch 'dev' into feat/enable-csp-in-prod

Browse source
This commit is contained in:
Keirua 2019-07-01 09:35:26 +02:00 committed by GitHub
commit 65323fad22
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/models/dossier.rb
View file

@ -79,6 +79,7 @@ class Dossier < ApplicationRecord
piece_justificative_file_attachment: :blob piece_justificative_file_attachment: :blob
], ],
pieces_justificatives: [], pieces_justificatives: [],
avis: [],
etablissement: [], etablissement: [],
individual: [], individual: [],
user: []) user: [])

1
app/serializers/dossier_serializer.rb
View file

@ -23,6 +23,7 @@ class DossierSerializer < ActiveModel::Serializer
has_many :pieces_justificatives has_many :pieces_justificatives
has_many :types_de_piece_justificative has_many :types_de_piece_justificative
has_one :justificatif_motivation has_one :justificatif_motivation
has_many :avis
has_many :champs, serializer: ChampSerializer has_many :champs, serializer: ChampSerializer

2
spec/controllers/api/v1/dossiers_controller_spec.rb
View file

@ -157,7 +157,7 @@ describe API::V1::DossiersController do
let!(:dossier) { Timecop.freeze(date_creation) { create(:dossier, :with_entreprise, :en_construction, procedure: procedure, motivation: "Motivation") } } let!(:dossier) { Timecop.freeze(date_creation) { create(:dossier, :with_entreprise, :en_construction, procedure: procedure, motivation: "Motivation") } }
let(:dossier_id) { dossier.id } let(:dossier_id) { dossier.id }
let(:body) { JSON.parse(retour.body, symbolize_names: true) } let(:body) { JSON.parse(retour.body, symbolize_names: true) }
let(:field_list) { [:id, :created_at, :updated_at, :archived, :individual, :entreprise, :etablissement, :cerfa, :types_de_piece_justificative, :pieces_justificatives, :champs, :champs_private, :commentaires, :state, :simplified_state, :initiated_at, :processed_at, :received_at, :motivation, :email, :instructeurs, :justificatif_motivation] } let(:field_list) { [:id, :created_at, :updated_at, :archived, :individual, :entreprise, :etablissement, :cerfa, :types_de_piece_justificative, :pieces_justificatives, :champs, :champs_private, :commentaires, :state, :simplified_state, :initiated_at, :processed_at, :received_at, :motivation, :email, :instructeurs, :justificatif_motivation, :avis] }
subject { body[:dossier] } subject { body[:dossier] }
it 'return REST code 200', :show_in_doc do it 'return REST code 200', :show_in_doc do