From 945969ba0ca5658e2bf2159b4bd39a35e3648b3f Mon Sep 17 00:00:00 2001 From: SarvarKhalimov Date: Thu, 6 Jan 2022 16:25:15 +0500 Subject: [PATCH 1/5] Add flash message translation for log out --- app/controllers/spree/user_sessions_controller.rb | 1 + config/locales/en.yml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/app/controllers/spree/user_sessions_controller.rb b/app/controllers/spree/user_sessions_controller.rb index 6de8e67b30..4e756cd2f9 100644 --- a/app/controllers/spree/user_sessions_controller.rb +++ b/app/controllers/spree/user_sessions_controller.rb @@ -45,6 +45,7 @@ module Spree # Logout will clear session data including shopfront_redirect # Here we store it before actually logging out so that the redirect works correctly @shopfront_redirect = session[:shopfront_redirect] + flash.notice = t('devise.sessions.signed_out') super end diff --git a/config/locales/en.yml b/config/locales/en.yml index d1496f8089..4ec4e724da 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -159,6 +159,8 @@ en: already_registered: "This email address is already registered. Please log in to continue, or go back and use another email address." success: logged_in_succesfully: "Logged in successfully" + sessions: + signed_out: "Signed out successfully." user_passwords: spree_user: updated_not_active: "Your password has been reset, but your email has not been confirmed yet." From b8161fb0286b6d16ed31b1b3b8845a2dff91dc27 Mon Sep 17 00:00:00 2001 From: SarvarKhalimov Date: Mon, 10 Jan 2022 21:59:48 +0500 Subject: [PATCH 2/5] Remove duplicated flash notice from app/controllers/spree/user_sessions_controller.rb Remove flash duplicattion in favor of already existing devise default flash notice Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> --- app/controllers/spree/user_sessions_controller.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/app/controllers/spree/user_sessions_controller.rb b/app/controllers/spree/user_sessions_controller.rb index 4e756cd2f9..6de8e67b30 100644 --- a/app/controllers/spree/user_sessions_controller.rb +++ b/app/controllers/spree/user_sessions_controller.rb @@ -45,7 +45,6 @@ module Spree # Logout will clear session data including shopfront_redirect # Here we store it before actually logging out so that the redirect works correctly @shopfront_redirect = session[:shopfront_redirect] - flash.notice = t('devise.sessions.signed_out') super end From 5523b913646cb0310ac5bee1a560f10c96f98673 Mon Sep 17 00:00:00 2001 From: SarvarKhalimov Date: Mon, 10 Jan 2022 22:20:21 +0500 Subject: [PATCH 3/5] Add translation for already_signed_out key in en.yml file Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com> --- config/locales/en.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/locales/en.yml b/config/locales/en.yml index 4ec4e724da..3ff6be122f 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -161,6 +161,7 @@ en: logged_in_succesfully: "Logged in successfully" sessions: signed_out: "Signed out successfully." + already_signed_out: "Signed out successfully." user_passwords: spree_user: updated_not_active: "Your password has been reset, but your email has not been confirmed yet." From 6c559995ab9d5e71dec084346341cac7602e663a Mon Sep 17 00:00:00 2001 From: SarvarKhalimov Date: Mon, 10 Jan 2022 22:50:44 +0500 Subject: [PATCH 4/5] Add test for user log_out user#destroy --- spec/controllers/spree/user_sessions_controller_spec.rb | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/spec/controllers/spree/user_sessions_controller_spec.rb b/spec/controllers/spree/user_sessions_controller_spec.rb index fcbca67cf3..8d85dfd55c 100644 --- a/spec/controllers/spree/user_sessions_controller_spec.rb +++ b/spec/controllers/spree/user_sessions_controller_spec.rb @@ -30,4 +30,13 @@ describe Spree::UserSessionsController, type: :controller do end end end + + describe "destroy" do + it "redirects to root with flash message" do + spree_post :destroy + + expect(response).to redirect_to root_path + expect(flash[:notice]).to eq "Signed out successfully." + end + end end From f09f6208c2318b7b67bd02900d804d08b102621c Mon Sep 17 00:00:00 2001 From: SarvarKhalimov Date: Tue, 11 Jan 2022 00:01:08 +0500 Subject: [PATCH 5/5] Remove trailing whitespace from user_sessions_controller_spec.rb --- spec/controllers/spree/user_sessions_controller_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/controllers/spree/user_sessions_controller_spec.rb b/spec/controllers/spree/user_sessions_controller_spec.rb index 8d85dfd55c..2885f53fc3 100644 --- a/spec/controllers/spree/user_sessions_controller_spec.rb +++ b/spec/controllers/spree/user_sessions_controller_spec.rb @@ -34,7 +34,7 @@ describe Spree::UserSessionsController, type: :controller do describe "destroy" do it "redirects to root with flash message" do spree_post :destroy - + expect(response).to redirect_to root_path expect(flash[:notice]).to eq "Signed out successfully." end