Merge branch 'dev' into useless-method

This commit is contained in:
Mathieu Magnin 2018-06-21 11:38:19 +02:00 committed by GitHub
commit d0d55c796d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 68 additions and 9 deletions

View file

@ -4,6 +4,7 @@ require:
AllCops: AllCops:
Exclude: Exclude:
- "db/schema.rb" - "db/schema.rb"
- "bin/*"
Bundler/DuplicatedGem: Bundler/DuplicatedGem:
Enabled: true Enabled: true

View file

@ -714,7 +714,7 @@ GEM
activesupport (>= 4.2) activesupport (>= 4.2)
spring-commands-rspec (1.0.4) spring-commands-rspec (1.0.4)
spring (>= 0.9.1) spring (>= 0.9.1)
sprockets (3.7.1) sprockets (3.7.2)
concurrent-ruby (~> 1.0) concurrent-ruby (~> 1.0)
rack (> 1, < 3) rack (> 1, < 3)
sprockets-rails (3.2.1) sprockets-rails (3.2.1)

View file

@ -17,7 +17,11 @@ class Users::RegistrationsController < Devise::RegistrationsController
def create def create
user = User.find_by(email: params[:user][:email]) user = User.find_by(email: params[:user][:email])
if user.present? if user.present?
UserMailer.new_account_warning(user).deliver_later if user.confirmed?
UserMailer.new_account_warning(user).deliver_later
else
user.resend_confirmation_instructions
end
flash.notice = t('devise.registrations.signed_up_but_unconfirmed') flash.notice = t('devise.registrations.signed_up_but_unconfirmed')
redirect_to root_path redirect_to root_path
else else

View file

@ -14,6 +14,7 @@ class GestionnaireDashboard < Administrate::BaseDashboard
updated_at: Field::DateTime, updated_at: Field::DateTime,
current_sign_in_at: Field::DateTime, current_sign_in_at: Field::DateTime,
dossiers: Field::HasMany, dossiers: Field::HasMany,
procedures: Field::HasMany
}.freeze }.freeze
# COLLECTION_ATTRIBUTES # COLLECTION_ATTRIBUTES
@ -29,6 +30,7 @@ class GestionnaireDashboard < Administrate::BaseDashboard
# SHOW_PAGE_ATTRIBUTES # SHOW_PAGE_ATTRIBUTES
# an array of attributes that will be displayed on the model's show page. # an array of attributes that will be displayed on the model's show page.
SHOW_PAGE_ATTRIBUTES = [ SHOW_PAGE_ATTRIBUTES = [
:procedures,
:dossiers, :dossiers,
:id, :id,
:email, :email,

View file

@ -12,6 +12,7 @@ class ProcedureDashboard < Administrate::BaseDashboard
types_de_champ: TypesDeChampCollectionField, types_de_champ: TypesDeChampCollectionField,
path: ProcedureLinkField, path: ProcedureLinkField,
dossiers: Field::HasMany, dossiers: Field::HasMany,
gestionnaires: Field::HasMany,
administrateur: Field::BelongsTo, administrateur: Field::BelongsTo,
id: Field::Number, id: Field::Number,
libelle: Field::String, libelle: Field::String,
@ -64,6 +65,7 @@ class ProcedureDashboard < Administrate::BaseDashboard
:for_individual, :for_individual,
:individual_with_siret, :individual_with_siret,
:auto_archive_on, :auto_archive_on,
:gestionnaires
].freeze ].freeze
# FORM_ATTRIBUTES # FORM_ATTRIBUTES

View file

@ -5,7 +5,7 @@
%td= raison_sociale_or_name(etablissement) %td= raison_sociale_or_name(etablissement)
%tr %tr
%th.libelle SIRET : %th.libelle SIRET :
%td= etablissement.entreprise.siret_siege_social %td= etablissement.siret
%tr %tr
%th.libelle Forme juridique : %th.libelle Forme juridique :
%td= sanitize(etablissement.entreprise.forme_juridique) %td= sanitize(etablissement.entreprise.forme_juridique)

