Merge pull request #665 from sgmap/rubocop_enable_indentation_with

Rubocop: enable indentation width rule
This commit is contained in:
LeSim 2017-08-28 13:37:01 +02:00 committed by GitHub
commit 740cc7dc3f
6 changed files with 8 additions and 8 deletions

View file

@ -110,7 +110,7 @@ Layout/IndentationConsistency:
Enabled: false
Layout/IndentationWidth:
Enabled: false
Enabled: true
Layout/InitialIndentation:
Enabled: false

View file

@ -72,9 +72,9 @@ class Admin::AttestationTemplatesController < AdminController
def uninterlaced_png(uploaded_file)
if uploaded_file.present? && uploaded_file.content_type == 'image/png'
chunky_img = ChunkyPNG::Image.from_io(uploaded_file)
chunky_img.save(uploaded_file.tempfile.to_path, interlace: false)
uploaded_file.tempfile.reopen(uploaded_file.tempfile.to_path, 'rb')
chunky_img = ChunkyPNG::Image.from_io(uploaded_file)
chunky_img.save(uploaded_file.tempfile.to_path, interlace: false)
uploaded_file.tempfile.reopen(uploaded_file.tempfile.to_path, 'rb')
end
uploaded_file

View file

@ -1,5 +1,5 @@
module CredentialsSyncableConcern
extend ActiveSupport::Concern
extend ActiveSupport::Concern
included do
after_update :sync_credentials

View file

@ -1,5 +1,5 @@
if LogStasher.enabled
LogStasher.add_custom_fields do |fields|
fields[:type] = "tps"
fields[:type] = "tps"
end
end

View file

@ -1,6 +1,6 @@
class RemoveDuplicateEmailReceived < ActiveRecord::Migration[5.0]
def change
all_mails = MailReceived.all
all_mails = MailReceived.all
groupped = all_mails.group_by { |m| m.procedure_id }
filtered = groupped.reject { |k, v| v.length < 2 }
filtered.each do |k, duplicate_mails|

View file

@ -6,7 +6,7 @@ describe MailTemplateConcern do
let(:initiated_mail) { Mails::InitiatedMail.default }
it 'works' do
initiated_mail.object = '[TPS] --numero_dossier-- --libelle_procedure-- --lien_dossier--'
initiated_mail.object = '[TPS] --numero_dossier-- --libelle_procedure-- --lien_dossier--'
expected =
"[TPS] #{dossier.id} #{dossier.procedure.libelle} " +
"<a target=\"_blank\" href=\"http://localhost:3000/users/dossiers/#{dossier.id}/recapitulatif\">http://localhost:3000/users/dossiers/#{dossier.id}/recapitulatif</a>"