From d248afc3760bc3d86216239d76353b1c97de5df2 Mon Sep 17 00:00:00 2001
From: gregoirenovel <log@kinko.fr>
Date: Mon, 12 Jun 2017 16:12:03 +0200
Subject: [PATCH] Enable the Layout/ExtraSpacing cop

---
 .rubocop.yml                                         |  5 ++++-
 app/controllers/stats_controller.rb                  |  2 +-
 .../users/dossiers/add_siret_controller.rb           |  2 +-
 config/initializers/smart_listing.rb                 |  2 +-
 ...0160822142045_delete_value_of_filter_procedure.rb |  2 +-
 lib/tasks/dev.rake                                   | 12 ++++++------
 spec/controllers/users/dossiers_controller_spec.rb   |  8 ++++----
 spec/decorators/procedure_decorator_spec.rb          |  2 +-
 spec/facades/admin_procedures_show_facades_spec.rb   |  4 ++--
 spec/features/backoffice/connection_spec.rb          |  6 +++---
 spec/features/backoffice/search_file_spec.rb         |  4 ++--
 spec/models/administrateur_spec.rb                   |  2 +-
 spec/services/accompagnateur_service_spec.rb         |  2 +-
 .../admin/types_de_champ/show.html.haml_spec.rb      |  2 +-
 .../types_de_champ_private/show.html.haml_spec.rb    |  2 +-
 .../show.html.haml_spec.rb                           |  2 +-
 .../views/backoffice/dossiers/show.html.html_spec.rb |  2 +-
 spec/views/dossiers/_infos_dossier_spec.rb           |  2 +-
 spec/views/users/carte/show.html.haml_spec.rb        |  2 +-
 19 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/.rubocop.yml b/.rubocop.yml
index cdbbfd8e0..1092ac6c6 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -71,7 +71,10 @@ Layout/EndOfLine:
   EnforcedStyle: lf
 
 Layout/ExtraSpacing:
-  Enabled: false
+  Enabled: true
+  Exclude:
+    - "Guardfile"
+    - "db/schema.rb"
 
 Layout/FirstArrayElementLineBreak:
   Enabled: false
diff --git a/app/controllers/stats_controller.rb b/app/controllers/stats_controller.rb
index eb96939c1..5cacd22d1 100644
--- a/app/controllers/stats_controller.rb
+++ b/app/controllers/stats_controller.rb
@@ -61,7 +61,7 @@ class StatsController < ApplicationController
     count_per_administrateur = procedures.group(:administrateur_id).count.values
     {
       'Une procédure' => count_per_administrateur.select { |count| count == 1 }.count,
-      'Entre deux et cinq procédures' => count_per_administrateur.select { |count| 2 <= count && count <= 5  }.count,
+      'Entre deux et cinq procédures' => count_per_administrateur.select { |count| 2 <= count && count <= 5 }.count,
       'Plus de cinq procédures' => count_per_administrateur.select { |count| 5 < count }.count
     }
   end
diff --git a/app/controllers/users/dossiers/add_siret_controller.rb b/app/controllers/users/dossiers/add_siret_controller.rb
index 4190e304f..92ab6ee45 100644
--- a/app/controllers/users/dossiers/add_siret_controller.rb
+++ b/app/controllers/users/dossiers/add_siret_controller.rb
@@ -1,6 +1,6 @@
 class Users::Dossiers::AddSiretController < ApplicationController
   def show
-    @facade =  DossierFacades.new params[:dossier_id], current_user.email
+    @facade = DossierFacades.new params[:dossier_id], current_user.email
 
     raise ActiveRecord::RecordNotFound unless @facade.procedure.individual_with_siret?
 
diff --git a/config/initializers/smart_listing.rb b/config/initializers/smart_listing.rb
index 91d459d6d..09a097d25 100644
--- a/config/initializers/smart_listing.rb
+++ b/config/initializers/smart_listing.rb
@@ -10,7 +10,7 @@ SmartListing.configure do |config|
     # :unlimited_per_page             => false,                       # allow infinite page size
     # :paginate                       => true,                        # allow pagination
     # :memorize_per_page              => false,                       # save per page settings in the cookie
-    :page_sizes                     => [10, 20, 50, 100],          # set available page sizes array
+    :page_sizes                     => [10, 20, 50, 100], # set available page sizes array
     # :kaminari_options               => {:theme => "smart_listing"}, # Kaminari's paginate helper options
   })
 
