Refactoring: Restore consistency by replacing *_user suffix factories with just customer, admin and agent factory name.

spec/factories/authorization.rb

@@ -1,7 +1,7 @@
 FactoryBot.define do
   factory :authorization do
     transient do
-      user { create(:customer_user) }
+      user { create(:customer) }
     end
 
     factory :twitter_authorization do

spec/factories/recent_view.rb

@@ -11,7 +11,7 @@ FactoryBot.define do
     # assign to an existing user, if possible
     created_by_id do
       User.find { |u| u.role?(user_role.capitalize) }&.id ||
-        create("#{user_role}_user").id
+        create(user_role).id
     end
   end
 end

spec/factories/template.rb

@@ -9,9 +9,9 @@ FactoryBot.define do
       title { 'Title dummy.' }
       body { 'Content dummy.' }
       sender_type { 'email-out' }
-      customer { create(:customer_user) }
+      customer { create(:customer) }
       group { Group.first }
-      owner { create(:agent_user) }
+      owner { create(:agent) }
     end
 
     trait :dummy_data do

spec/factories/user.rb

@@ -21,7 +21,7 @@ FactoryBot.define do
       object.preferences[:intro] = true
     end
 
-    factory :customer_user, aliases: %i[customer] do
+    factory :customer do
       role_ids { Role.signup_role_ids.sort }
 
       trait :with_org do
@@ -29,11 +29,11 @@ FactoryBot.define do
       end
     end
 
-    factory :agent_user, aliases: %i[agent] do
+    factory :agent do
       roles { Role.where(name: 'Agent') }
     end
 
-    factory :admin_user, aliases: %i[admin] do
+    factory :admin do
       roles { Role.where(name: %w[Admin Agent]) }
     end
 

spec/lib/auto_wizard_spec.rb

@@ -107,7 +107,7 @@ RSpec.describe AutoWizard do
         }
       end
 
-      let(:group_agent) { create(:agent_user) }
+      let(:group_agent) { create(:agent) }
       let(:group_signature) { create(:signature) }
       let(:group_email) { create(:email_address) }
 

spec/lib/notification_factory/mailer_spec.rb

@@ -101,7 +101,7 @@ RSpec.describe NotificationFactory::Mailer do
     end
 
     context 'recipient with email address' do
-      let(:user) { create(:agent_user, email: 'somebody@example.com') }
+      let(:user) { create(:agent, email: 'somebody@example.com') }
 
       it 'returns a Mail::Message' do
         expect( result ).to be_kind_of(Mail::Message)
@@ -109,7 +109,7 @@ RSpec.describe NotificationFactory::Mailer do
     end
 
     context 'recipient without email address' do
-      let(:user) { create(:agent_user, email: '') }
+      let(:user) { create(:agent, email: '') }
 
       it 'raises Exceptions::UnprocessableEntity' do
         expect { result }.to raise_error(Exceptions::UnprocessableEntity)

spec/lib/notification_factory/slack_spec.rb

@@ -19,8 +19,8 @@ RSpec.describe NotificationFactory::Slack do
 
     let(:ticket) { article.ticket }
     let(:article) { create(:ticket_article) }
-    let(:agent) { create(:agent_user) }
-    let(:current_user) { create(:agent_user) }
+    let(:agent) { create(:agent) }
+    let(:current_user) { create(:agent) }
 
     context 'for "ticket_create", with an empty "changes" hash' do
       let(:action) { 'ticket_create' }

spec/lib/sequencer/unit/import/ldap/user/attributes/role_ids/unassigned_spec.rb

@@ -35,7 +35,7 @@ RSpec.describe Sequencer::Unit::Import::Ldap::User::Attributes::RoleIds::Unassig
       login:     'jane_doe' }.with_indifferent_access
   end
 
-  let(:instance) { create(:agent_user, mapped) }
+  let(:instance) { create(:agent, mapped) }
 
   context 'when user exists from previous import' do
     context 'and is active' do

spec/lib/sessions/backend/activity_stream_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Sessions::Backend::ActivityStream do
   context 'when async processes affect associated objects / DB records (#2066)' do
     let(:subject)            { described_class.new(user, {}) }
-    let(:user)               { create(:agent_user, groups: [group]) }
+    let(:user)               { create(:agent, groups: [group]) }
     let(:group)              { Group.find_by(name: 'Users') }
     let(:associated_tickets) { create_list(:ticket, ticket_count, group: group) }
     let(:ticket_count)       { 20 }

spec/lib/sessions/backend/base_spec.rb

@@ -3,7 +3,7 @@ require 'rails_helper'
 RSpec.describe Sessions::Backend::Base do
   subject(:backend) { described_class.new(agent, {}, false, client_id, ttl) }
 
-  let(:agent) { create(:agent_user) }
+  let(:agent) { create(:agent) }
   let(:client_id) { '123-1' }
   let(:ttl) { 3 }  # seconds
   let!(:ticket) { Ticket.first || create(:ticket) }