Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Follow-up - 26db9dbc2 - Maintenance: More changes for inclusive language.

Browse source
This commit is contained in:
Martin Gruner 2021-08-20 10:56:23 +02:00
parent 757de71bd8
commit 506c6aef8c
12 changed files with 38 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/assets/javascripts/app/views/layout_ref/twitter_conversation.jst.eco
View file

@ -106,7 +106,7 @@
From From
</div> </div>
<div class="article-meta-value flex contain-text"> <div class="article-meta-value flex contain-text">
Test Master Agent Test Admin Agent
</div> </div>
</div> </div>
</div> </div>
@ -156,7 +156,7 @@
From From
</div> </div>
<div class="article-meta-value flex contain-text"> <div class="article-meta-value flex contain-text">
Test Master Agent Test Admin Agent
</div> </div>
</div> </div>
</div> </div>
@ -206,7 +206,7 @@
From From
</div> </div>
<div class="article-meta-value flex contain-text"> <div class="article-meta-value flex contain-text">
Test Master Agent Test Admin Agent
</div> </div>
</div> </div>
</div> </div>
@ -256,7 +256,7 @@
From From
</div> </div>
<div class="article-meta-value flex contain-text"> <div class="article-meta-value flex contain-text">
Test Master Agent Test Admin Agent
</div> </div>
</div> </div>
</div> </div>
@ -306,7 +306,7 @@
From From
</div> </div>
<div class="article-meta-value flex contain-text"> <div class="article-meta-value flex contain-text">
Test Master Agent Test Admin Agent
</div> </div>
</div> </div>
</div> </div>

2
contrib/auto_wizard_test.json
View file

