From 58350f219a1f4c69c180cdd0c5aad82996eb0bdd Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Tue, 20 Jun 2017 15:55:17 +0200 Subject: [PATCH 1/2] Rewrite tests that should fail so that they actually do --- spec/controllers/administrateur/sessions_controller_spec.rb | 4 +++- spec/controllers/gestionnaires/sessions_controller_spec.rb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/spec/controllers/administrateur/sessions_controller_spec.rb b/spec/controllers/administrateur/sessions_controller_spec.rb index 5eb92ecf0..e0fe7d5c5 100644 --- a/spec/controllers/administrateur/sessions_controller_spec.rb +++ b/spec/controllers/administrateur/sessions_controller_spec.rb @@ -7,6 +7,7 @@ describe Administrateurs::SessionsController, type: :controller do describe '.demo' do subject { get :demo } + render_views context 'when rails env is production' do before do @@ -20,8 +21,9 @@ describe Administrateurs::SessionsController, type: :controller do it { expect(subject.status).to eq 200 } it 'Administrateur demo is initiated' do - expect(User).to receive(:new).with(email: 'admin@tps.fr', password: 'password').and_return(Administrateur) subject + expect(response.body).to have_css("input#user_email[value='admin@tps.fr']") + expect(response.body).to have_css("input#user_password[value='password']") end end end diff --git a/spec/controllers/gestionnaires/sessions_controller_spec.rb b/spec/controllers/gestionnaires/sessions_controller_spec.rb index 6266e429f..9f8bc37d0 100644 --- a/spec/controllers/gestionnaires/sessions_controller_spec.rb +++ b/spec/controllers/gestionnaires/sessions_controller_spec.rb @@ -7,6 +7,7 @@ describe Gestionnaires::SessionsController, type: :controller do describe '.demo' do subject { get :demo } + render_views context 'when rails env is production' do before do @@ -20,8 +21,9 @@ describe Gestionnaires::SessionsController, type: :controller do it { expect(subject.status).to eq 200 } it 'Gestionnaire demo is initiated' do - expect(User).to receive(:new).with(email: 'gestionnaire@apientreprise.fr', password: 'password').and_return(Gestionnaire) subject + expect(response.body).to have_css("input#user_email[value='gestionnaire@apientreprise.fr']") + expect(response.body).to have_css("input#user_password[value='password']") end end end From e51d8965a2376cebe068167ebdead2498673b411 Mon Sep 17 00:00:00 2001 From: Mathieu Magnin Date: Tue, 20 Jun 2017 14:39:56 +0200 Subject: [PATCH 2/2] [Fix #468] fix demo login --- app/controllers/administrateurs/sessions_controller.rb | 2 ++ app/controllers/gestionnaires/sessions_controller.rb | 2 ++ app/views/users/sessions/new.html.haml | 8 +++++--- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/controllers/administrateurs/sessions_controller.rb b/app/controllers/administrateurs/sessions_controller.rb index be676864f..3c8328e30 100644 --- a/app/controllers/administrateurs/sessions_controller.rb +++ b/app/controllers/administrateurs/sessions_controller.rb @@ -1,4 +1,6 @@ class Administrateurs::SessionsController < Sessions::SessionsController + layout "new_application" + def demo return redirect_to root_path if Rails.env.production? diff --git a/app/controllers/gestionnaires/sessions_controller.rb b/app/controllers/gestionnaires/sessions_controller.rb index c0f7d7b9b..326cf2200 100644 --- a/app/controllers/gestionnaires/sessions_controller.rb +++ b/app/controllers/gestionnaires/sessions_controller.rb @@ -1,4 +1,6 @@ class Gestionnaires::SessionsController < Sessions::SessionsController + layout "new_application" + def demo return redirect_to root_path if Rails.env.production? diff --git a/app/views/users/sessions/new.html.haml b/app/views/users/sessions/new.html.haml index 7f399eeec..93e0aa480 100644 --- a/app/views/users/sessions/new.html.haml +++ b/app/views/users/sessions/new.html.haml @@ -31,8 +31,10 @@ = f.label :password, "Mot de passe" = f.password_field :password, value: @user.password, placeholder: "8 caractères minimum" - .reset-password.text-right - = link_to "Mot de passe oublié ?", new_password_path(resource_name), class: "link" + + - if [:user, :gestionnaire].include?(resource_name) + .reset-password.text-right + = link_to "Mot de passe oublié ?", new_password_path(resource_name), class: "link" - if devise_mapping.rememberable? = f.check_box :remember_me, as: :boolean @@ -50,7 +52,7 @@ .center = link_to "Qu’est-ce que FranceConnect ?", "https://franceconnect.gouv.fr/", target: "_blank", class: "link" - - if devise_mapping.registerable? + - if resource_name == :user %hr %p.register %span