Enable the Layout/SpaceInsideBlockBraces cop

This commit is contained in:
gregoirenovel 2018-01-15 21:54:40 +01:00
parent ff87d0e65f
commit 897a30da0c
23 changed files with 52 additions and 52 deletions

View file

@ -204,7 +204,7 @@ Layout/SpaceInsideArrayPercentLiteral:
Enabled: true
Layout/SpaceInsideBlockBraces:
Enabled: false
Enabled: true
Layout/SpaceInsideBrackets:
Enabled: false

View file

@ -273,9 +273,9 @@ class Dossier < ActiveRecord::Base
when 'etablissement'
self.etablissement&.send(column)
when 'type_de_champ'
self.champs.find {|c| c.type_de_champ_id == column.to_i }.value
self.champs.find { |c| c.type_de_champ_id == column.to_i }.value
when 'type_de_champ_private'
self.champs_private.find {|c| c.type_de_champ_id == column.to_i }.value
self.champs_private.find { |c| c.type_de_champ_id == column.to_i }.value
end
end

View file

@ -6,17 +6,17 @@ describe API::V1::ProceduresController, type: :controller do
describe 'GET show' do
context 'when procedure does not exist' do
subject { get :show, params: {id: 999_999_999, token: admin.api_token }}
subject { get :show, params: { id: 999_999_999, token: admin.api_token } }
it { expect(subject.status).to eq(404) }
end
context 'when procedure does not belong to administrateur' do
let(:procedure) { create(:procedure, administrateur: create(:administrateur)) }
subject { get :show, params: {id: procedure, token: admin.api_token }}
subject { get :show, params: { id: procedure, token: admin.api_token } }
it { expect(subject.status).to eq(404) }
end
context 'when procedure exist' do
let(:procedure) { create(:procedure, :with_two_type_de_piece_justificative, :with_type_de_champ, administrateur: admin) }
subject { get :show, params: {id: procedure, token: admin.api_token }}
subject { get :show, params: { id: procedure, token: admin.api_token } }
it 'return REST code 200', :show_in_doc do
expect(subject.status).to eq(200)
@ -25,7 +25,7 @@ describe API::V1::ProceduresController, type: :controller do
describe 'body' do
let(:module_api_carto) { create(:module_api_carto, use_api_carto: true, quartiers_prioritaires: true, cadastre: true) }
let(:procedure) { create(:procedure, :with_type_de_champ, :with_two_type_de_piece_justificative, module_api_carto: module_api_carto, administrateur: admin) }
let(:response) { get :show, params: {id: procedure.id, token: admin.api_token }}
let(:response) { get :show, params: { id: procedure.id, token: admin.api_token } }
subject { JSON.parse(response.body, symbolize_names: true)[:procedure] }
it { expect(subject[:id]).to eq(procedure.id) }

View file

@ -5,7 +5,7 @@ describe ApplicationController, type: :controller do
it 'is present' do
before_actions = ApplicationController
._process_action_callbacks
.find_all{|process_action_callbacks| process_action_callbacks.kind == :before}
.find_all{ |process_action_callbacks| process_action_callbacks.kind == :before }
.map(&:filter)
expect(before_actions).to include(:set_raven_context)

View file

@ -5,7 +5,7 @@ describe NewGestionnaire::GestionnaireController, type: :controller do
it 'is present' do
before_actions = NewGestionnaire::GestionnaireController
._process_action_callbacks
.find_all{|process_action_callbacks| process_action_callbacks.kind == :before}
.find_all{ |process_action_callbacks| process_action_callbacks.kind == :before }
.map(&:filter)
expect(before_actions).to include(:authenticate_gestionnaire!)

View file

@ -5,7 +5,7 @@ describe NewGestionnaire::ProceduresController, type: :controller do
it "is present" do
before_actions = NewGestionnaire::ProceduresController
._process_action_callbacks
.find_all{|process_action_callbacks| process_action_callbacks.kind == :before}
.find_all{ |process_action_callbacks| process_action_callbacks.kind == :before }
.map(&:filter)
expect(before_actions).to include(:ensure_ownership!)
@ -46,7 +46,7 @@ describe NewGestionnaire::ProceduresController, type: :controller do
it "is present" do
before_actions = NewGestionnaire::ProceduresController
._process_action_callbacks
.find_all{|process_action_callbacks| process_action_callbacks.kind == :before}
.find_all{ |process_action_callbacks| process_action_callbacks.kind == :before }
.map(&:filter)
expect(before_actions).to include(:redirect_to_avis_if_needed)
@ -89,7 +89,7 @@ describe NewGestionnaire::ProceduresController, type: :controller do
context "when not logged" do
before { subject }
it { expect(response).to redirect_to(new_user_session_path)}
it { expect(response).to redirect_to(new_user_session_path) }
end
context "when logged in" do