@ -2,7 +2,7 @@
"Users": [ "Users": [
{ {
"login": "admin@example.com", "login": "admin@example.com",
"firstname": "Test Master", "firstname": "Test Admin",
"lastname": "Agent", "lastname": "Agent",
"email": "admin@example.com", "email": "admin@example.com",
"password": "test" "password": "test"

2
public/assets/tests/html_utils.js
View file

@ -1878,7 +1878,7 @@ test("check form diff", function() {
dataNow = {} dataNow = {}
dataLast = {"number":"10012","title":"some subject 123äöü","group_id":1,"owner_id":1,"customer_id":2,"state_id":3,"priority_id":2,"article":{"from":"Test Master Agent","to":"","cc":"","body":"dasdad","content_type":"text/html","ticket_id":12,"type_id":9,"sender_id":1,"internal":false,"form_id":"523405147"},"updated_at":"2015-01-29T09:22:23.000Z","pending_time":"2015-01-28T22:22:00.000Z","id":12} dataLast = {"number":"10012","title":"some subject 123äöü","group_id":1,"owner_id":1,"customer_id":2,"state_id":3,"priority_id":2,"article":{"from":"Test Admin Agent","to":"","cc":"","body":"dasdad","content_type":"text/html","ticket_id":12,"type_id":9,"sender_id":1,"internal":false,"form_id":"523405147"},"updated_at":"2015-01-29T09:22:23.000Z","pending_time":"2015-01-28T22:22:00.000Z","id":12}
diff = {} diff = {}
result = App.Utils.formDiff(dataNow, dataLast) result = App.Utils.formDiff(dataNow, dataLast)
deepEqual(result, diff, 'check form diff') deepEqual(result, diff, 'check form diff')

6
public/assets/tests/ticket_selector.js
View file

@ -87,10 +87,10 @@ window.onload = function() {
"id": 2 "id": 2
}, },
"article": { "article": {
"from": "Test Master Agent", "from": "Test Admin Agent",
"to": "agent1@example.com", "to": "agent1@example.com",
"cc": "agent1+cc@example.com", "cc": "agent1+cc@example.com",
"body": "asdfasdfasdf<br><br><div data-signature=\"true\" data-signature-id=\"1\"> Test Master Agent<br><br>--<br> Super Support - Waterford Business Park<br> 5201 Blue Lagoon Drive - 8th Floor &amp; 9th Floor - Miami, 33126 USA<br> Email: hot@example.com - Web: http://www.example.com/<br>--</div>", "body": "asdfasdfasdf<br><br><div data-signature=\"true\" data-signature-id=\"1\"> Test Admin Agent<br><br>--<br> Super Support - Waterford Business Park<br> 5201 Blue Lagoon Drive - 8th Floor &amp; 9th Floor - Miami, 33126 USA<br> Email: hot@example.com - Web: http://www.example.com/<br>--</div>",
"content_type": "text/html", "content_type": "text/html",
"ticket_id": "2", "ticket_id": "2",
"type_id": 1, "type_id": 1,
@ -930,7 +930,7 @@ window.onload = function() {
ticket = new App.Ticket(); ticket = new App.Ticket();
ticket.load(ticketData); ticket.load(ticketData);
testContains('article.from', 'Master', ticket); testContains('article.from', 'Admin', ticket);
}); });
test("article to", function() { test("article to", function() {

8
spec/lib/auto_wizard_spec.rb
View file

@ -45,7 +45,7 @@ RSpec.describe AutoWizard do
Users: [ Users: [
{ {
login: 'master_unit_test01@example.com', login: 'master_unit_test01@example.com',
firstname: 'Test Master', firstname: 'Test Admin',
lastname: 'Agent', lastname: 'Agent',
email: 'master_unit_test01@example.com', email: 'master_unit_test01@example.com',
password: 'test', password: 'test',
@ -60,7 +60,7 @@ RSpec.describe AutoWizard do
.to change(User, :count).by(1) .to change(User, :count).by(1)
.and change { User.last.roles }.to(Role.where(name: 'Agent')) .and change { User.last.roles }.to(Role.where(name: 'Agent'))
.and change { User.last.login }.to('master_unit_test01@example.com') .and change { User.last.login }.to('master_unit_test01@example.com')
.and change { User.last.firstname }.to('Test Master') .and change { User.last.firstname }.to('Test Admin')
.and change { User.last.lastname }.to('Agent') .and change { User.last.lastname }.to('Agent')
.and change { User.last.email }.to('master_unit_test01@example.com') .and change { User.last.email }.to('master_unit_test01@example.com')
.and change { Auth.new(User.last.email, 'test').valid? }.from(false) .and change { Auth.new(User.last.email, 'test').valid? }.from(false)
@ -73,7 +73,7 @@ RSpec.describe AutoWizard do
Users: [ Users: [
{ {
login: 'master_unit_test01@example.com', login: 'master_unit_test01@example.com',
firstname: 'Test Master', firstname: 'Test Admin',
lastname: 'Agent', lastname: 'Agent',
email: 'master_unit_test01@example.com', email: 'master_unit_test01@example.com',
password: 'test' password: 'test'
@ -87,7 +87,7 @@ RSpec.describe AutoWizard do
.to change(User, :count).by(1) .to change(User, :count).by(1)
.and change { User.last.roles }.to(Role.where(name: %w[Admin Agent])) .and change { User.last.roles }.to(Role.where(name: %w[Admin Agent]))
.and change { User.last.login }.to('master_unit_test01@example.com') .and change { User.last.login }.to('master_unit_test01@example.com')
.and change { User.last.firstname }.to('Test Master') .and change { User.last.firstname }.to('Test Admin')
.and change { User.last.lastname }.to('Agent') .and change { User.last.lastname }.to('Agent')
.and change { User.last.email }.to('master_unit_test01@example.com') .and change { User.last.email }.to('master_unit_test01@example.com')
.and change { Auth.new(User.last.email, 'test').valid? }.from(false) .and change { Auth.new(User.last.email, 'test').valid? }.from(false)

4
spec/system/setup/system_spec.rb
View file

@ -27,7 +27,7 @@ RSpec.describe 'System setup process', type: :system, set_up: false, authenticat
expect(page).to have_css('.js-admin h2', text: 'Administrator Account') expect(page).to have_css('.js-admin h2', text: 'Administrator Account')
within('.js-admin') do within('.js-admin') do
fill_in 'firstname', with: 'Test Master' fill_in 'firstname', with: 'Test Admin'
fill_in 'lastname', with: 'Agent' fill_in 'lastname', with: 'Agent'
fill_in 'email', with: 'admin@example.com' fill_in 'email', with: 'admin@example.com'
fill_in 'password', with: 'TEst1234äöüß' fill_in 'password', with: 'TEst1234äöüß'
@ -117,7 +117,7 @@ RSpec.describe 'System setup process', type: :system, set_up: false, authenticat
click_on('Setup new System') click_on('Setup new System')
within('.js-admin') do within('.js-admin') do
fill_in 'firstname', with: 'Test Master' fill_in 'firstname', with: 'Test Admin'
fill_in 'lastname', with: 'Agent' fill_in 'lastname', with: 'Agent'
fill_in 'email', with: 'admin@example.com' fill_in 'email', with: 'admin@example.com'
fill_in 'password', with: 'asd' fill_in 'password', with: 'asd'

14
spec/system/ticket/zoom_spec.rb
View file

@ -24,7 +24,7 @@ RSpec.describe 'Ticket zoom', type: :system do
expect(page).to have_css('select[name=owner_id]') expect(page).to have_css('select[name=owner_id]')
expect(page).to have_select('owner_id', expect(page).to have_select('owner_id',
selected: '-', selected: '-',
options: ['-', 'Agent 1 Test', 'Test Master Agent']) options: ['-', 'Agent 1 Test', 'Test Admin Agent'])
end end
end end
end end
@ -46,7 +46,7 @@ RSpec.describe 'Ticket zoom', type: :system do
expect(page).to have_css('.content.active select[name=owner_id]') expect(page).to have_css('.content.active select[name=owner_id]')
expect(page).to have_select('owner_id', expect(page).to have_select('owner_id',
selected: session_user.fullname, selected: session_user.fullname,
options: ['-', 'Agent 1 Test', 'Test Master Agent']) options: ['-', 'Agent 1 Test', 'Test Admin Agent'])
end end
end end
end end
@ -61,7 +61,7 @@ RSpec.describe 'Ticket zoom', type: :system do
expect(page).to have_css('select[name=owner_id]') expect(page).to have_css('select[name=owner_id]')
expect(page).to have_select('owner_id', expect(page).to have_select('owner_id',
selected: '-', selected: '-',
options: ['-', 'Agent 1 Test', 'Test Master Agent']) options: ['-', 'Agent 1 Test', 'Test Admin Agent'])
end end
end end
end end
@ -76,7 +76,7 @@ RSpec.describe 'Ticket zoom', type: :system do
expect(page).to have_css('select[name=owner_id]') expect(page).to have_css('select[name=owner_id]')
expect(page).to have_select('owner_id', expect(page).to have_select('owner_id',
selected: '-', selected: '-',
options: ['-', 'Agent 1 Test', 'Test Master Agent']) options: ['-', 'Agent 1 Test', 'Test Admin Agent'])
end end
end end
end end
@ -91,7 +91,7 @@ RSpec.describe 'Ticket zoom', type: :system do
expect(page).to have_css('select[name=owner_id]') expect(page).to have_css('select[name=owner_id]')
expect(page).to have_select('owner_id', expect(page).to have_select('owner_id',
selected: '-', selected: '-',
options: ['-', 'Agent 1 Test', 'Test Master Agent']) options: ['-', 'Agent 1 Test', 'Test Admin Agent'])
end end
end end
end end
@ -106,7 +106,7 @@ RSpec.describe 'Ticket zoom', type: :system do
expect(page).to have_css('select[name=owner_id]') expect(page).to have_css('select[name=owner_id]')
expect(page).to have_select('owner_id', expect(page).to have_select('owner_id',
selected: '-', selected: '-',
options: ['-', 'Agent 1 Test', 'Test Master Agent']) options: ['-', 'Agent 1 Test', 'Test Admin Agent'])
end end
end end
end end
@ -121,7 +121,7 @@ RSpec.describe 'Ticket zoom', type: :system do
expect(page).to have_css('select[name=owner_id]') expect(page).to have_css('select[name=owner_id]')
expect(page).to have_select('owner_id', expect(page).to have_select('owner_id',
selected: session_user.fullname, selected: session_user.fullname,
options: ['-', 'Agent 1 Test', 'Test Master Agent']) options: ['-', 'Agent 1 Test', 'Test Admin Agent'])
end end
end end
end end

4
test/browser/aaa_getting_started_test.rb
View file

@ -25,7 +25,7 @@ class AaaGettingStartedTest < TestCase
) )
set( set(
css: '.js-admin input[name="firstname"]', css: '.js-admin input[name="firstname"]',
value: 'Test Master', value: 'Test Admin',
) )
set( set(
css: '.js-admin input[name="lastname"]', css: '.js-admin input[name="lastname"]',
@ -37,7 +37,7 @@ class AaaGettingStartedTest < TestCase
) )
set( set(
css: '.js-admin input[name="firstname"]', css: '.js-admin input[name="firstname"]',
value: 'Test Master', value: 'Test Admin',
) )
set( set(
css: '.js-admin input[name="password"]', css: '.js-admin input[name="password"]',

10
test/browser/agent_ticket_create_reset_customer_selection_test.rb
View file

@ -192,7 +192,7 @@ class AgentTicketCreateResetCustomerSelectionTest < TestCase
set( set(
css: '.content.active .modal input[name="customer_id_completion"]', css: '.content.active .modal input[name="customer_id_completion"]',
value: 'master', value: 'admin',
) )
click(css: '.content.active .modal .js-submit') click(css: '.content.active .modal .js-submit')
@ -202,11 +202,11 @@ class AgentTicketCreateResetCustomerSelectionTest < TestCase
set( set(
css: '.content.active .modal input[name="customer_id_completion"]', css: '.content.active .modal input[name="customer_id_completion"]',
value: 'master', value: 'admin',
) )
watch_for( watch_for(
css: '.content.active .modal .js-recipientDropdown .recipientList.is-shown', css: '.content.active .modal .js-recipientDropdown .recipientList.is-shown',
value: 'Master', value: 'Admin',
timeout: 3, timeout: 3,
) )
sendkey(value: :enter) sendkey(value: :enter)
@ -227,11 +227,11 @@ class AgentTicketCreateResetCustomerSelectionTest < TestCase
set( set(
css: '.content.active .modal input[name="customer_id_completion"]', css: '.content.active .modal input[name="customer_id_completion"]',
value: 'master', value: 'admin',
) )
watch_for( watch_for(
css: '.content.active .modal .js-recipientDropdown .recipientList.is-shown', css: '.content.active .modal .js-recipientDropdown .recipientList.is-shown',
value: 'Master', value: 'Admin',
timeout: 3, timeout: 3,
) )
sendkey(value: :enter) sendkey(value: :enter)

4
test/browser/agent_ticket_overview_level0_test.rb
View file

@ -311,7 +311,7 @@ class AgentTicketOverviewLevel0Test < TestCase
select( select(
css: '.content.active .bulkAction [name="owner_id"]', css: '.content.active .bulkAction [name="owner_id"]',
value: 'Test Master Agent', value: 'Test Admin Agent',
) )
click( click(
@ -434,7 +434,7 @@ class AgentTicketOverviewLevel0Test < TestCase
select( select(
css: '.content.active .bulkAction [name="owner_id"]', css: '.content.active .bulkAction [name="owner_id"]',
value: 'Test Master Agent', value: 'Test Admin Agent',
) )
select( select(

8
test/browser/user_access_permissions_test.rb
View file

@ -96,11 +96,11 @@ class AgentProfilePermissionsTest < TestCase
) )
tasks_close_all tasks_close_all
user_open_by_search(value: 'Test Master') user_open_by_search(value: 'Test Admin')
verify_task( verify_task(
data: { data: {
title: 'Test Master Agent', title: 'Test Admin Agent',
} }
) )
@ -131,7 +131,7 @@ class AgentProfilePermissionsTest < TestCase
ticket1 = ticket_create( ticket1 = ticket_create(
data: { data: {
customer: 'master', customer: 'admin',
group: 'Users', group: 'Users',
title: 'test_user_access_permissions - ticket 1', title: 'test_user_access_permissions - ticket 1',
body: 'test_user_access_permissions - ticket 1', body: 'test_user_access_permissions - ticket 1',
@ -336,7 +336,7 @@ class AgentProfilePermissionsTest < TestCase
ticket1 = ticket_create( ticket1 = ticket_create(
data: { data: {
customer: 'master', customer: 'admin',
group: 'Users', group: 'Users',
title: 'test_user_access_permissions - ticket 4', title: 'test_user_access_permissions - ticket 4',
body: 'test_user_access_permissions - ticket 4', body: 'test_user_access_permissions - ticket 4',

4
test/unit/email_build_test.rb
View file

@ -337,8 +337,8 @@ text
quoted_in_one_line = Channel::EmailBuild.recipient_line('Somebody | Some Org', 'some.body@example.com') quoted_in_one_line = Channel::EmailBuild.recipient_line('Somebody | Some Org', 'some.body@example.com')
assert_equal('"Somebody | Some Org" <some.body@example.com>', quoted_in_one_line) assert_equal('"Somebody | Some Org" <some.body@example.com>', quoted_in_one_line)
quoted_in_one_line = Channel::EmailBuild.recipient_line('Test Master Agent via Support', 'some.body@example.com') quoted_in_one_line = Channel::EmailBuild.recipient_line('Test Admin Agent via Support', 'some.body@example.com')
assert_equal('"Test Master Agent via Support" <some.body@example.com>', quoted_in_one_line) assert_equal('"Test Admin Agent via Support" <some.body@example.com>', quoted_in_one_line)
end end