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

Merge branch 'dev'

Browse source
This commit is contained in:
Mathieu Magnin 2018-12-04 12:02:11 +01:00
commit 8bef3c2a0e
16 changed files with 70 additions and 59 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
Gemfile.lock
View file

@ -22,25 +22,25 @@ GEM
specs:
aasm (5.0.1)
concurrent-ruby (~> 1.0)
actioncable (5.2.1)
actionpack (= 5.2.1)
actioncable (5.2.1.1)
actionpack (= 5.2.1.1)
nio4r (~> 2.0)
websocket-driver (>= 0.6.1)
actionmailer (5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
actionmailer (5.2.1.1)
actionpack (= 5.2.1.1)
actionview (= 5.2.1.1)
activejob (= 5.2.1.1)
mail (~> 2.5, >= 2.5.4)
rails-dom-testing (~> 2.0)
actionpack (5.2.1)
actionview (= 5.2.1)
activesupport (= 5.2.1)
actionpack (5.2.1.1)
actionview (= 5.2.1.1)
activesupport (= 5.2.1.1)
rack (~> 2.0)
rack-test (>= 0.6.3)
rails-dom-testing (~> 2.0)
rails-html-sanitizer (~> 1.0, >= 1.0.2)
actionview (5.2.1)
activesupport (= 5.2.1)
actionview (5.2.1.1)
activesupport (= 5.2.1.1)
builder (~> 3.1)
erubi (~> 1.4)
rails-dom-testing (~> 2.0)
@ -53,24 +53,24 @@ GEM
activemodel (>= 4.1, < 6)
case_transform (>= 0.2)
jsonapi-renderer (>= 0.1.1.beta1, < 0.3)
activejob (5.2.1)
activesupport (= 5.2.1)
activejob (5.2.1.1)
activesupport (= 5.2.1.1)
globalid (>= 0.3.6)
activemodel (5.2.1)
activesupport (= 5.2.1)
activemodel (5.2.1.1)
activesupport (= 5.2.1.1)
activemodel-serializers-xml (1.0.2)
activemodel (> 5.x)
activesupport (> 5.x)
builder (~> 3.1)
activerecord (5.2.1)
activemodel (= 5.2.1)
activesupport (= 5.2.1)
activerecord (5.2.1.1)
activemodel (= 5.2.1.1)
activesupport (= 5.2.1.1)
arel (>= 9.0)
activestorage (5.2.1)
actionpack (= 5.2.1)
activerecord (= 5.2.1)
activestorage (5.2.1.1)
actionpack (= 5.2.1.1)
activerecord (= 5.2.1.1)
marcel (~> 0.3.1)
activesupport (5.2.1)
activesupport (5.2.1.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 0.7, < 2)
minitest (~> 5.1)
@ -115,17 +115,18 @@ GEM
browser (2.5.3)
builder (3.2.3)
byebug (10.0.2)
capybara (2.18.0)
capybara (3.11.0)
addressable
mini_mime (>= 0.1.3)
nokogiri (>= 1.3.3)
rack (>= 1.0.0)
rack-test (>= 0.5.4)
xpath (>= 2.0, < 4.0)
nokogiri (~> 1.8)
rack (>= 1.6.0)
rack-test (>= 0.6.3)
regexp_parser (~> 1.2)
xpath (~> 3.2)
capybara-email (3.0.1)
capybara (>= 2.4, < 4.0)
mail
capybara-screenshot (1.0.21)
capybara-screenshot (1.0.22)
capybara (>= 1.0, < 4)
launchy
capybara-selenium (0.0.6)
@ -332,13 +333,13 @@ GEM
crass (~> 1.0.2)
nokogiri (>= 1.5.9)
lumberjack (1.0.13)
mail (2.7.0)
mail (2.7.1)
mini_mime (>= 0.1.1)
mailjet (1.5.4)
activesupport (>= 3.1.0)
rack (>= 1.4.0)
rest-client
marcel (0.3.2)
marcel (0.3.3)
mimemagic (~> 0.3.2)
method_source (0.9.2)
mime-types (3.2.2)
@ -416,7 +417,7 @@ GEM
pry-byebug (3.6.0)
byebug (~> 10.0)
pry (~> 0.10)
public_suffix (3.0.2)
public_suffix (3.0.3)
puma (3.12.0)
rack (2.0.6)
rack-handlers (0.7.3)
@ -435,18 +436,18 @@ GEM
rack
rack-test (1.1.0)
rack (>= 1.0, < 3)
rails (5.2.1)
actioncable (= 5.2.1)
actionmailer (= 5.2.1)
actionpack (= 5.2.1)
actionview (= 5.2.1)
activejob (= 5.2.1)
activemodel (= 5.2.1)
activerecord (= 5.2.1)
activestorage (= 5.2.1)
activesupport (= 5.2.1)
rails (5.2.1.1)
actioncable (= 5.2.1.1)
actionmailer (= 5.2.1.1)
actionpack (= 5.2.1.1)
actionview (= 5.2.1.1)
activejob (= 5.2.1.1)
activemodel (= 5.2.1.1)
activerecord (= 5.2.1.1)
activestorage (= 5.2.1.1)
activesupport (= 5.2.1.1)
bundler (>= 1.3.0)
railties (= 5.2.1)
railties (= 5.2.1.1)
sprockets-rails (>= 2.0.0)
rails-controller-testing (1.0.2)
actionpack (~> 5.x, >= 5.0.1)
@ -460,9 +461,9 @@ GEM
rails-i18n (5.1.2)
i18n (>= 0.7, < 2)
railties (>= 5.0, < 6)
railties (5.2.1)
actionpack (= 5.2.1)
activesupport (= 5.2.1)
railties (5.2.1.1)
actionpack (= 5.2.1.1)
activesupport (= 5.2.1.1)
method_source
rake (>= 0.8.7)
thor (>= 0.19.0, < 2.0)
@ -476,6 +477,7 @@ GEM
ffi
rbnacl-libsodium (1.0.16)
rbnacl (>= 3.0.1)
regexp_parser (1.3.0)
request_store (1.4.1)
rack (>= 1.4)
responders (2.4.0)
@ -643,7 +645,7 @@ GEM
websocket-driver (0.7.0)
websocket-extensions (>= 0.1.0)
websocket-extensions (0.1.3)
xpath (3.0.0)
xpath (3.2.0)
nokogiri (~> 1.8)
xray-rails (0.3.1)
rails (>= 3.1.0)

4
app/javascript/new_design/avis.js
View file

@ -3,3 +3,7 @@ import { toggle } from '@utils';
export function toggleCondidentielExplanation() {
toggle(document.querySelector('.confidentiel-explanation'));
}
export function replaceSemicolonByComma(event) {
event.target.value = event.target.value.replace(/;/g, ',');
}

4
app/javascript/packs/application.js
View file

@ -25,6 +25,7 @@ import { toggleCondidentielExplanation } from '../new_design/avis';
import { scrollMessagerie } from '../new_design/messagerie';
import { showMotivation, motivationCancel } from '../new_design/state-button';
import { toggleChart } from '../new_design/toggle-chart';
import { replaceSemicolonByComma } from '../new_design/avis';
// This is the global application namespace where we expose helpers used from rails views
const DS = {
@ -32,7 +33,8 @@ const DS = {
scrollMessagerie,
showMotivation,
motivationCancel,
toggleChart
toggleChart,
replaceSemicolonByComma
};
// Start Rails helpers

2
app/views/admin/procedures/_informations.html.haml
View file

@ -146,7 +146,7 @@
%h4 Options avancées
%label{ for: :auto_archive_on } Archivage automatique le
= f.text_field :auto_archive_on, id: 'auto_archive_on', value: @procedure.auto_archive_on.try{ |d| d.strftime("%d-%m-%Y") }, data: { provide: 'datepicker', 'date-language' => 'fr', 'date-format' => 'dd/mm/yyyy' }
= f.date_field :auto_archive_on, id: 'auto_archive_on', value: @procedure.auto_archive_on
(à 00h00)
%p.help-block
%i.fa.fa-info-circle

2
app/views/new_administrateur/services/edit.html.haml
View file

@ -1,5 +1,5 @@
= render partial: 'new_administrateur/breadcrumbs',
locals: { steps: [link_to('Procedures', admin_procedures_path),
locals: { steps: [link_to('Démarches', admin_procedures_path),
link_to(@procedure.libelle, admin_procedure_path(@procedure)),
link_to('choix du service', services_path(procedure_id: @procedure.id)),
'modifier le service'] }

2
app/views/new_administrateur/services/index.html.haml
View file

@ -1,5 +1,5 @@
= render partial: 'new_administrateur/breadcrumbs',
locals: { steps: [link_to('Procedures', admin_procedures_path),
locals: { steps: [link_to('Démarches', admin_procedures_path),
link_to(@procedure.libelle, admin_procedure_path(@procedure)),
'choix du service'] }

2
app/views/new_administrateur/services/new.html.haml
View file

@ -1,5 +1,5 @@
= render partial: 'new_administrateur/breadcrumbs',
locals: { steps: [link_to('Procedures', admin_procedures_path),
locals: { steps: [link_to('Démarches', admin_procedures_path),
link_to(@procedure.libelle, admin_procedure_path(@procedure)),
link_to('choix du service', services_path(procedure_id: @procedure.id)),
'nouveau service'] }

2
app/views/new_gestionnaire/shared/avis/_form.html.haml
View file

@ -3,7 +3,7 @@
%p.avis-notice Les invités pourront consulter, donner un avis sur le dossier et contribuer au fil de messagerie, mais ils ne pourront pas le modifier.
= form_for avis, url: url, html: { class: 'form' } do |f|
= f.email_field :emails, placeholder: 'Adresses email, séparées par des virgules', required: true, multiple: true
= f.email_field :emails, placeholder: 'Adresses email, séparées par des virgules', required: true, multiple: true, onchange: "javascript:DS.replaceSemicolonByComma(event);"
= f.text_area :introduction, rows: 3, value: avis.introduction || 'Bonjour, merci de me donner votre avis sur ce dossier.', required: true
.flex.justify-between.align-baseline
- if must_be_confidentiel

2
spec/controllers/support_controller_spec.rb
View file

@ -111,7 +111,7 @@ describe SupportController, type: :controller do
get :index
expect(response.status).to eq(200)
expect(response.body).to have_content("Email *")
expect(response.body).to have_text("Email")
end
end

2
spec/features/new_user/brouillon_spec.rb
View file

@ -22,7 +22,7 @@ feature 'The user' do
# fill data
fill_in('text', with: 'super texte')
fill_in('textarea', with: 'super textarea')
fill_in('date', with: '12/12/2012')
fill_in('date', with: '12-12-2012')
select_date_and_time(Time.zone.parse('06/01/1985 7h05'), form_id_for('datetime'))
fill_in('number', with: '42')
check('checkbox')

2
spec/mailers/avis_mailer_spec.rb
View file

@ -7,7 +7,7 @@ RSpec.describe AvisMailer, type: :mailer do
subject { described_class.avis_invitation(avis) }
it { expect(subject.subject).to eq("Donnez votre avis sur le dossier nº #{avis.dossier.id} (#{avis.dossier.procedure.libelle})") }
it { expect(subject.body).to have_text("Vous avez été invité par #{avis.claimant.email} à donner votre avis sur le dossier nº #{avis.dossier.id} de la démarche : #{avis.dossier.procedure.libelle}") }
it { expect(subject.body).to have_text("Vous avez été invité par\r\n#{avis.claimant.email}\r\nà donner votre avis sur le dossier nº #{avis.dossier.id} de la démarche :\r\n#{avis.dossier.procedure.libelle}") }
it { expect(subject.body).to include(avis.introduction) }
it { expect(subject.body).to include(gestionnaire_avis_url(avis)) }

3
spec/spec_helper.rb
View file

@ -48,6 +48,9 @@ Capybara.register_driver :headless_chrome do |app|
desired_capabilities: capabilities
end
# FIXME: remove this line when https://github.com/rspec/rspec-rails/issues/1897 has been fixed
Capybara.server = :puma, { Silent: true }
Capybara.default_max_wait_time = 2
# Save a snapshot of the HTML page when an integration test fails

2
spec/views/new_gestionnaire/dossiers/show.html.haml_spec.rb
View file

@ -10,7 +10,7 @@ describe 'new_gestionnaire/dossiers/show.html.haml', type: :view do
subject! { render }
it 'renders the header' do
expect(rendered).to have_text("Dossier nº #{dossier.id}")
expect(rendered).to have_text("Dossier nº #{dossier.id}")
end
it 'renders the dossier infos' do

2
spec/views/new_user/dossiers/demande.html.haml_spec.rb
View file

@ -12,7 +12,7 @@ describe 'new_user/dossiers/demande.html.haml', type: :view do
subject! { render }
it 'renders the header' do
expect(rendered).to have_text("Dossier nº #{dossier.id}")
expect(rendered).to have_text("Dossier nº #{dossier.id}")
end
it 'renders the dossier infos' do

2
spec/views/new_user/dossiers/show.html.haml_spec.rb
View file

@ -11,7 +11,7 @@ describe 'new_user/dossiers/show.html.haml', type: :view do
subject! { render }
it 'renders a summary of the dossier state' do
expect(rendered).to have_text("Dossier nº #{dossier.id}")
expect(rendered).to have_text("Dossier nº #{dossier.id}")
expect(rendered).to have_selector('.status-overview')
end

2
spec/views/new_user/dossiers/show/_header.html.haml_spec.rb
View file

@ -9,7 +9,7 @@ describe 'new_user/dossiers/show/header.html.haml', type: :view do
it 'affiche les informations du dossier' do
expect(rendered).to have_text(dossier.procedure.libelle)
expect(rendered).to have_text("Dossier nº #{dossier.id}")
expect(rendered).to have_text("Dossier nº #{dossier.id}")
expect(rendered).to have_text("en construction")
expect(rendered).to have_selector("ul.tabs")