diff --git a/db/migrate/20160822142045_delete_value_of_filter_procedure.rb b/db/migrate/20160822142045_delete_value_of_filter_procedure.rb
index 9a369b8ed..30a12da5f 100644
--- a/db/migrate/20160822142045_delete_value_of_filter_procedure.rb
+++ b/db/migrate/20160822142045_delete_value_of_filter_procedure.rb
@@ -1,5 +1,5 @@
 class DeleteValueOfFilterProcedure < ActiveRecord::Migration
-  class  Gestionnaire < ActiveRecord::Base
+  class Gestionnaire < ActiveRecord::Base
   end
 
   def change
diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake
index 3373efb79..cd9f5eb23 100644
--- a/lib/tasks/dev.rake
+++ b/lib/tasks/dev.rake
@@ -1,6 +1,6 @@
 namespace :dev do
   desc 'Initialise dev environment'
-  task :init  do
+  task :init do
     puts 'start initialisation'
     Rake::Task['dev:generate_token_file'].invoke
     Rake::Task['dev:generate_franceconnect_file'].invoke
@@ -10,10 +10,10 @@ namespace :dev do
     puts 'end initialisation'
   end
 
-  task :generate_token_file  do
+  task :generate_token_file do
     puts 'creating token.rb file'
     res = `rake secret`.gsub("\n", '')
-    file = File.new('config/initializers/token.rb',  'w+')
+    file = File.new('config/initializers/token.rb', 'w+')
     comment = <<EOF
 EOF
     file.write(comment)
@@ -22,7 +22,7 @@ EOF
   end
 
   task :generate_franceconnect_file do
-    file = File.new('config/france_connect.yml',  'w+')
+    file = File.new('config/france_connect.yml', 'w+')
     comment = <<EOF
 particulier_identifier: plop
 particulier_secret: plip
@@ -48,7 +48,7 @@ default:
   openstack_auth_url: "https://auth.cloud.ovh.net/v2.0/tokens"
   openstack_region: "SBG1"
 EOF
-    file = File.new("config/fog_credentials.test.yml",  "w+")
+    file = File.new("config/fog_credentials.test.yml", "w+")
     file.write(content)
     file.close
   end
@@ -58,7 +58,7 @@ EOF
     content = <<EOF
 remote_storage: true
 EOF
-    file = File.new("config/initializers/features.yml",  "w+")
+    file = File.new("config/initializers/features.yml", "w+")
     file.write(content)
     file.close
   end
diff --git a/spec/controllers/users/dossiers_controller_spec.rb b/spec/controllers/users/dossiers_controller_spec.rb
index 01c8f79a2..abf8361a6 100644
--- a/spec/controllers/users/dossiers_controller_spec.rb
+++ b/spec/controllers/users/dossiers_controller_spec.rb
@@ -369,10 +369,10 @@ describe Users::DossiersController, type: :controller do
         dossier.reload
       end
 
-      it { expect(dossier.individual.gender).to eq 'M.'  }
-      it { expect(dossier.individual.nom).to eq 'Julien'  }
-      it { expect(dossier.individual.prenom).to eq 'Xavier'  }
-      it { expect(dossier.individual.birthdate).to eq '20/01/1991'  }
+      it { expect(dossier.individual.gender).to eq 'M.' }
+      it { expect(dossier.individual.nom).to eq 'Julien' }
+      it { expect(dossier.individual.prenom).to eq 'Xavier' }
+      it { expect(dossier.individual.birthdate).to eq '20/01/1991' }
       it { expect(dossier.procedure.for_individual).to eq true }
     end
 
diff --git a/spec/decorators/procedure_decorator_spec.rb b/spec/decorators/procedure_decorator_spec.rb
index 4c61964f5..34ab7ceab 100644
--- a/spec/decorators/procedure_decorator_spec.rb
+++ b/spec/decorators/procedure_decorator_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe ProcedureDecorator do
-  let(:procedure) { create(:procedure, :published,  created_at: Time.new(2015, 12, 24, 14, 10)) }
+  let(:procedure) { create(:procedure, :published, created_at: Time.new(2015, 12, 24, 14, 10)) }
   subject { procedure.decorate }
 
   describe 'lien' do
diff --git a/spec/facades/admin_procedures_show_facades_spec.rb b/spec/facades/admin_procedures_show_facades_spec.rb
index 9352eecd6..1ea3a1a1e 100644
--- a/spec/facades/admin_procedures_show_facades_spec.rb
+++ b/spec/facades/admin_procedures_show_facades_spec.rb
@@ -20,7 +20,7 @@ describe AdminProceduresShowFacades do
   describe '.dossiers' do
     subject { super().dossiers }
 