View file

@ -1,4 +1,9 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
begin
load File.expand_path('../spring', __FILE__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
APP_PATH = File.expand_path('../config/application', __dir__) APP_PATH = File.expand_path('../config/application', __dir__)
require_relative '../config/boot' require_relative '../config/boot'
require 'rails/commands' require 'rails/commands'

View file

@ -1,4 +1,9 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
begin
load File.expand_path('../spring', __FILE__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
require_relative '../config/boot' require_relative '../config/boot'
require 'rake' require 'rake'
Rake.application.run Rake.application.run

View file

@ -1,3 +1,8 @@
#!/usr/bin/env ruby #!/usr/bin/env ruby
begin
load File.expand_path('../spring', __FILE__)
rescue LoadError => e
raise unless e.message.include?('spring')
end
ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__) ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../Gemfile', __dir__)
load Gem.bin_path('rspec-core', 'rspec') load Gem.bin_path('rspec-core', 'rspec')

17
bin/spring Executable file
View file

@ -0,0 +1,17 @@
#!/usr/bin/env ruby
# This file loads spring without using Bundler, in order to be fast.
# It gets overwritten when you run the `spring binstub` command.
unless defined?(Spring)
require 'rubygems'
require 'bundler'
lockfile = Bundler::LockfileParser.new(Bundler.default_lockfile.read)
spring = lockfile.specs.detect { |spec| spec.name == "spring" }
if spring
Gem.use_paths Gem.dir, Bundler.bundle_path.to_s, *Gem.path
gem 'spring', spring.version
require 'spring/binstub'
end
end

View file

@ -30,7 +30,7 @@ Rails.application.configure do
# Debug mode disables concatenation and preprocessing of assets. # Debug mode disables concatenation and preprocessing of assets.
# This option may cause significant delays in view rendering with a large # This option may cause significant delays in view rendering with a large
# number of complex assets. # number of complex assets.
config.assets.debug = true config.assets.debug = false
# Asset digests allow you to set far-future HTTP expiration dates on all assets, # Asset digests allow you to set far-future HTTP expiration dates on all assets,
# yet still be able to expire them through the digest params. # yet still be able to expire them through the digest params.

View file

@ -34,16 +34,34 @@ describe Users::RegistrationsController, type: :controller do
end end
context 'when the user already exists' do context 'when the user already exists' do
let!(:existing_user) { create(:user, email: email, password: password) } let!(:existing_user) { create(:user, email: email, password: password, confirmed_at: confirmed_at) }
before do before do
allow(UserMailer).to receive(:new_account_warning).and_return(double(deliver_later: 'deliver')) allow(UserMailer).to receive(:new_account_warning).and_return(double(deliver_later: 'deliver'))
subject
end end
it { expect(response).to redirect_to(root_path) } context 'and the user is confirmed' do
it { expect(flash.notice).to eq(I18n.t('devise.registrations.signed_up_but_unconfirmed')) } let(:confirmed_at) { DateTime.now }
it { expect(UserMailer).to have_received(:new_account_warning) }
before { subject }
it { expect(response).to redirect_to(root_path) }
it { expect(flash.notice).to eq(I18n.t('devise.registrations.signed_up_but_unconfirmed')) }
it { expect(UserMailer).to have_received(:new_account_warning) }
end
context 'and the user is not confirmed' do
let(:confirmed_at) { nil }
before do
expect_any_instance_of(User).to receive(:resend_confirmation_instructions)
subject
end
it { expect(response).to redirect_to(root_path) }
it { expect(flash.notice).to eq(I18n.t('devise.registrations.signed_up_but_unconfirmed')) }
it { expect(UserMailer).not_to have_received(:new_account_warning) }
end
end end
end end
end end