From 2dd2b454fb2d4ce5161b1596e89aead9494c5d68 Mon Sep 17 00:00:00 2001 From: Daniel Baark <5101747+baarkerlounger@users.noreply.github.com> Date: Wed, 1 Dec 2021 11:36:57 +0000 Subject: [PATCH 1/4] Update app/controllers/users/sessions_controller.rb Co-authored-by: Paul Robert Lloyd --- app/controllers/users/sessions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb index 9a041d42a..47d5d1022 100644 --- a/app/controllers/users/sessions_controller.rb +++ b/app/controllers/users/sessions_controller.rb @@ -4,7 +4,7 @@ class Users::SessionsController < Devise::SessionsController if params.dig("user", "email").empty? resource.errors.add :email, "Please enter email address" elsif !email_valid?(params.dig("user", "email")) - resource.errors.add :email, "Email addess is not valid" + resource.errors.add :email, "Enter an email address in the correct format, like name@example.com" end if params.dig("user", "password").empty? resource.errors.add :password, "Please enter password" From d4fd78206f2ed92fcd2d1e16fb5a10af505a276f Mon Sep 17 00:00:00 2001 From: Daniel Baark <5101747+baarkerlounger@users.noreply.github.com> Date: Wed, 1 Dec 2021 11:37:03 +0000 Subject: [PATCH 2/4] Update app/controllers/users/sessions_controller.rb Co-authored-by: Paul Robert Lloyd --- app/controllers/users/sessions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb index 47d5d1022..568ead27b 100644 --- a/app/controllers/users/sessions_controller.rb +++ b/app/controllers/users/sessions_controller.rb @@ -2,7 +2,7 @@ class Users::SessionsController < Devise::SessionsController def create self.resource = resource_class.new if params.dig("user", "email").empty? - resource.errors.add :email, "Please enter email address" + resource.errors.add :email, "Enter an email address" elsif !email_valid?(params.dig("user", "email")) resource.errors.add :email, "Enter an email address in the correct format, like name@example.com" end From 34ec5e3129042a6812888ae850ae86993cbbcba6 Mon Sep 17 00:00:00 2001 From: Daniel Baark <5101747+baarkerlounger@users.noreply.github.com> Date: Wed, 1 Dec 2021 11:37:08 +0000 Subject: [PATCH 3/4] Update app/controllers/users/sessions_controller.rb Co-authored-by: Paul Robert Lloyd --- app/controllers/users/sessions_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/users/sessions_controller.rb b/app/controllers/users/sessions_controller.rb index 568ead27b..e3915e25f 100644 --- a/app/controllers/users/sessions_controller.rb +++ b/app/controllers/users/sessions_controller.rb @@ -7,7 +7,7 @@ class Users::SessionsController < Devise::SessionsController resource.errors.add :email, "Enter an email address in the correct format, like name@example.com" end if params.dig("user", "password").empty? - resource.errors.add :password, "Please enter password" + resource.errors.add :password, "Enter a password" end if resource.errors.present? render :new, status: :unprocessable_entity From f13e1af81a27b26077912e52f256849ba9810c98 Mon Sep 17 00:00:00 2001 From: Daniel Baark <5101747+baarkerlounger@users.noreply.github.com> Date: Wed, 1 Dec 2021 11:37:13 +0000 Subject: [PATCH 4/4] Update spec/features/user_spec.rb Co-authored-by: Paul Robert Lloyd --- spec/features/user_spec.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spec/features/user_spec.rb b/spec/features/user_spec.rb index ccc2790f5..cca238c70 100644 --- a/spec/features/user_spec.rb +++ b/spec/features/user_spec.rb @@ -105,7 +105,7 @@ RSpec.describe "User Features" do click_button("Sign in") expect(page).to have_selector("#error-summary-title") expect(page).to have_selector("#user-email-field-error") - expect(page).to have_content(/Email addess is not valid/) + expect(page).to have_content(/Enter an email address in the correct format, like name@example.com/) end end