Merge branch 'dev'
This commit is contained in:
commit
c9bfe6b2e4
4 changed files with 15 additions and 4 deletions
2
Gemfile
2
Gemfile
|
@ -74,6 +74,8 @@ gem 'hashie'
|
|||
|
||||
gem 'mailjet'
|
||||
|
||||
gem "premailer-rails"
|
||||
|
||||
gem 'smart_listing'
|
||||
|
||||
gem 'bootstrap-wysihtml5-rails', '~> 0.3.3.8'
|
||||
|
|
10
Gemfile.lock
10
Gemfile.lock
|
@ -146,6 +146,8 @@ GEM
|
|||
crack (0.4.3)
|
||||
safe_yaml (~> 1.0.0)
|
||||
crass (1.0.4)
|
||||
css_parser (1.6.0)
|
||||
addressable
|
||||
daemons (1.2.6)
|
||||
database_cleaner (1.7.0)
|
||||
datetime_picker_rails (0.0.7)
|
||||
|
@ -528,6 +530,13 @@ GEM
|
|||
prawn_rails (0.0.11)
|
||||
prawn (>= 0.11.1)
|
||||
railties (>= 3.0.0)
|
||||
premailer (1.11.1)
|
||||
addressable
|
||||
css_parser (>= 1.6.0)
|
||||
htmlentities (>= 4.0.0)
|
||||
premailer-rails (1.10.2)
|
||||
actionmailer (>= 3, < 6)
|
||||
premailer (~> 1.7, >= 1.7.9)
|
||||
pry (0.11.3)
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.9.0)
|
||||
|
@ -829,6 +838,7 @@ DEPENDENCIES
|
|||
pg
|
||||
prawn
|
||||
prawn_rails
|
||||
premailer-rails
|
||||
pry-byebug
|
||||
rack-handlers
|
||||
rack-mini-profiler
|
||||
|
|
|
@ -2,9 +2,8 @@
|
|||
Bonjour,
|
||||
|
||||
%p
|
||||
<%= @sender.email %> vous a envoyé le dossier nº <%= @dossier.id %>, cliquez sur le lien ci-dessous pour y accéder :
|
||||
|
||||
<%= gestionnaire_dossier_url(@dossier.procedure, @dossier) %>
|
||||
= "#{@sender.email} vous a envoyé le dossier nº #{@dossier.id}, cliquez sur le lien ci-dessous pour y accéder :"
|
||||
= link_to(gestionnaire_dossier_url(@dossier.procedure, @dossier), gestionnaire_dossier_url(@dossier.procedure, @dossier))
|
||||
|
||||
%p
|
||||
Bonne journée,
|
||||
|
|
|
@ -159,7 +159,7 @@ feature 'The gestionnaire part' do
|
|||
def test_mail(to, content)
|
||||
mail = ActionMailer::Base.deliveries.first
|
||||
expect(mail.to).to match([to])
|
||||
expect(mail.body.raw_source).to include(content)
|
||||
expect(mail.body.parts.map(&:to_s)).to all(include(content))
|
||||
end
|
||||
|
||||
def test_statut_bar(a_suivre: 0, suivi: 0, traite: 0, tous_les_dossiers: 0, archive: 0)
|
||||
|
|
Loading…
Reference in a new issue