-    it { expect(subject.size).to eq(4)  }
+    it { expect(subject.size).to eq(4) }
   end
 
   describe '.dossiers_for_pie_highchart' do
@@ -34,7 +34,7 @@ describe AdminProceduresShowFacades do
 
     it { expect(subject.size).to eq(1)  }
 
-    it { expect(subject.first.state).to eq('initiated')  }
+    it { expect(subject.first.state).to eq('initiated') }
     it { expect(subject.first.total).to eq(1) }
   end
 
diff --git a/spec/features/backoffice/connection_spec.rb b/spec/features/backoffice/connection_spec.rb
index 603546fb5..10252b367 100644
--- a/spec/features/backoffice/connection_spec.rb
+++ b/spec/features/backoffice/connection_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 feature 'when gestionnaire come to /backoffice and is not authenticated' do
   let(:procedure) { create(:procedure) }
-  let!(:dossier) { create(:dossier,  procedure: procedure) }
+  let!(:dossier) { create(:dossier, procedure: procedure) }
   before do
     visit backoffice_path
   end
@@ -25,8 +25,8 @@ feature 'when gestionnaire come to /backoffice and is not authenticated' do
 
     before do
       create :assign_to, gestionnaire: gestionnaire, procedure: procedure
-      page.find_by_id(:user_email).set  gestionnaire.email
-      page.find_by_id(:user_password).set  gestionnaire.password
+      page.find_by_id(:user_email).set gestionnaire.email
+      page.find_by_id(:user_password).set gestionnaire.password
       page.click_on 'Se connecter'
     end
     scenario 'he is redirected to /backoffice' do
diff --git a/spec/features/backoffice/search_file_spec.rb b/spec/features/backoffice/search_file_spec.rb
index dc6baeb85..42ecf5655 100644
--- a/spec/features/backoffice/search_file_spec.rb
+++ b/spec/features/backoffice/search_file_spec.rb
@@ -39,8 +39,8 @@ feature 'search file on gestionnaire backoffice' do
         end
 
         context 'when terms input does return result' do
-          let!(:dossier) { create(:dossier, :with_entreprise,  procedure: procedure, state: 'initiated') }
-          let!(:dossier_2) { create(:dossier,  procedure: procedure, state: 'initiated') }
+          let!(:dossier) { create(:dossier, :with_entreprise, procedure: procedure, state: 'initiated') }
+          let!(:dossier_2) { create(:dossier, procedure: procedure, state: 'initiated') }
 
           let(:terms) { dossier.entreprise.raison_sociale }
 
diff --git a/spec/models/administrateur_spec.rb b/spec/models/administrateur_spec.rb
index 238c3376f..538417c55 100644
--- a/spec/models/administrateur_spec.rb
+++ b/spec/models/administrateur_spec.rb
@@ -33,7 +33,7 @@ describe Administrateur, type: :model do
   describe 'generate_api_token' do
     let(:token) { 'bullshit' }
     let(:new_token) { 'pocket_master' }
-    let!(:admin_1) { create(:administrateur, email: 'toto@tps.com', password: 'password', api_token: token)  }
+    let!(:admin_1) { create(:administrateur, email: 'toto@tps.com', password: 'password', api_token: token) }
     before do
       allow(SecureRandom).to receive(:hex).and_return(token, new_token)
       admin_1.renew_api_token
diff --git a/spec/services/accompagnateur_service_spec.rb b/spec/services/accompagnateur_service_spec.rb
index eb01bfd54..ae6fbb016 100644
--- a/spec/services/accompagnateur_service_spec.rb
+++ b/spec/services/accompagnateur_service_spec.rb
@@ -7,7 +7,7 @@ describe AccompagnateurService do
   let(:accompagnateur_service) { AccompagnateurService.new accompagnateur, procedure, to}
 
   describe '#change_assignement!' do
-    subject { accompagnateur_service.change_assignement!  }
+    subject { accompagnateur_service.change_assignement! }
 
     context 'when accompagnateur is not assign at the procedure' do
       let(:to) { AccompagnateurService::ASSIGN }
diff --git a/spec/views/admin/types_de_champ/show.html.haml_spec.rb b/spec/views/admin/types_de_champ/show.html.haml_spec.rb
index acac3297a..1921dd9f6 100644
--- a/spec/views/admin/types_de_champ/show.html.haml_spec.rb
+++ b/spec/views/admin/types_de_champ/show.html.haml_spec.rb
@@ -43,7 +43,7 @@ describe 'admin/types_de_champ/show.html.haml', type: :view do
       let!(:type_de_champ_1) { create(:type_de_champ_public, procedure: procedure, order_place: 1) }
       it { expect(subject).to have_css('#btn_down_0') }
       it { expect(subject).to have_css('#btn_up_0[style*="visibility: hidden"]') }
