Add latest changes from gitlab-org/gitlab@15-4-stable-eev15.4.0-rc42

1 files changed, 21 insertions, 11 deletions

diff --git a/spec/helpers/users_helper_spec.rb b/spec/helpers/users_helper_spec.rb
index 78a15f52be5..617a796781e 100644
--- a/spec/helpers/users_helper_spec.rb
+++ b/spec/helpers/users_helper_spec.rb
@@ -136,7 +136,7 @@ RSpec.describe UsersHelper do
 
         badges = helper.user_badges_in_admin_section(blocked_user)
 
-        expect(filter_ee_badges(badges)).to match_array([text: "Blocked", variant: "danger"])
+        expect(filter_ee_badges(badges)).to match_array([text: s_("AdminUsers|Blocked"), variant: "danger"])
       end
     end
 
@@ -146,7 +146,7 @@ RSpec.describe UsersHelper do
 
         badges = helper.user_badges_in_admin_section(blocked_pending_approval_user)
 
-        expect(filter_ee_badges(badges)).to match_array([text: 'Pending approval', variant: 'info'])
+        expect(filter_ee_badges(badges)).to match_array([text: s_('AdminUsers|Pending approval'), variant: 'info'])
       end
     end
 
@@ -156,7 +156,7 @@ RSpec.describe UsersHelper do
 
         badges = helper.user_badges_in_admin_section(banned_user)
 
-        expect(filter_ee_badges(badges)).to match_array([text: 'Banned', variant: 'danger'])
+        expect(filter_ee_badges(badges)).to match_array([text: s_('AdminUsers|Banned'), variant: 'danger'])
       end
     end
 
@@ -166,7 +166,17 @@ RSpec.describe UsersHelper do
 
         badges = helper.user_badges_in_admin_section(admin_user)
 
-        expect(filter_ee_badges(badges)).to match_array([text: "Admin", variant: "success"])
+        expect(filter_ee_badges(badges)).to match_array([text: s_("AdminUsers|Admin"), variant: "success"])
+      end
+    end
+
+    context 'with a bot' do
+      it "returns the bot badge" do
+        bot = create(:user, :bot)
+
+        badges = helper.user_badges_in_admin_section(bot)
+
+        expect(filter_ee_badges(badges)).to match_array([text: s_('AdminUsers|Bot'), variant: "muted"])
       end
     end
 
@@ -176,7 +186,7 @@ RSpec.describe UsersHelper do
 
         badges = helper.user_badges_in_admin_section(external_user)
 
-        expect(filter_ee_badges(badges)).to match_array([text: "External", variant: "secondary"])
+        expect(filter_ee_badges(badges)).to match_array([text: s_("AdminUsers|External"), variant: "secondary"])
       end
     end
 
@@ -184,7 +194,7 @@ RSpec.describe UsersHelper do
       it 'returns the "It\'s You" badge' do
         badges = helper.user_badges_in_admin_section(user)
 
-        expect(filter_ee_badges(badges)).to match_array([text: "It's you!", variant: "muted"])
+        expect(filter_ee_badges(badges)).to match_array([text: s_("AdminUsers|It's you!"), variant: "muted"])
       end
     end
 
@@ -195,9 +205,9 @@ RSpec.describe UsersHelper do
         badges = helper.user_badges_in_admin_section(user)
 
         expect(badges).to match_array([
-          { text: "Blocked", variant: "danger" },
-          { text: "Admin", variant: "success" },
-          { text: "External", variant: "secondary" }
+          { text: s_("AdminUsers|Blocked"), variant: "danger" },
+          { text: s_("AdminUsers|Admin"), variant: "success" },
+          { text: s_("AdminUsers|External"), variant: "secondary" }
         ])
       end
     end
@@ -208,7 +218,7 @@ RSpec.describe UsersHelper do
 
         badges = helper.user_badges_in_admin_section(locked_user)
 
-        expect(filter_ee_badges(badges)).to match_array([text: "Locked", variant: "warning"])
+        expect(filter_ee_badges(badges)).to match_array([text: s_("AdminUsers|Locked"), variant: "warning"])
       end
     end
 
@@ -435,7 +445,7 @@ RSpec.describe UsersHelper do
 
       it 'contains resend confirmation e-mail text' do
         expect(user_email_help_text).to include _('Resend confirmation e-mail')
-        expect(user_email_help_text).to include _('Please click the link in the confirmation email before continuing. It was sent to ')
+        expect(user_email_help_text).to match /Please click the link in the confirmation email before continuing. It was sent to.*#{user.unconfirmed_email}/
       end
     end
   end