View file

@ -7,7 +7,7 @@ describe NewUser::DossiersController, type: :controller do
it 'is present' do
before_actions = NewUser::DossiersController
._process_action_callbacks
.find_all{|process_action_callbacks| process_action_callbacks.kind == :before}
.find_all{ |process_action_callbacks| process_action_callbacks.kind == :before }
.map(&:filter)
expect(before_actions).to include(:ensure_ownership!)

View file

@ -5,7 +5,7 @@ describe NewUser::UserController, type: :controller do
it 'is present' do
before_actions = NewUser::UserController
._process_action_callbacks
.find_all{|process_action_callbacks| process_action_callbacks.kind == :before}
.find_all{ |process_action_callbacks| process_action_callbacks.kind == :before }
.map(&:filter)
expect(before_actions).to include(:authenticate_user!)

View file

@ -8,7 +8,7 @@ describe Users::Dossiers::AddSiretController, type: :controller do
sign_in dossier.user
end
subject { get :show, params: {dossier_id: dossier.id }}
subject { get :show, params: {dossier_id: dossier.id } }
context 'when dossier is not attached at a procedure with individual siret attribut' do
it { is_expected.to redirect_to users_dossiers_path }

View file

@ -1,7 +1,7 @@
require 'spec_helper'
describe ChampDecorator do
let(:champ) {create :champ, type_de_champ: (create :type_de_champ_public, type_champ: type_champ)}
let(:champ) { create :champ, type_de_champ: (create :type_de_champ_public, type_champ: type_champ) }
let(:decorator) { champ.decorate }
describe 'value' do

View file

@ -2,7 +2,7 @@ require 'spec_helper'
describe 'user access to the list of his dossier' do
let(:user) { create(:user) }
let!(:last_updated_dossier) { create(:dossier, :with_entreprise, user: user, state: 'en_construction')}
let!(:last_updated_dossier) { create(:dossier, :with_entreprise, user: user, state: 'en_construction') }
let!(:dossier1) { create(:dossier, :with_entreprise, user: user, state: 'en_construction') }
let!(:dossier2) { create(:dossier, :with_entreprise) }
let!(:dossier_archived) { create(:dossier, :with_entreprise, user: user, state: 'en_construction') }

View file

@ -1,10 +1,10 @@
require 'rails_helper'
RSpec.describe AutoArchiveProcedureJob, type: :job do
let!(:procedure) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: nil )}
let!(:procedure_hier) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: 1.day.ago )}
let!(:procedure_aujourdhui) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: Date.today )}
let!(:procedure_demain) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: 1.day.from_now )}
let!(:procedure) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: nil ) }
let!(:procedure_hier) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: 1.day.ago ) }
let!(:procedure_aujourdhui) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: Date.today ) }
let!(:procedure_demain) { create(:procedure, published_at: Time.now, archived_at: nil, auto_archive_on: 1.day.from_now ) }
subject { AutoArchiveProcedureJob.new.perform }
@ -18,15 +18,15 @@ RSpec.describe AutoArchiveProcedureJob, type: :job do
end
context "when procedures have auto_archive_on set on yesterday or today" do
let!(:dossier1) { create(:dossier, procedure: procedure_hier, state: 'brouillon', archived: false)}
let!(:dossier2) { create(:dossier, procedure: procedure_hier, state: 'en_construction', archived: false)}
let!(:dossier3) { create(:dossier, procedure: procedure_hier, state: 'en_construction', archived: false)}
let!(:dossier4) { create(:dossier, procedure: procedure_hier, state: 'en_construction', archived: false)}
let!(:dossier5) { create(:dossier, procedure: procedure_hier, state: 'en_instruction', archived: false)}
let!(:dossier6) { create(:dossier, procedure: procedure_hier, state: 'accepte', archived: false)}
let!(:dossier7) { create(:dossier, procedure: procedure_hier, state: 'refuse', archived: false)}
let!(:dossier8) { create(:dossier, procedure: procedure_hier, state: 'sans_suite', archived: false)}
let!(:dossier9) { create(:dossier, procedure: procedure_aujourdhui, state: 'en_construction', archived: false)}
let!(:dossier1) { create(:dossier, procedure: procedure_hier, state: 'brouillon', archived: false) }
let!(:dossier2) { create(:dossier, procedure: procedure_hier, state: 'en_construction', archived: false) }
let!(:dossier3) { create(:dossier, procedure: procedure_hier, state: 'en_construction', archived: false) }
let!(:dossier4) { create(:dossier, procedure: procedure_hier, state: 'en_construction', archived: false) }
let!(:dossier5) { create(:dossier, procedure: procedure_hier, state: 'en_instruction', archived: false) }
let!(:dossier6) { create(:dossier, procedure: procedure_hier, state: 'accepte', archived: false) }
let!(:dossier7) { create(:dossier, procedure: procedure_hier, state: 'refuse', archived: false) }
let!(:dossier8) { create(:dossier, procedure: procedure_hier, state: 'sans_suite', archived: false) }
let!(:dossier9) { create(:dossier, procedure: procedure_aujourdhui, state: 'en_construction', archived: false) }
before do
subject

