diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 7c30ccda3..9e6491554 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -31,7 +31,7 @@ class UsersController < ApplicationController def resend_invite @user.send_confirmation_instructions - flash[:notice] = "Invitation sent" + flash[:notice] = "Invitation sent to #{@user.email}" render :show end diff --git a/app/views/users/show.html.erb b/app/views/users/show.html.erb index b6550bf3d..845e6ebba 100644 --- a/app/views/users/show.html.erb +++ b/app/views/users/show.html.erb @@ -96,10 +96,10 @@
<% if current_user.can_toggle_active?(@user) %> <% if @user.active? %> + <%= govuk_button_link_to "Deactivate user", deactivate_user_path(@user), warning: true %> <% if current_user.support? %> - <%= govuk_button_to "Resend invite link", resend_invite_user_path(@user) %> + <%= govuk_button_to "Resend invite link", resend_invite_user_path(@user), secondary: true %> <% end %> - <%= govuk_button_link_to "Deactivate user", deactivate_user_path(@user), warning: true %> <% else %> This user has been deactivated. <%= govuk_button_link_to "Reactivate user", reactivate_user_path(@user) %> diff --git a/spec/features/user_spec.rb b/spec/features/user_spec.rb index 50d15dd57..d4e1a6052 100644 --- a/spec/features/user_spec.rb +++ b/spec/features/user_spec.rb @@ -452,7 +452,6 @@ RSpec.describe "User Features" do expect(page).to have_css(".govuk-notification-banner.govuk-notification-banner--success") end end - end context "when signed in as support" do @@ -730,6 +729,5 @@ RSpec.describe "User Features" do end end end - end end