-      it { expect(subject).to have_css('#btn_up_1')   }
+      it { expect(subject).to have_css('#btn_up_1') }
       it { expect(subject).to have_css('#btn_down_1[style*="visibility: hidden"]') }
     end
   end
diff --git a/spec/views/admin/types_de_champ_private/show.html.haml_spec.rb b/spec/views/admin/types_de_champ_private/show.html.haml_spec.rb
index 510224e9c..36dce5ecc 100644
--- a/spec/views/admin/types_de_champ_private/show.html.haml_spec.rb
+++ b/spec/views/admin/types_de_champ_private/show.html.haml_spec.rb
@@ -51,7 +51,7 @@ describe 'admin/types_de_champ/show.html.haml', type: :view do
         let!(:type_de_champ_1) { create(:type_de_champ_private, procedure: procedure, order_place: 1) }
         it { expect(subject).to have_css('#btn_down_0') }
         it { expect(subject).to have_css('#btn_up_0[style*="visibility: hidden"]') }
-        it { expect(subject).to have_css('#btn_up_1')   }
+        it { expect(subject).to have_css('#btn_up_1') }
         it { expect(subject).to have_css('#btn_down_1[style*="visibility: hidden"]') }
       end
     end
diff --git a/spec/views/admin/types_de_piece_justificative/show.html.haml_spec.rb b/spec/views/admin/types_de_piece_justificative/show.html.haml_spec.rb
index 73b1be675..ced3d0e9f 100644
--- a/spec/views/admin/types_de_piece_justificative/show.html.haml_spec.rb
+++ b/spec/views/admin/types_de_piece_justificative/show.html.haml_spec.rb
@@ -41,7 +41,7 @@ describe 'admin/pieces_justificatives/show.html.haml', type: :view do
       let!(:type_de_piece_justificative_1) { create(:type_de_piece_justificative, procedure: procedure, order_place: 1) }
       it { expect(subject).to have_css('#btn_down_0') }
       it { expect(subject).not_to have_css('#btn_up_0') }
-      it { expect(subject).to have_css('#btn_up_1')   }
+      it { expect(subject).to have_css('#btn_up_1') }
       it { expect(subject).not_to have_css('#btn_down_1') }
     end
   end
diff --git a/spec/views/backoffice/dossiers/show.html.html_spec.rb b/spec/views/backoffice/dossiers/show.html.html_spec.rb
index 865cb28ef..4060d600f 100644
--- a/spec/views/backoffice/dossiers/show.html.html_spec.rb
+++ b/spec/views/backoffice/dossiers/show.html.html_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'backoffice/dossiers/show.html.haml', type: :view do
-  let!(:dossier) { create(:dossier, :with_entreprise,  state: state) }
+  let!(:dossier) { create(:dossier, :with_entreprise, state: state) }
   let(:state) { 'draft' }
   let(:dossier_id) { dossier.id }
   let(:gestionnaire) { create(:gestionnaire) }
diff --git a/spec/views/dossiers/_infos_dossier_spec.rb b/spec/views/dossiers/_infos_dossier_spec.rb
index ed6c1e76f..ff2448229 100644
--- a/spec/views/dossiers/_infos_dossier_spec.rb
+++ b/spec/views/dossiers/_infos_dossier_spec.rb
@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe 'dossiers/_infos_dossier.html.haml', type: :view do
-  let(:dossier) { create(:dossier, :with_entreprise,  procedure: create(:procedure, :with_api_carto, :with_type_de_champ)) }
+  let(:dossier) { create(:dossier, :with_entreprise, procedure: create(:procedure, :with_api_carto, :with_type_de_champ)) }
 
   before do
     champs.each do |champ|
diff --git a/spec/views/users/carte/show.html.haml_spec.rb b/spec/views/users/carte/show.html.haml_spec.rb
index b30733034..325683e43 100644
--- a/spec/views/users/carte/show.html.haml_spec.rb
+++ b/spec/views/users/carte/show.html.haml_spec.rb
@@ -2,7 +2,7 @@ require 'spec_helper'
 
 describe 'users/carte/show.html.haml', type: :view do
   let(:state) { 'draft' }
-  let(:dossier) { create(:dossier,  state: state) }
+  let(:dossier) { create(:dossier, state: state) }
   let(:dossier_id) { dossier.id }
 
   before do