From 254c2319e9bcfd00e3d753c89ece30958319c24b Mon Sep 17 00:00:00 2001 From: Simon Lehericey Date: Tue, 21 Feb 2017 10:53:09 +0100 Subject: [PATCH 1/2] Remove Rails Deprecation ActiveRecord::Base.raise_in_transactional_callbacks= is deprecated, has no effect and will be removed without replacement --- config/application.rb | 3 --- 1 file changed, 3 deletions(-) diff --git a/config/application.rb b/config/application.rb index 2652a0b7c..8edea6693 100644 --- a/config/application.rb +++ b/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? From b2198663d107eed8316245f7915620fd89930c3e Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Tue, 21 Feb 2017 12:20:18 +0100 Subject: [PATCH 2/2] Fix test : procedure link is not hidden if archived --- spec/views/admin/procedures/show.html.haml_spec.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spec/views/admin/procedures/show.html.haml_spec.rb b/spec/views/admin/procedures/show.html.haml_spec.rb index 445685f4e..a6de0fb07 100644 --- a/spec/views/admin/procedures/show.html.haml_spec.rb +++ b/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 \ No newline at end of file