From 9763931f55f9e91f6148f326c6727cf064a3a987 Mon Sep 17 00:00:00 2001 From: Bertocq Date: Wed, 21 Jun 2017 22:34:50 +0200 Subject: [PATCH] Fix all Layout/SpaceBeforeComma rubocop issues and remove from rubocop_todo list --- .rubocop_todo.yml | 8 -------- app/controllers/legislation/answers_controller.rb | 2 +- app/models/proposal.rb | 2 +- spec/controllers/management/sessions_controller_spec.rb | 6 +++--- spec/controllers/management/users_controller_spec.rb | 4 ++-- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml index 701bacf1a..94a40cd2d 100644 --- a/.rubocop_todo.yml +++ b/.rubocop_todo.yml @@ -612,14 +612,6 @@ Layout/SpaceAroundEqualsInParameterDefault: Layout/SpaceAroundOperators: Enabled: false -# Offense count: 6 -# Cop supports --auto-correct. -Layout/SpaceBeforeComma: - Exclude: - - 'app/models/proposal.rb' - - 'spec/controllers/management/sessions_controller_spec.rb' - - 'spec/controllers/management/users_controller_spec.rb' - # Offense count: 9 # Cop supports --auto-correct. # Configuration parameters: EnforcedStyle, SupportedStyles. diff --git a/app/controllers/legislation/answers_controller.rb b/app/controllers/legislation/answers_controller.rb index 02946013b..36f87de1f 100644 --- a/app/controllers/legislation/answers_controller.rb +++ b/app/controllers/legislation/answers_controller.rb @@ -19,7 +19,7 @@ class Legislation::AnswersController < Legislation::BaseController end else respond_to do |format| - format.js { render json: {} , status: :not_found } + format.js { render json: {}, status: :not_found } format.html { redirect_to legislation_process_question_path(@process, @question), alert: t('legislation.questions.participation.phase_not_open') } end end diff --git a/app/models/proposal.rb b/app/models/proposal.rb index a35b29459..926cbe1ee 100644 --- a/app/models/proposal.rb +++ b/app/models/proposal.rb @@ -39,7 +39,7 @@ class Proposal < ActiveRecord::Base before_save :calculate_hot_score, :calculate_confidence_score scope :for_render, -> { includes(:tags) } - scope :sort_by_hot_score , -> { reorder(hot_score: :desc) } + scope :sort_by_hot_score, -> { reorder(hot_score: :desc) } scope :sort_by_confidence_score, -> { reorder(confidence_score: :desc) } scope :sort_by_created_at, -> { reorder(created_at: :desc) } scope :sort_by_most_commented, -> { reorder(comments_count: :desc) } diff --git a/spec/controllers/management/sessions_controller_spec.rb b/spec/controllers/management/sessions_controller_spec.rb index d2d6b5f8b..ec8f762d9 100644 --- a/spec/controllers/management/sessions_controller_spec.rb +++ b/spec/controllers/management/sessions_controller_spec.rb @@ -5,15 +5,15 @@ describe Management::SessionsController do describe 'Sign in' do it "should deny access if wrong manager credentials" do allow_any_instance_of(ManagerAuthenticator).to receive(:auth).and_return(false) - expect { get :create, login: "nonexistent" , clave_usuario: "wrong"}.to raise_error CanCan::AccessDenied + expect { get :create, login: "nonexistent", clave_usuario: "wrong"}.to raise_error CanCan::AccessDenied expect(session[:manager]).to be_nil end it "should redirect to management root path if authorized manager with right credentials" do - manager = {login: "JJB033", user_key: "31415926" , date: "20151031135905"} + manager = {login: "JJB033", user_key: "31415926", date: "20151031135905"} allow_any_instance_of(ManagerAuthenticator).to receive(:auth).and_return(manager) - get :create, login: "JJB033" , clave_usuario: "31415926", fecha_conexion: "20151031135905" + get :create, login: "JJB033", clave_usuario: "31415926", fecha_conexion: "20151031135905" expect(response).to be_redirect expect(session[:manager][:login]).to eq "JJB033" end diff --git a/spec/controllers/management/users_controller_spec.rb b/spec/controllers/management/users_controller_spec.rb index ed73aa053..e57ff7b15 100644 --- a/spec/controllers/management/users_controller_spec.rb +++ b/spec/controllers/management/users_controller_spec.rb @@ -4,13 +4,13 @@ describe Management::UsersController do describe 'logout' do it "should remove user data from the session" do - session[:manager] = {user_key: "31415926" , date: "20151031135905", login: "JJB033"} + session[:manager] = {user_key: "31415926", date: "20151031135905", login: "JJB033"} session[:document_type] = "1" session[:document_number] = "12345678Z" get :logout - expect(session[:manager]).to eq({user_key: "31415926" , date: "20151031135905", login: "JJB033"}) + expect(session[:manager]).to eq({user_key: "31415926", date: "20151031135905", login: "JJB033"}) expect(session[:document_type]).to be_nil expect(session[:document_number]).to be_nil expect(response).to be_redirect