From 25aef603545ef0b58b384eebf5d837029920dc41 Mon Sep 17 00:00:00 2001 From: gregoirenovel Date: Tue, 30 Jan 2018 15:16:05 +0100 Subject: [PATCH] Use string interpolation --- app/models/commentaire.rb | 2 +- app/services/render_partial_service.rb | 4 ++-- .../description_controller_shared_example.rb | 16 ++++++++-------- .../upload_piece_justificative_spec.rb | 2 +- spec/features/users/dossier_edition_spec.rb | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/app/models/commentaire.rb b/app/models/commentaire.rb index 7b3c651d9..3cfeab1da 100644 --- a/app/models/commentaire.rb +++ b/app/models/commentaire.rb @@ -14,7 +14,7 @@ class Commentaire < ActiveRecord::Base after_create :notify def header - "#{email}, " + I18n.l(created_at.localtime, format: '%d %b %Y %H:%M') + "#{email}, #{I18n.l(created_at.localtime, format: '%d %b %Y %H:%M')}" end def file_url diff --git a/app/services/render_partial_service.rb b/app/services/render_partial_service.rb index 5d37024ea..186c8f633 100644 --- a/app/services/render_partial_service.rb +++ b/app/services/render_partial_service.rb @@ -23,11 +23,11 @@ class RenderPartialService private def retrieve_navbar - 'layouts/navbars/navbar_' + retrieve_name + "layouts/navbars/navbar_#{retrieve_name}" end def retrieve_left_panel - 'layouts/left_panels/left_panel_' + retrieve_name + "layouts/left_panels/left_panel_#{retrieve_name}" end def retrieve_name diff --git a/spec/controllers/users/description_controller_shared_example.rb b/spec/controllers/users/description_controller_shared_example.rb index 0811a33e4..4a5d57e85 100644 --- a/spec/controllers/users/description_controller_shared_example.rb +++ b/spec/controllers/users/description_controller_shared_example.rb @@ -302,8 +302,8 @@ shared_examples 'description_controller_spec' do before do post :update, params: { dossier_id: dossier_id, - 'piece_justificative_' + all_pj_type[0].to_s => piece_justificative_0, - 'piece_justificative_' + all_pj_type[1].to_s => piece_justificative_1 + "piece_justificative_#{all_pj_type[0].to_s}" => piece_justificative_0, + "piece_justificative_#{all_pj_type[1].to_s}" => piece_justificative_1 } dossier.reload end @@ -314,8 +314,8 @@ shared_examples 'description_controller_spec' do post :update, params: { dossier_id: dossier_id, - 'piece_justificative_' + all_pj_type[0].to_s => piece_justificative_0, - 'piece_justificative_' + all_pj_type[1].to_s => piece_justificative_1 + "piece_justificative_#{all_pj_type[0].to_s}" => piece_justificative_0, + "piece_justificative_#{all_pj_type[1].to_s}" => piece_justificative_1 } end end @@ -355,8 +355,8 @@ shared_examples 'description_controller_spec' do subject { patch :pieces_justificatives, params: { dossier_id: dossier.id, - 'piece_justificative_' + all_pj_type[0].to_s => piece_justificative_0, - 'piece_justificative_' + all_pj_type[1].to_s => piece_justificative_1 + "piece_justificative_#{all_pj_type[0].to_s}" => piece_justificative_0, + "piece_justificative_#{all_pj_type[1].to_s}" => piece_justificative_1 } } @@ -434,8 +434,8 @@ shared_examples 'description_controller_spec_POST_piece_justificatives_for_owner subject { patch :pieces_justificatives, params: { dossier_id: dossier.id, - 'piece_justificative_' + all_pj_type[0].to_s => piece_justificative_0, - 'piece_justificative_' + all_pj_type[1].to_s => piece_justificative_1 + "piece_justificative_#{all_pj_type[0].to_s}" => piece_justificative_0, + "piece_justificative_#{all_pj_type[1].to_s}" => piece_justificative_1 } } diff --git a/spec/features/description_page/upload_piece_justificative_spec.rb b/spec/features/description_page/upload_piece_justificative_spec.rb index 25ccf4f75..50f00c9fb 100644 --- a/spec/features/description_page/upload_piece_justificative_spec.rb +++ b/spec/features/description_page/upload_piece_justificative_spec.rb @@ -44,7 +44,7 @@ feature 'user is on description page' do end context 'when he adds a piece_justificative and submit form', vcr: { cassette_name: 'description_page_upload_piece_justificative_adds_cerfa_and_submit' } do before do - file_input_id = 'piece_justificative_' + dossier.types_de_piece_justificative.first.id.to_s + file_input_id = "piece_justificative_#{dossier.types_de_piece_justificative.first.id.to_s}" attach_file(file_input_id, File.path('spec/support/files/dossierPDF.pdf')) click_on('Soumettre mon dossier') dossier.reload diff --git a/spec/features/users/dossier_edition_spec.rb b/spec/features/users/dossier_edition_spec.rb index d64311de5..3de44ef52 100644 --- a/spec/features/users/dossier_edition_spec.rb +++ b/spec/features/users/dossier_edition_spec.rb @@ -21,7 +21,7 @@ feature 'As a User I want to edit a dossier I own' do end scenario 'Getting a dossier, I want to create a new message on', js: true do - page.find_by_id('tr_dossier_' + dossier.id.to_s).click + page.find_by_id("tr_dossier_#{dossier.id.to_s}").click expect(page).to have_current_path(users_dossier_recapitulatif_path(Dossier.first.id.to_s)) page.find_by_id('open-message').click page.execute_script("$('#texte_commentaire').data('wysihtml5').editor.setValue('Contenu du nouveau message')") @@ -30,7 +30,7 @@ feature 'As a User I want to edit a dossier I own' do end scenario 'On the same dossier, I want to edit informations', js: true do - page.find_by_id('tr_dossier_' + dossier.id.to_s).click + page.find_by_id("tr_dossier_#{dossier.id.to_s}").click expect(page).to have_current_path(users_dossier_recapitulatif_path(dossier.id.to_s)) # Linked Dossier