1 files changed, 12 insertions, 19 deletions
diff --git a/spec/services/resource_access_tokens/create_service_spec.rb b/spec/services/resource_access_tokens/create_service_spec.rb
index d81bbc30318..cc1397a7c42 100644
--- a/spec/services/resource_access_tokens/create_service_spec.rb
+++ b/spec/services/resource_access_tokens/create_service_spec.rb
@@ -99,27 +99,20 @@ RSpec.describe ResourceAccessTokens::CreateService, feature_category: :system_ac
         end
       end
 
-      context 'bot email' do
-        it 'check email domain' do
-          response = subject
-          access_token = response.payload[:access_token]
-
-          expect(access_token.user.email).to end_with("@noreply.#{Gitlab.config.gitlab.host}")
-        end
-
-        it 'contains SecureRandom part' do
-          expect(SecureRandom).to receive(:hex).at_least(:once).and_return('randomhex')
-          response = subject
-          access_token = response.payload[:access_token]
-
-          expect(access_token.user.email).to include('_randomhex@noreply')
-        end
+      context 'bot username and email' do
+        include_examples 'username and email pair is generated by Gitlab::Utils::UsernameAndEmailGenerator' do
+          subject do
+            response = described_class.new(user, resource, params).execute
+            response.payload[:access_token].user
+          end
 
-        it 'email is the same as username' do
-          response = subject
-          access_token = response.payload[:access_token]
+          let(:username_prefix) do
+            "#{resource.class.name.downcase}_#{resource.id}_bot"
+          end
 
-          expect(access_token.user.email).to include(access_token.user.username)
+          let(:email_domain) do
+            "noreply.#{Gitlab.config.gitlab.host}"
+          end
         end
       end