Merge branch 'develop' into staging
This commit is contained in:
commit
9341376fa5
2 changed files with 3 additions and 5 deletions
|
@ -25,9 +25,6 @@ module TPS
|
||||||
config.assets.paths << Rails.root.join('app', 'assets', 'javascript')
|
config.assets.paths << Rails.root.join('app', 'assets', 'javascript')
|
||||||
config.assets.precompile += %w( application_split2.css )
|
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?
|
if Rails.env.production?
|
||||||
URL = "https://tps.apientreprise.fr/"
|
URL = "https://tps.apientreprise.fr/"
|
||||||
elsif Rails.env.staging?
|
elsif Rails.env.staging?
|
||||||
|
|
|
@ -73,9 +73,10 @@ describe 'admin/procedures/show.html.haml', type: :view do
|
||||||
it { expect(rendered).to have_css('a#reenable') }
|
it { expect(rendered).to have_css('a#reenable') }
|
||||||
end
|
end
|
||||||
|
|
||||||
describe 'procedure link is not present' do
|
describe 'procedure link is present' do
|
||||||
it { expect(rendered).to have_content('Cette procédure a été archivée et n\'est plus accessible par le public.') }
|
it { expect(rendered).to have_content(commencer_url(procedure_path: procedure.path)) }
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
||||||
end
|
end
|
Loading…
Reference in a new issue