View file

@ -8,7 +8,7 @@ describe WelcomeMailer, type: :mailer do
it { expect(subject.body).to match(new_user_password_url) }
it { expect(subject.body).to match(user.email) }
it { expect(subject.body).to match('Bienvenue sur la plateforme TPS') }
it { expect(subject.body).to match('Nous vous remercions de vous être inscrit sur TPS. Pour mémoire, voici quelques informations utiles :')}
it { expect(subject.body).to match('Nous vous remercions de vous être inscrit sur TPS. Pour mémoire, voici quelques informations utiles :') }
it { expect(subject.subject).to eq("Création de votre compte TPS") }
end

View file

@ -32,7 +32,7 @@ RSpec.describe Avis, type: :model do
subject { Avis.by_latest }
it { expect(subject).to eq([avis, avis3, avis2])}
it { expect(subject).to eq([avis, avis3, avis2]) }
end
end

View file

@ -55,7 +55,7 @@ shared_examples 'champ_spec' do
end
context "when type_champ=date" do
let(:type_de_champ) { create(:type_de_champ_public, type_champ: "date")}
let(:type_de_champ) { create(:type_de_champ_public, type_champ: "date") }
let(:champ) { create(:champ, type_de_champ: type_de_champ) }
it "should convert %d/%m/%Y format to ISO" do

View file

@ -1,7 +1,7 @@
require 'spec_helper'
describe MailTemplateConcern do
let(:procedure) { create(:procedure)}
let(:procedure) { create(:procedure) }
let(:dossier) { create(:dossier, procedure: procedure) }
let(:dossier2) { create(:dossier, procedure: procedure) }
let(:initiated_mail) { Mails::InitiatedMail.default_for_procedure(procedure) }

View file

@ -308,7 +308,7 @@ describe Dossier do
subject { dossier }
it { expect(dossier.full_data_strings_array).to eq(expected_string)}
it { expect(dossier.full_data_strings_array).to eq(expected_string) }
end
end
@ -575,7 +575,7 @@ describe Dossier do
subject { procedure.dossiers.downloadable_sorted }
it { is_expected.to match([dossier3, dossier4, dossier2])}
it { is_expected.to match([dossier3, dossier4, dossier2]) }
end
describe "#send_dossier_received" do

View file

@ -214,7 +214,7 @@ describe Gestionnaire, type: :model do
end
context 'with a followed dossier' do
let!(:dossier){create(:dossier, procedure: procedure, state: 'en_instruction')}
let!(:dossier){ create(:dossier, procedure: procedure, state: 'en_instruction') }
let!(:follow){ create(:follow, dossier: dossier, gestionnaire: gestionnaire) }
context 'with 1 notification' do
@ -237,7 +237,7 @@ describe Gestionnaire, type: :model do
end
context 'with another dossier' do
let!(:dossier2){create(:dossier, procedure: procedure, state: 'en_instruction')}
let!(:dossier2){ create(:dossier, procedure: procedure, state: 'en_instruction') }
let!(:follow2){ create(:follow, dossier: dossier2, gestionnaire: gestionnaire) }
context 'and some notifications' do
@ -346,8 +346,8 @@ describe Gestionnaire, type: :model do
let!(:procedure_assign_2) { create :assign_to, gestionnaire: gestionnaire, procedure: procedure_2 }
let!(:pp) { ProcedurePresentation.create(assign_to: procedure_assign) }
it { expect(gestionnaire.procedure_presentation_for_procedure_id(procedure.id)).to eq(pp)}
it { expect(gestionnaire.procedure_presentation_for_procedure_id(procedure_2.id).persisted?).to be_falsey}
it { expect(gestionnaire.procedure_presentation_for_procedure_id(procedure.id)).to eq(pp) }
it { expect(gestionnaire.procedure_presentation_for_procedure_id(procedure_2.id).persisted?).to be_falsey }
end
describe '#notifications_for_dossier' do

