diff --git a/app/views/devise/sessions/new.html.erb b/app/views/devise/sessions/new.html.erb index 5ede96489..940ccf9d1 100644 --- a/app/views/devise/sessions/new.html.erb +++ b/app/views/devise/sessions/new.html.erb @@ -1,25 +1,20 @@ -

Log in

- <%= form_for(resource, as: resource_name, url: session_path(resource_name)) do |f| %> -
- <%= f.label :email %>
- <%= f.email_field :email, autofocus: true, autocomplete: "email" %> -
+
+
+

Sign in to your account to submit CORE data

+ +
+ <%= f.label :email, "Email address", class: "govuk-label" %> + <%= f.email_field :email, autofocus: true, autocomplete: "email", class: "govuk-input" %> +
-
- <%= f.label :password %>
- <%= f.password_field :password, autocomplete: "current-password" %> -
+
+ <%= f.label :password, class: "govuk-label" %> + <%= f.password_field :password, autocomplete: "current-password", class: "govuk-input" %> +
- <% if devise_mapping.rememberable? %> -
- <%= f.check_box :remember_me %> - <%= f.label :remember_me %> + <%= f.submit "Sign in", class: "govuk-button" %>
- <% end %> - -
- <%= f.submit "Log in" %>
<% end %> diff --git a/app/views/devise/shared/_links.html.erb b/app/views/devise/shared/_links.html.erb index 96a941241..f05ceea8c 100644 --- a/app/views/devise/shared/_links.html.erb +++ b/app/views/devise/shared/_links.html.erb @@ -7,7 +7,7 @@ <% end %> <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %> - <%= link_to "Forgot your password?", new_password_path(resource_name) %>
+

You can <%= link_to "reset your password", new_password_path(resource_name) %> if you've forgotten it.


<% end %> <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %> diff --git a/spec/features/user_spec.rb b/spec/features/user_spec.rb index 95bdcd7ac..e8926cf42 100644 --- a/spec/features/user_spec.rb +++ b/spec/features/user_spec.rb @@ -11,15 +11,15 @@ RSpec.describe "User Features" do visit("/case_logs") fill_in("user_email", with: "test@example.com") fill_in("user_password", with: "pAssword1") - click_button("Log in") + click_button("Sign in") expect(page).to have_current_path("/case_logs") end end context "A user who has forgotten their password" do - it " is redirected to the forgotten password page when they click the forgot password link" do + it " is redirected to the reset password page when they click the reset password link" do visit("/case_logs") - click_link("Forgot your password?") + click_link("reset your password") expect(page).to have_current_path("/users/password/new") end end