CLCD-3759 Update reset password copy and move the link (#2832)

* Update reset password copy and move the link

* lint

app/views/devise/sessions/new.html.erb

@@ -12,6 +12,8 @@
         <%= content_for(:title) %>
       </h1>
 
+      <%= render "devise/shared/links" %>
+
       <%= f.govuk_email_field :email,
         label: { text: "Email address" },
         autocomplete: "email",
@@ -25,5 +27,3 @@
     </div>
   </div>
 <% end %>
-
-<%= render "devise/shared/links" %>

app/views/devise/shared/_links.html.erb

@@ -7,7 +7,7 @@
 <% end %>
 
 <%- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations' %>
-  <p class="govuk-body">You can <%= govuk_link_to "reset your password", new_password_path(resource_name) %> if you’ve forgotten it.</p>
+  <p class="govuk-body"><%= govuk_link_to "Forgot password", new_password_path(resource_name) %></p>
 <% end %>
 
 <%- if devise_mapping.confirmable? && controller_name != 'confirmations' %>

spec/features/user_spec.rb

@@ -61,7 +61,7 @@ RSpec.describe "User Features" do
   context "when the user has forgotten their password" do
     it "is redirected to the reset password page when they click the reset password link" do
       visit("/lettings-logs")
-      click_link("reset your password")
+      click_link("Forgot password")
       expect(page).to have_current_path("/account/password/new")
     end
 
@@ -744,7 +744,7 @@ RSpec.describe "User Features" do
 
       it "is redirected to the reset password page when they click the reset password link" do
         visit("/account/sign-in")
-        click_link("reset your password")
+        click_link("Forgot password")
         expect(page).to have_current_path("/account/password/new")
       end