diff --git a/app/views/admin/admin_invitations/index.html.erb b/app/views/admin/admin_invitations/index.html.erb index c62262d3082..22dc1e25542 100644 --- a/app/views/admin/admin_invitations/index.html.erb +++ b/app/views/admin/admin_invitations/index.html.erb @@ -46,7 +46,11 @@
<%= label_tag "invitation[number_of_invites]", t(".grant_invites.number_of_invitations") %>
<%= text_field_tag "invitation[number_of_invites]", nil, autocomplete: "on" %>
<%= label_tag "invitation[user_group]", t(".grant_invites.users") %>
-
<%= select_tag "invitation[user_group]", [t(".grant_invites.all"), t(".grant_invites.with_no_unused")] %>
+
+ <%= select_tag "invitation[user_group]", + options_for_select([t(".grant_invites.all"), t(".grant_invites.with_no_unused")], + t(".grant_invites.all")) %> +
<%= t(".grant_invites.landmark_submit") %>
<%= submit_tag t(".grant_invites.generate_invitations") %>
diff --git a/features/admins/admin_invitations.feature b/features/admins/admin_invitations.feature index 3b54cfe2190..c28c04d6b61 100644 --- a/features/admins/admin_invitations.feature +++ b/features/admins/admin_invitations.feature @@ -349,7 +349,7 @@ Feature: Admin Actions to Manage Invitations Then I should see "There are 2 requests in the queue." When I fill in "Number of people to invite" with "1" And press "Invite from queue" - Then I should see "There are 1 requests in the queue." + Then I should see "There is 1 request in the queue." And I should see "1 person from the invite queue is being invited" And 1 email should be delivered to "fred@bedrock.com" diff --git a/spec/controllers/pseuds_controller_spec.rb b/spec/controllers/pseuds_controller_spec.rb index 5f39b04b0bd..a403afc7e23 100644 --- a/spec/controllers/pseuds_controller_spec.rb +++ b/spec/controllers/pseuds_controller_spec.rb @@ -212,7 +212,7 @@ matching_pseud.reload post :destroy, params: { user_id: user, id: matching_pseud } - it_redirects_to_with_error(user_pseuds_path(user), "You cannot delete the pseud matching your user name, sorry!") + it_redirects_to_with_error(user_pseuds_path(user), "You cannot delete the pseud matching your username, sorry!") end end end