6e46be36c8
# Pull Request Template ## Description Unconfirmed agents (pending email verification) were incorrectly appearing in the "assign agent" dropdown for macros and automations. This fix filters out unconfirmed agents from these dropdowns and adds backend validation to prevent assignment of unconfirmed agents. Fixes #13223 ## Type of change - [x] Bug fix (non-breaking change which fixes an issue) ## How Has This Been Tested? **Backend tests:** ```bash docker compose run --rm rails bundle exec rspec spec/services/action_service_spec.rb ``` - Added tests for confirmed agent assignment (should succeed) - Added tests for unconfirmed agent assignment (should be skipped) **Frontend tests:** ```bash docker compose run --rm rails pnpm test app/javascript/dashboard/composables/spec/useMacros.spec.js ``` - Updated mocks to use `getVerifiedAgents` getter **Manual testing:** 1. Create an unconfirmed agent via platform 2. Navigate to Settings → Macros → New Macro → Add "Assign Agent" action 3. Verify unconfirmed agent does NOT appear in dropdown 4. Navigate to Settings → Automations → New Automation → Add "Assign Agent" action 5. Verify unconfirmed agent does NOT appear in dropdown ## Checklist: - [x] My code follows the style guidelines of this project - [x] I have performed a self-review of my code - [ ] I have commented on my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [x] My changes generate no new warnings - [x] I have added tests that prove my fix is effective or that my feature works - [x] New and existing unit tests pass locally with my changes - [ ] Any dependent changes have been merged and published in downstream modules --------- Co-authored-by: Sojan Jose <sojan@pepalo.com>
116 lines
4.0 KiB
Ruby
116 lines
4.0 KiB
Ruby
require 'rails_helper'
|
|
|
|
describe ActionService do
|
|
let(:account) { create(:account) }
|
|
|
|
describe '#resolve_conversation' do
|
|
let(:conversation) { create(:conversation) }
|
|
let(:action_service) { described_class.new(conversation) }
|
|
|
|
it 'resolves the conversation' do
|
|
expect(conversation.status).to eq('open')
|
|
action_service.resolve_conversation(nil)
|
|
expect(conversation.reload.status).to eq('resolved')
|
|
end
|
|
end
|
|
|
|
describe '#open_conversation' do
|
|
let(:conversation) { create(:conversation, status: :resolved) }
|
|
let(:action_service) { described_class.new(conversation) }
|
|
|
|
it 'opens the conversation' do
|
|
expect(conversation.status).to eq('resolved')
|
|
action_service.open_conversation(nil)
|
|
expect(conversation.reload.status).to eq('open')
|
|
end
|
|
end
|
|
|
|
describe '#change_priority' do
|
|
let(:conversation) { create(:conversation) }
|
|
let(:action_service) { described_class.new(conversation) }
|
|
|
|
it 'changes the priority of the conversation to medium' do
|
|
action_service.change_priority(['medium'])
|
|
expect(conversation.reload.priority).to eq('medium')
|
|
end
|
|
|
|
it 'changes the priority of the conversation to nil' do
|
|
action_service.change_priority(['nil'])
|
|
expect(conversation.reload.priority).to be_nil
|
|
end
|
|
end
|
|
|
|
describe '#assign_agent' do
|
|
let(:agent) { create(:user, account: account, role: :agent) }
|
|
let(:inbox_member) { create(:inbox_member, inbox: conversation.inbox, user: agent) }
|
|
let(:conversation) { create(:conversation, :with_assignee, account: account) }
|
|
let(:action_service) { described_class.new(conversation) }
|
|
|
|
it 'unassigns the conversation if agent id is nil' do
|
|
action_service.assign_agent(['nil'])
|
|
expect(conversation.reload.assignee).to be_nil
|
|
end
|
|
|
|
context 'when agent is confirmed' do
|
|
it 'assigns the agent to the conversation' do
|
|
inbox_member
|
|
action_service.assign_agent([agent.id])
|
|
expect(conversation.reload.assignee).to eq(agent)
|
|
end
|
|
end
|
|
|
|
context 'when agent is unconfirmed' do
|
|
let(:unconfirmed_agent) { create(:user, account: account, role: :agent, skip_confirmation: false) }
|
|
let(:unconfirmed_inbox_member) { create(:inbox_member, inbox: conversation.inbox, user: unconfirmed_agent) }
|
|
|
|
it 'does not assign unconfirmed agent to the conversation' do
|
|
unconfirmed_inbox_member
|
|
original_assignee = conversation.assignee
|
|
action_service.assign_agent([unconfirmed_agent.id])
|
|
expect(conversation.reload.assignee).to eq(original_assignee)
|
|
end
|
|
end
|
|
end
|
|
|
|
describe '#assign_team' do
|
|
let(:agent) { create(:user, account: account, role: :agent) }
|
|
let(:inbox_member) { create(:inbox_member, inbox: conversation.inbox, user: agent) }
|
|
let(:team) { create(:team, name: 'ConversationTeam', account: account) }
|
|
let(:conversation) { create(:conversation, :with_team, account: account) }
|
|
let(:action_service) { described_class.new(conversation) }
|
|
|
|
context 'when team_id is not present' do
|
|
it 'unassign the if team_id is "nil"' do
|
|
expect do
|
|
action_service.assign_team(['nil'])
|
|
end.not_to raise_error
|
|
expect(conversation.reload.team).to be_nil
|
|
end
|
|
|
|
it 'unassign the if team_id is 0' do
|
|
expect do
|
|
action_service.assign_team([0])
|
|
end.not_to raise_error
|
|
expect(conversation.reload.team).to be_nil
|
|
end
|
|
end
|
|
|
|
context 'when team_id is present' do
|
|
it 'assign the team if the team is part of the account' do
|
|
original_team = conversation.team
|
|
expect do
|
|
action_service.assign_team([team.id])
|
|
end.to change { conversation.reload.team }.from(original_team)
|
|
end
|
|
|
|
it 'does not assign the team if the team is part of the account' do
|
|
original_team = conversation.team
|
|
invalid_team_id = 999_999_999
|
|
expect do
|
|
action_service.assign_team([invalid_team_id])
|
|
end.not_to change { conversation.reload.team }.from(original_team)
|
|
end
|
|
end
|
|
end
|
|
end
|