Enable the Layout/EmptyLines cop
This commit is contained in:
parent
ff1f679c7b
commit
f496f1adab
21 changed files with 1 additions and 27 deletions
|
@ -43,7 +43,7 @@ Layout/EmptyLineBetweenDefs:
|
||||||
Enabled: true
|
Enabled: true
|
||||||
|
|
||||||
Layout/EmptyLines:
|
Layout/EmptyLines:
|
||||||
Enabled: false
|
Enabled: true
|
||||||
|
|
||||||
Layout/EmptyLinesAroundAccessModifier:
|
Layout/EmptyLinesAroundAccessModifier:
|
||||||
Enabled: false
|
Enabled: false
|
||||||
|
|
|
@ -24,7 +24,6 @@
|
||||||
# * zeus: 'zeus rspec' (requires the server to be started separetly)
|
# * zeus: 'zeus rspec' (requires the server to be started separetly)
|
||||||
# * 'just' rspec: 'rspec'
|
# * 'just' rspec: 'rspec'
|
||||||
|
|
||||||
|
|
||||||
guard 'livereload' do
|
guard 'livereload' do
|
||||||
extensions = {
|
extensions = {
|
||||||
css: :css,
|
css: :css,
|
||||||
|
|
2
Rakefile
2
Rakefile
|
@ -19,7 +19,6 @@ task :deploy_ha do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
task :deploy_old do
|
task :deploy_old do
|
||||||
domains = %w(37.187.154.237 37.187.249.111)
|
domains = %w(37.187.154.237 37.187.249.111)
|
||||||
domains.each do |domain|
|
domains.each do |domain|
|
||||||
|
@ -27,7 +26,6 @@ task :deploy_old do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
task :deploy_test do
|
task :deploy_test do
|
||||||
domains = %w(192.168.0.116)
|
domains = %w(192.168.0.116)
|
||||||
branch = 'clamav'
|
branch = 'clamav'
|
||||||
|
|
|
@ -31,7 +31,6 @@ class Backoffice::DossiersListController < ApplicationController
|
||||||
dossiers_list_facade liste
|
dossiers_list_facade liste
|
||||||
service = dossiers_list_facade.service
|
service = dossiers_list_facade.service
|
||||||
|
|
||||||
|
|
||||||
if param_page.nil?
|
if param_page.nil?
|
||||||
params[:dossiers_smart_listing] = {page: dossiers_list_facade.service.default_page}
|
params[:dossiers_smart_listing] = {page: dossiers_list_facade.service.default_page}
|
||||||
end
|
end
|
||||||
|
|
|
@ -7,7 +7,6 @@ class TypesDeChampService
|
||||||
.permit("#{attributes}" => [:libelle, :description, :order_place, :type_champ, :id, :mandatory, :type,
|
.permit("#{attributes}" => [:libelle, :description, :order_place, :type_champ, :id, :mandatory, :type,
|
||||||
drop_down_list_attributes: [:value, :id]])
|
drop_down_list_attributes: [:value, :id]])
|
||||||
|
|
||||||
|
|
||||||
parameters[attributes].each do |param_first, param_second|
|
parameters[attributes].each do |param_first, param_second|
|
||||||
if param_second[:libelle].empty?
|
if param_second[:libelle].empty?
|
||||||
parameters[attributes].delete(param_first.to_s)
|
parameters[attributes].delete(param_first.to_s)
|
||||||
|
|
|
@ -15,7 +15,6 @@ raise "Bad to=#{+ENV['to']}" unless ["staging", "production"].include?(ENV['to']
|
||||||
|
|
||||||
raise "missing domain, run with 'rake deploy domain=37.187.154.237'" if ENV['domain'].nil?
|
raise "missing domain, run with 'rake deploy domain=37.187.154.237'" if ENV['domain'].nil?
|
||||||
|
|
||||||
|
|
||||||
# set :domain, '5.135.190.60'
|
# set :domain, '5.135.190.60'
|
||||||
set :domain, ENV['domain']
|
set :domain, ENV['domain']
|
||||||
set :repository, 'https://github.com/sgmap/tps.git'
|
set :repository, 'https://github.com/sgmap/tps.git'
|
||||||
|
@ -72,7 +71,6 @@ set :shared_paths, [
|
||||||
'app/views/cgu/index.html.haml'
|
'app/views/cgu/index.html.haml'
|
||||||
]
|
]
|
||||||
|
|
||||||
|
|
||||||
set :rbenv_path, "/usr/local/rbenv/bin/rbenv"
|
set :rbenv_path, "/usr/local/rbenv/bin/rbenv"
|
||||||
|
|
||||||
# Optional settings:
|
# Optional settings:
|
||||||
|
|
|
@ -8,8 +8,6 @@
|
||||||
# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
|
# See http://unicorn.bogomips.org/Unicorn/Configurator.html for complete
|
||||||
# documentation.
|
# documentation.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Use at least one worker per core if you're on a dedicated server,
|
# Use at least one worker per core if you're on a dedicated server,
|
||||||
# more will usually help for _short_ waits on databases/caches.
|
# more will usually help for _short_ waits on databases/caches.
|
||||||
worker_processes 2
|
worker_processes 2
|
||||||
|
@ -52,7 +50,6 @@ check_client_connection false
|
||||||
# local variable to guard against running a hook multiple times
|
# local variable to guard against running a hook multiple times
|
||||||
run_once = true
|
run_once = true
|
||||||
|
|
||||||
|
|
||||||
before_fork do |server, worker|
|
before_fork do |server, worker|
|
||||||
# the following is highly recomended for Rails + "preload_app true"
|
# the following is highly recomended for Rails + "preload_app true"
|
||||||
# as there's no need for the master process to hold a connection
|
# as there's no need for the master process to hold a connection
|
||||||
|
|
|
@ -30,7 +30,6 @@ class DeviseCreateUsers < ActiveRecord::Migration
|
||||||
# t.string :unlock_token # Only if unlock strategy is :email or :both
|
# t.string :unlock_token # Only if unlock strategy is :email or :both
|
||||||
# t.datetime :locked_at
|
# t.datetime :locked_at
|
||||||
|
|
||||||
|
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,6 @@ class DeviseCreatePros < ActiveRecord::Migration
|
||||||
# t.string :unlock_token # Only if unlock strategy is :email or :both
|
# t.string :unlock_token # Only if unlock strategy is :email or :both
|
||||||
# t.datetime :locked_at
|
# t.datetime :locked_at
|
||||||
|
|
||||||
|
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,6 @@ class DeviseCreateGestionnaires < ActiveRecord::Migration
|
||||||
# t.string :unlock_token # Only if unlock strategy is :email or :both
|
# t.string :unlock_token # Only if unlock strategy is :email or :both
|
||||||
# t.datetime :locked_at
|
# t.datetime :locked_at
|
||||||
|
|
||||||
|
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,6 @@ class CreateUsers < ActiveRecord::Migration
|
||||||
# t.string :unlock_token # Only if unlock strategy is :email or :both
|
# t.string :unlock_token # Only if unlock strategy is :email or :both
|
||||||
# t.datetime :locked_at
|
# t.datetime :locked_at
|
||||||
|
|
||||||
|
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,6 @@ class DeviseCreateAdministrateurs < ActiveRecord::Migration
|
||||||
# t.string :unlock_token # Only if unlock strategy is :email or :both
|
# t.string :unlock_token # Only if unlock strategy is :email or :both
|
||||||
# t.datetime :locked_at
|
# t.datetime :locked_at
|
||||||
|
|
||||||
|
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -30,7 +30,6 @@ class DeviseCreateAdministrations < ActiveRecord::Migration
|
||||||
# t.string :unlock_token # Only if unlock strategy is :email or :both
|
# t.string :unlock_token # Only if unlock strategy is :email or :both
|
||||||
# t.datetime :locked_at
|
# t.datetime :locked_at
|
||||||
|
|
||||||
|
|
||||||
t.timestamps
|
t.timestamps
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -91,7 +91,6 @@ namespace :cloudstorage do
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
desc 'Clear old documents in tenant'
|
desc 'Clear old documents in tenant'
|
||||||
task :clear do
|
task :clear do
|
||||||
Rake::Task['cloudstorage:init'].invoke
|
Rake::Task['cloudstorage:init'].invoke
|
||||||
|
|
|
@ -31,7 +31,6 @@ describe Admin::ProceduresController, type: :controller do
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
before do
|
before do
|
||||||
sign_in admin
|
sign_in admin
|
||||||
end
|
end
|
||||||
|
|
|
@ -181,7 +181,6 @@ describe Backoffice::DossiersController, type: :controller do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
describe 'POST #search' do
|
describe 'POST #search' do
|
||||||
describe 'by id' do
|
describe 'by id' do
|
||||||
context 'when I am logged as a gestionnaire' do
|
context 'when I am logged as a gestionnaire' do
|
||||||
|
@ -284,7 +283,6 @@ describe Backoffice::DossiersController, type: :controller do
|
||||||
end
|
end
|
||||||
subject { post :without_continuation, params: {dossier_id: dossier_id} }
|
subject { post :without_continuation, params: {dossier_id: dossier_id} }
|
||||||
|
|
||||||
|
|
||||||
it 'change state to without_continuation' do
|
it 'change state to without_continuation' do
|
||||||
subject
|
subject
|
||||||
|
|
||||||
|
|
|
@ -136,7 +136,6 @@ describe Users::SessionsController, type: :controller do
|
||||||
expect(user.loged_in_with_france_connect?).to be_falsey
|
expect(user.loged_in_with_france_connect?).to be_falsey
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
context 'when user is connect with france connect particulier' do
|
context 'when user is connect with france connect particulier' do
|
||||||
let(:loged_in_with_france_connect) { 'particulier' }
|
let(:loged_in_with_france_connect) { 'particulier' }
|
||||||
|
|
||||||
|
|
|
@ -4,7 +4,6 @@ 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 }
|
let(:decorator) { champ.decorate }
|
||||||
|
|
||||||
|
|
||||||
describe 'value' do
|
describe 'value' do
|
||||||
subject { decorator.value }
|
subject { decorator.value }
|
||||||
|
|
||||||
|
|
|
@ -51,5 +51,4 @@ describe TypeDeChampDecorator do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -49,6 +49,4 @@ describe TypeDePieceJustificativeDecorator do
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -14,7 +14,6 @@ RSpec.configure do |config|
|
||||||
DatabaseCleaner.strategy = :truncation, { except: expect_list }
|
DatabaseCleaner.strategy = :truncation, { except: expect_list }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
config.before(:each) do
|
config.before(:each) do
|
||||||
DatabaseCleaner.start
|
DatabaseCleaner.start
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue