Merge branch 'develop' into staging

config/application.rb

@@ -25,9 +25,6 @@ module TPS
     config.assets.paths << Rails.root.join('app', 'assets', 'javascript')
     config.assets.precompile += %w( application_split2.css )
 
-    # Do not swallow errors in after_commit/after_rollback callbacks.
-    config.active_record.raise_in_transactional_callbacks = true
-
     if Rails.env.production?
       URL = "https://tps.apientreprise.fr/"
     elsif Rails.env.staging?

spec/views/admin/procedures/show.html.haml_spec.rb

@@ -73,9 +73,10 @@ describe 'admin/procedures/show.html.haml', type: :view do
       it { expect(rendered).to have_css('a#reenable') }
     end
 
-    describe 'procedure link is not present' do
-      it { expect(rendered).to have_content('Cette procédure a été archivée et n\'est plus accessible par le public.') }
+    describe 'procedure link is present' do
+      it { expect(rendered).to have_content(commencer_url(procedure_path: procedure.path)) }
     end
+
   end
 
 end