View file

@ -18,31 +18,31 @@ describe ProcedurePath do
context 'when path is nil' do
let(:path) { nil }
it { expect{procedure_path}.to raise_error ActiveRecord::RecordInvalid }
it { expect{ procedure_path }.to raise_error ActiveRecord::RecordInvalid }
end
context 'when path is empty' do
let(:path) { '' }
it { expect{procedure_path}.to raise_error ActiveRecord::RecordInvalid }
it { expect{ procedure_path }.to raise_error ActiveRecord::RecordInvalid }
end
context 'when path contains spaces' do
let(:path) { 'Demande de subvention' }
it { expect{procedure_path}.to raise_error ActiveRecord::RecordInvalid }
it { expect{ procedure_path }.to raise_error ActiveRecord::RecordInvalid }
end
context 'when path contains alphanumerics and underscores' do
let(:path) { 'ma_super_procedure_1' }
it { expect{procedure_path}.not_to raise_error }
it { expect{ procedure_path }.not_to raise_error }
end
context 'when path contains dashes' do
let(:path) { 'ma-super-procedure' }
it { expect{procedure_path}.not_to raise_error }
it { expect{ procedure_path }.not_to raise_error }
end
context 'when path is too long' do
let(:path) { 'ma-super-procedure-12345678901234567890123456789012345678901234567890' }
it { expect{procedure_path}.to raise_error ActiveRecord::RecordInvalid }
it { expect{ procedure_path }.to raise_error ActiveRecord::RecordInvalid }
end
context 'when path is too short' do
let(:path) { 'pr' }
it { expect{procedure_path}.to raise_error ActiveRecord::RecordInvalid }
it { expect{ procedure_path }.to raise_error ActiveRecord::RecordInvalid }
end
end
end

View file

@ -39,7 +39,7 @@ describe DossierTableExportSerializer do
describe '#emails_accompagnateurs' do
let(:gestionnaire){ create(:gestionnaire) }
let(:gestionnaire2) { create :gestionnaire}
let(:gestionnaire2) { create :gestionnaire }
let(:dossier) { create(:dossier) }
subject { DossierTableExportSerializer.new(dossier).emails_accompagnateurs }

View file

@ -4,7 +4,7 @@ describe AccompagnateurService do
let(:procedure) { create :procedure, :published }
let(:accompagnateur) { create :gestionnaire }
let(:accompagnateur_service) { AccompagnateurService.new accompagnateur, procedure, to}
let(:accompagnateur_service) { AccompagnateurService.new accompagnateur, procedure, to }
describe '#change_assignement!' do
subject { accompagnateur_service.change_assignement! }

View file

@ -83,8 +83,8 @@ describe 'users/description/show.html.haml', type: :view do
describe 'datetime value is correctly setup when is not nil' do
it { expect(rendered).to have_css("input[type='datetime'][id='champs_#{champ_datetime.id}'][value='22/06/2016']") }
it { expect(rendered).to have_css("option[value='12'][selected='selected']")}
it { expect(rendered).to have_css("option[value='05'][selected='selected']")}
it { expect(rendered).to have_css("option[value='12'][selected='selected']") }
it { expect(rendered).to have_css("option[value='05'][selected='selected']") }
end
end

View file

@ -25,7 +25,7 @@ describe 'users/siret/index.html.haml', type: :view do
end
context 'stockage de l\'ID de la procédure dans un champs hidden' do
it {expect(rendered).to have_selector("input[type=hidden][id=procedure_id][name=procedure_id][value='#{procedure.id}']", visible: false)}
it { expect(rendered).to have_selector("input[type=hidden][id=procedure_id][name=procedure_id][value='#{procedure.id}']", visible: false) }
end
it 'le titre de la procédure est présent sur la page' do