diff --git a/.gitlab/ci/browser-core/api_client_php.yml b/.gitlab/ci/browser-core/api_client_php.yml index a4ce45976..7ded57e08 100644 --- a/.gitlab/ci/browser-core/api_client_php.yml +++ b/.gitlab/ci/browser-core/api_client_php.yml @@ -3,7 +3,7 @@ api_client_php: - .template_browser-core_api_client variables: ZAMMAD_PHP_API_CLIENT_UNIT_TESTS_URL: "http://localhost:3000" - ZAMMAD_PHP_API_CLIENT_UNIT_TESTS_USERNAME: "master@example.com" + ZAMMAD_PHP_API_CLIENT_UNIT_TESTS_USERNAME: "admin@example.com" ZAMMAD_PHP_API_CLIENT_UNIT_TESTS_PASSWORD: "test" script: - RAILS_ENV=test bundle exec rake db:create diff --git a/.gitlab/ci/browser-core/api_client_ruby.yml b/.gitlab/ci/browser-core/api_client_ruby.yml index caf7c4499..690de98e4 100644 --- a/.gitlab/ci/browser-core/api_client_ruby.yml +++ b/.gitlab/ci/browser-core/api_client_ruby.yml @@ -5,9 +5,8 @@ api_client_ruby: - RAILS_ENV=test bundle exec rake db:create - cp contrib/auto_wizard_test.json auto_wizard.json - bundle exec rake zammad:ci:test:start - - git clone https://github.com/zammad/zammad-api-client-ruby.git + - git clone https://github.com/zammad/zammad-api-client-ruby.git -b mg/maintenance/inclusive-language - cd zammad-api-client-ruby - bundle update --bundler - bundle install -j $(nproc) - bundle exec rspec - diff --git a/app/assets/javascripts/app/controllers/getting_started.coffee b/app/assets/javascripts/app/controllers/getting_started.coffee index 4c0142079..f39f22835 100644 --- a/app/assets/javascripts/app/controllers/getting_started.coffee +++ b/app/assets/javascripts/app/controllers/getting_started.coffee @@ -9,7 +9,7 @@ class GettingStarted extends App.ControllerWizardFullScreen # set title @title 'Get Started' - # redirect to login if master user already exists + # redirect to login if admin user already exists if @Config.get('system_init_done') @navigate '#login' return diff --git a/app/assets/javascripts/app/controllers/getting_started/admin.coffee b/app/assets/javascripts/app/controllers/getting_started/admin.coffee index 2dfc7ed60..37402ff10 100644 --- a/app/assets/javascripts/app/controllers/getting_started/admin.coffee +++ b/app/assets/javascripts/app/controllers/getting_started/admin.coffee @@ -12,7 +12,7 @@ class GettingStartedAdmin extends App.ControllerWizardFullScreen # set title @title 'Create Admin' - # redirect to login if master user already exists + # redirect to login if admin user already exists if @Config.get('system_init_done') @navigate '#login' return diff --git a/app/assets/javascripts/app/controllers/getting_started/auto_wizard.coffee b/app/assets/javascripts/app/controllers/getting_started/auto_wizard.coffee index 12c79f317..1aa4615ca 100644 --- a/app/assets/javascripts/app/controllers/getting_started/auto_wizard.coffee +++ b/app/assets/javascripts/app/controllers/getting_started/auto_wizard.coffee @@ -7,7 +7,7 @@ class GettingStartedAutoWizard extends App.ControllerWizardFullScreen @navigate '#' return - # redirect to login if master user already exists + # redirect to login if admin user already exists if @Config.get('system_init_done') @navigate '#login' return @@ -48,7 +48,7 @@ class GettingStartedAutoWizard extends App.ControllerWizardFullScreen @renderToken() return - # redirect to login if master user already exists + # redirect to login if admin user already exists @redirectToLogin() ) diff --git a/app/assets/javascripts/app/controllers/import.coffee b/app/assets/javascripts/app/controllers/import.coffee index 32dec67d1..b9d5e201b 100644 --- a/app/assets/javascripts/app/controllers/import.coffee +++ b/app/assets/javascripts/app/controllers/import.coffee @@ -14,7 +14,7 @@ class Import extends App.ControllerWizardFullScreen processData: true, success: (data, status, xhr) => - # redirect to login if master user already exists + # redirect to login if admin user already exists if @Config.get('system_init_done') @navigate '#login' return diff --git a/app/assets/javascripts/app/controllers/import_freshdesk.coffee b/app/assets/javascripts/app/controllers/import_freshdesk.coffee index 10b565b33..42b16e066 100644 --- a/app/assets/javascripts/app/controllers/import_freshdesk.coffee +++ b/app/assets/javascripts/app/controllers/import_freshdesk.coffee @@ -27,7 +27,7 @@ class ImportFreshdesk extends App.ControllerWizardFullScreen @freshdeskDomain = '.freshdesk.com' - # redirect to login if master user already exists + # redirect to login if admin user already exists if @Config.get('system_init_done') @navigate '#login' return diff --git a/app/assets/javascripts/app/controllers/import_otrs.coffee b/app/assets/javascripts/app/controllers/import_otrs.coffee index e60dce3f6..b0970db90 100644 --- a/app/assets/javascripts/app/controllers/import_otrs.coffee +++ b/app/assets/javascripts/app/controllers/import_otrs.coffee @@ -19,7 +19,7 @@ class ImportOtrs extends App.ControllerWizardFullScreen # set title @title 'Import' - # redirect to login if master user already exists + # redirect to login if admin user already exists if @Config.get('system_init_done') @navigate '#login' return diff --git a/app/assets/javascripts/app/controllers/import_zendesk.coffee b/app/assets/javascripts/app/controllers/import_zendesk.coffee index 5bbfe83ab..a9ac9932b 100644 --- a/app/assets/javascripts/app/controllers/import_zendesk.coffee +++ b/app/assets/javascripts/app/controllers/import_zendesk.coffee @@ -25,7 +25,7 @@ class ImportZendesk extends App.ControllerWizardFullScreen # set title @title 'Import' - # redirect to login if master user already exists + # redirect to login if admin user already exists if @Config.get('system_init_done') @navigate '#login' return diff --git a/app/controllers/getting_started_controller.rb b/app/controllers/getting_started_controller.rb index e0a870ad2..8512c7939 100644 --- a/app/controllers/getting_started_controller.rb +++ b/app/controllers/getting_started_controller.rb @@ -36,7 +36,7 @@ curl http://localhost/api/v1/getting_started -v -u #{login}:#{password} # check it auto wizard is already done return if auto_wizard_enabled_response - # if master user already exists, we need to be authenticated + # if admin user already exists, we need to be authenticated return if setup_done && !authentication_check # return result diff --git a/contrib/auto_wizard_test.json b/contrib/auto_wizard_test.json index e69b59135..cc711b95f 100644 --- a/contrib/auto_wizard_test.json +++ b/contrib/auto_wizard_test.json @@ -1,10 +1,10 @@ { "Users": [ { - "login": "master@example.com", + "login": "admin@example.com", "firstname": "Test Master", "lastname": "Agent", - "email": "master@example.com", + "email": "admin@example.com", "password": "test" }, { @@ -19,11 +19,11 @@ "Groups": [ { "name": "some group1", - "users": ["master@example.com","agent1@example.com"] + "users": ["admin@example.com","agent1@example.com"] }, { "name": "Users", - "users": ["master@example.com","agent1@example.com"], + "users": ["admin@example.com","agent1@example.com"], "signature": "default", "email_address_id": 1 } diff --git a/db/migrate/20210816125040_rename_notification_sender.rb b/db/migrate/20210816125040_rename_notification_sender.rb new file mode 100644 index 000000000..7a094809e --- /dev/null +++ b/db/migrate/20210816125040_rename_notification_sender.rb @@ -0,0 +1,22 @@ +# Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/ + +class RenameNotificationSender < ActiveRecord::Migration[6.0] + def change + # return if it's a new setup + return if !Setting.exists?(name: 'system_init_done') + + setting = Setting.find_by( + name: 'notification_sender', + ) + return if !setting + + # rubocop:disable Lint/InterpolationCheck + setting.state_initial[:value] = '#{config.product_name} ' + + if setting.state_current[:value].eql? 'Notification Master ' + setting.state_current[:value] = '#{config.product_name} ' + end + # rubocop:enable Lint/InterpolationCheck + setting.save! + end +end diff --git a/db/seeds/settings.rb b/db/seeds/settings.rb index 92b84915a..26861690c 100644 --- a/db/seeds/settings.rb +++ b/db/seeds/settings.rb @@ -2744,7 +2744,7 @@ Setting.create_if_not_exists( }, ], }, - state: 'Notification Master ', # rubocop:disable Lint/InterpolationCheck + state: '#{config.product_name} ', # rubocop:disable Lint/InterpolationCheck preferences: { online_service_disable: true, permission: ['admin.channel_email'], diff --git a/lib/auth.rb b/lib/auth.rb index 7038e290f..85dae3296 100644 --- a/lib/auth.rb +++ b/lib/auth.rb @@ -13,7 +13,7 @@ class Auth # @param username [String] the user name for the user object which needs an authentication. # # @example - # auth = Auth.new('master@example.com', 'some+password') + # auth = Auth.new('admin@example.com', 'some+password') def initialize(username, password) @lookup_backend_instance = {} diff --git a/lib/auth/backend/base.rb b/lib/auth/backend/base.rb index 532bda2cf..ff3c584c1 100644 --- a/lib/auth/backend/base.rb +++ b/lib/auth/backend/base.rb @@ -14,7 +14,7 @@ class Auth # @param auth [Auth] the Auth object for the authentication. # # @example - # auth = Auth::Backend::Internal.new('master@example.com', auth) + # auth = Auth::Backend::Internal.new('admin@example.com', auth) def initialize(config, auth) @config = config @auth = auth diff --git a/public/assets/tests/core.js b/public/assets/tests/core.js index deef904ab..765594dfe 100644 --- a/public/assets/tests/core.js +++ b/public/assets/tests/core.js @@ -607,7 +607,7 @@ test('auth - existing user', function(assert) { new Promise( (resolve, reject) => { App.Auth.login({ data: { - username: 'master@example.com', + username: 'admin@example.com', password: 'test', }, success: resolve, @@ -616,7 +616,7 @@ test('auth - existing user', function(assert) { }).then( function(data) { ok(true, 'authenticated') var user = App.Session.get('login') - equal('master@example.com', user, 'session login') + equal('admin@example.com', user, 'session login') }, function() { ok(false, 'failed') }) diff --git a/public/assets/tests/form_autocompletion_ajax.js b/public/assets/tests/form_autocompletion_ajax.js index d7738e6ad..36cff5209 100644 --- a/public/assets/tests/form_autocompletion_ajax.js +++ b/public/assets/tests/form_autocompletion_ajax.js @@ -48,7 +48,7 @@ test( "autocompletion_ajax check", function(assert) { new Promise( (resolve, reject) => { App.Auth.login({ data: { - username: 'master@example.com', + username: 'admin@example.com', password: 'test', }, success: resolve, @@ -59,7 +59,7 @@ test( "autocompletion_ajax check", function(assert) { return new Promise( (resolve, reject) => { notEqual(App.Session.get(), undefined, 'User is logged in so the api requests will work') - check_ajax_field('autocompletion_ajax1', 'master@example.com', 1, resolve) + check_ajax_field('autocompletion_ajax1', 'admin@example.com', 1, resolve) }) }) .then( function() { diff --git a/spec/db/migrate/rename_notification_sender_spec.rb b/spec/db/migrate/rename_notification_sender_spec.rb new file mode 100644 index 000000000..c5a7882ae --- /dev/null +++ b/spec/db/migrate/rename_notification_sender_spec.rb @@ -0,0 +1,65 @@ +# Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/ + +require 'rails_helper' + +RSpec.describe RenameNotificationSender, type: :db_migration do + before do + Setting.find_by(name: 'notification_sender')&.destroy + + # Default value of Zammad 4.1 + Setting.create( + title: 'Notification Sender', + name: 'notification_sender', + area: 'Email::Base', + description: 'Defines the sender of email notifications.', + options: { + form: [ + { + display: '', + null: false, + name: 'notification_sender', + tag: 'input', + }, + ], + }, + state: 'Notification Master ', # rubocop:disable Lint/InterpolationCheck + preferences: { + online_service_disable: true, + permission: ['admin.channel_email'], + }, + frontend: false + ) + end + + context 'when migrating unchanged default setting' do + it 'sets new value' do + expect { migrate } + .to change { Setting.find_by(name: 'notification_sender').state_current } + .to({ 'value' => '#{config.product_name} ' }) # rubocop:disable Lint/InterpolationCheck + end + + it 'sets #state_initial' do + expect { migrate } + .to change { Setting.find_by(name: 'notification_sender').state_initial } + .to({ 'value' => '#{config.product_name} ' }) # rubocop:disable Lint/InterpolationCheck + end + end + + context 'when migrating locally changed setting' do + before do + Setting.set('notification_sender', 'My Custom Sender ') + end + + it 'does not change the current value' do + expect { migrate } + .not_to change { Setting.find_by(name: 'notification_sender').state_current } + end + + it 'sets #state_initial' do + expect { migrate } + .to change { Setting.find_by(name: 'notification_sender').state_initial } + .to({ 'value' => '#{config.product_name} ' }) # rubocop:disable Lint/InterpolationCheck + end + end + +end diff --git a/spec/support/authenticated_as.rb b/spec/support/authenticated_as.rb index 9a4032727..160ea55f7 100644 --- a/spec/support/authenticated_as.rb +++ b/spec/support/authenticated_as.rb @@ -42,7 +42,7 @@ module ZammadAuthenticatedAsHelper parse_meta_user(input) when true { - username: 'master@example.com', + username: 'admin@example.com', password: 'test', } end diff --git a/spec/support/capybara/authenticated.rb b/spec/support/capybara/authenticated.rb index 50046f9d5..020ffabe2 100644 --- a/spec/support/capybara/authenticated.rb +++ b/spec/support/capybara/authenticated.rb @@ -1,7 +1,7 @@ # Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/ # This file registers a hook before each system test -# which logs in with/authenticates the master@example.com account. +# which logs in with/authenticates the admin@example.com account. # we need to make sure that Capybara is configured/started before # this hook. Otherwise a login try is performed while the app/puma diff --git a/spec/support/capybara/common_actions.rb b/spec/support/capybara/common_actions.rb index e64dfdde9..70961703e 100644 --- a/spec/support/capybara/common_actions.rb +++ b/spec/support/capybara/common_actions.rb @@ -9,13 +9,13 @@ module CommonActions # # @example # login( - # username: 'master@example.com', + # username: 'admin@example.com', # password: 'test', # ) # # @example # login( - # username: 'master@example.com', + # username: 'admin@example.com', # password: 'test', # remember_me: true, # ) @@ -59,7 +59,7 @@ module CommonActions # # @example # current_login - # => 'master@example.com' + # => 'admin@example.com' # # @return [String] the login of the currently logged in user. def current_login @@ -70,7 +70,7 @@ module CommonActions # # @example # current_user.login - # => 'master@example.com' + # => 'admin@example.com' # # @example # current_user do |user| diff --git a/spec/support/capybara/set_up.rb b/spec/support/capybara/set_up.rb index 9a9492330..1df90398f 100644 --- a/spec/support/capybara/set_up.rb +++ b/spec/support/capybara/set_up.rb @@ -9,7 +9,7 @@ RSpec.configure do |config| Rake::Task['zammad:setup:auto_wizard'].execute if !Setting.get('system_init_done') # skip intro/clues for created agents/admins - %w[master@example.com agent1@example.com].each do |login| + %w[admin@example.com agent1@example.com].each do |login| user = User.find_by(login: login) user.preferences[:intro] = true user.save! diff --git a/spec/system/basic/authentication_spec.rb b/spec/system/basic/authentication_spec.rb index b141372a3..84cd94839 100644 --- a/spec/system/basic/authentication_spec.rb +++ b/spec/system/basic/authentication_spec.rb @@ -6,7 +6,7 @@ RSpec.describe 'Authentication', type: :system do it 'Login', authenticated_as: false do login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', ) @@ -34,7 +34,7 @@ RSpec.describe 'Authentication', type: :system do expect_current_route 'login', wait: 10 login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', ) @@ -50,7 +50,7 @@ RSpec.describe 'Authentication', type: :system do visit 'https://www.zammad.org' # simulate successful login via third party - user = User.find_by(login: 'master@example.com') + user = User.find_by(login: 'admin@example.com') ActiveRecord::SessionStore::Session.all.each do |session| session.data[:user_id] = user.id session.save! @@ -61,7 +61,7 @@ RSpec.describe 'Authentication', type: :system do expect_current_route 'ticket/zoom/1', wait: 10 - expect(current_login).to eq('master@example.com') + expect(current_login).to eq('admin@example.com') end end diff --git a/spec/system/getting_started/agents_spec.rb b/spec/system/getting_started/agents_spec.rb index 2075129bd..484062b8b 100644 --- a/spec/system/getting_started/agents_spec.rb +++ b/spec/system/getting_started/agents_spec.rb @@ -8,13 +8,13 @@ RSpec.describe 'Getting Started > Agents', type: :system do fill_in 'firstname', with: 'Test' fill_in 'lastname', with: 'Test' - fill_in 'email', with: 'master@example.com' + fill_in 'email', with: 'admin@example.com' click '.btn--success' within '.js-danger' do expect(page) - .to have_text("Email address 'master@example.com' is already used for other user.") + .to have_text("Email address 'admin@example.com' is already used for other user.") end end end diff --git a/spec/system/profile/devices_spec.rb b/spec/system/profile/devices_spec.rb index 7edf14f32..57821e256 100644 --- a/spec/system/profile/devices_spec.rb +++ b/spec/system/profile/devices_spec.rb @@ -3,7 +3,7 @@ require 'rails_helper' RSpec.describe 'Profile > Devices', type: :system do - subject!(:device) { create(:user_device, user_id: User.find_by(login: 'master@example.com').id) } + subject!(:device) { create(:user_device, user_id: User.find_by(login: 'admin@example.com').id) } it 'allows to remove device' do visit 'profile/devices' diff --git a/spec/system/setup/auto_wizard_spec.rb b/spec/system/setup/auto_wizard_spec.rb index 56d21f61f..da9efeb71 100644 --- a/spec/system/setup/auto_wizard_spec.rb +++ b/spec/system/setup/auto_wizard_spec.rb @@ -14,6 +14,6 @@ RSpec.describe 'Auto wizard', type: :system, set_up: false do visit 'getting_started/auto_wizard' - expect(current_login).to eq('master@example.com') + expect(current_login).to eq('admin@example.com') end end diff --git a/spec/system/setup/system_spec.rb b/spec/system/setup/system_spec.rb index b1d1c5bfd..2c14514a3 100644 --- a/spec/system/setup/system_spec.rb +++ b/spec/system/setup/system_spec.rb @@ -29,7 +29,7 @@ RSpec.describe 'System setup process', type: :system, set_up: false, authenticat within('.js-admin') do fill_in 'firstname', with: 'Test Master' fill_in 'lastname', with: 'Agent' - fill_in 'email', with: 'master@example.com' + fill_in 'email', with: 'admin@example.com' fill_in 'password', with: 'TEst1234äöüß' fill_in 'password_confirm', with: 'TEst1234äöüß' @@ -119,7 +119,7 @@ RSpec.describe 'System setup process', type: :system, set_up: false, authenticat within('.js-admin') do fill_in 'firstname', with: 'Test Master' fill_in 'lastname', with: 'Agent' - fill_in 'email', with: 'master@example.com' + fill_in 'email', with: 'admin@example.com' fill_in 'password', with: 'asd' fill_in 'password_confirm', with: 'asd' diff --git a/spec/system/ticket/history_spec.rb b/spec/system/ticket/history_spec.rb index b650e3ef0..b57ac4122 100644 --- a/spec/system/ticket/history_spec.rb +++ b/spec/system/ticket/history_spec.rb @@ -5,7 +5,7 @@ require 'rails_helper' RSpec.describe 'Ticket history', type: :system, time_zone: 'Europe/London' do let(:group) { Group.find_by(name: 'Users') } let(:ticket) { create(:ticket, group: group) } - let!(:session_user) { User.find_by(login: 'master@example.com') } + let!(:session_user) { User.find_by(login: 'admin@example.com') } before do freeze_time diff --git a/spec/system/ticket/zoom_spec.rb b/spec/system/ticket/zoom_spec.rb index 78e89034f..b8a649843 100644 --- a/spec/system/ticket/zoom_spec.rb +++ b/spec/system/ticket/zoom_spec.rb @@ -6,7 +6,7 @@ RSpec.describe 'Ticket zoom', type: :system do describe 'owner auto-assignment', authenticated_as: :authenticate do let!(:ticket) { create(:ticket, group: Group.find_by(name: 'Users'), state: Ticket::State.find_by(name: 'new')) } - let!(:session_user) { User.find_by(login: 'master@example.com') } + let!(:session_user) { User.find_by(login: 'admin@example.com') } context 'for agent disabled' do def authenticate diff --git a/spec/system/user/history_spec.rb b/spec/system/user/history_spec.rb index 90e6386eb..abb378f64 100644 --- a/spec/system/user/history_spec.rb +++ b/spec/system/user/history_spec.rb @@ -5,7 +5,7 @@ require 'rails_helper' RSpec.describe 'Ticket history', type: :system, time_zone: 'Europe/London' do let(:group) { Group.find_by(name: 'Users') } let(:customer) { create(:customer) } - let!(:session_user) { User.find_by(login: 'master@example.com') } + let!(:session_user) { User.find_by(login: 'admin@example.com') } before do freeze_time diff --git a/test/browser/aaa_getting_started_test.rb b/test/browser/aaa_getting_started_test.rb index 23b7c6ac5..dbe17d842 100644 --- a/test/browser/aaa_getting_started_test.rb +++ b/test/browser/aaa_getting_started_test.rb @@ -33,7 +33,7 @@ class AaaGettingStartedTest < TestCase ) set( css: '.js-admin input[name="email"]', - value: 'master@example.com', + value: 'admin@example.com', ) set( css: '.js-admin input[name="firstname"]', diff --git a/test/browser/abb_one_group_test.rb b/test/browser/abb_one_group_test.rb index 17fe8bfd5..8ff2a9a2a 100644 --- a/test/browser/abb_one_group_test.rb +++ b/test/browser/abb_one_group_test.rb @@ -9,7 +9,7 @@ class AgentTicketActionLevel0Test < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -206,7 +206,7 @@ class AgentTicketActionLevel0Test < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -217,7 +217,7 @@ class AgentTicketActionLevel0Test < TestCase name: "some group #{rand(999_999_999)}", member: [ { - login: 'master@example.com', + login: 'admin@example.com', access: 'full', }, { diff --git a/test/browser/admin_calendar_sla_test.rb b/test/browser/admin_calendar_sla_test.rb index 81baa0541..fdb9a2942 100644 --- a/test/browser/admin_calendar_sla_test.rb +++ b/test/browser/admin_calendar_sla_test.rb @@ -6,7 +6,7 @@ class AdminCalendarSlaTest < TestCase def test_calendar @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -44,7 +44,7 @@ class AdminCalendarSlaTest < TestCase logout login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', ) diff --git a/test/browser/admin_channel_email_test.rb b/test/browser/admin_channel_email_test.rb index 681178920..694e19613 100644 --- a/test/browser/admin_channel_email_test.rb +++ b/test/browser/admin_channel_email_test.rb @@ -15,7 +15,7 @@ class AdminChannelEmailTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -132,7 +132,7 @@ class AdminChannelEmailTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/admin_drag_drop_to_new_group_test.rb b/test/browser/admin_drag_drop_to_new_group_test.rb index 7d5bf711a..d35786980 100644 --- a/test/browser/admin_drag_drop_to_new_group_test.rb +++ b/test/browser/admin_drag_drop_to_new_group_test.rb @@ -6,7 +6,7 @@ class AdminDragDropToNewGroupTest < TestCase def test_group_via_role @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -23,7 +23,7 @@ class AdminDragDropToNewGroupTest < TestCase def test_new_group @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -92,7 +92,7 @@ class AdminDragDropToNewGroupTest < TestCase watch_for(css: user_css) user_element = @browser.find_elements(css: user_css).find do |el| - el.text.strip == 'master@example.com' + el.text.strip == 'admin@example.com' end user_element.click diff --git a/test/browser/admin_object_manager_test.rb b/test/browser/admin_object_manager_test.rb index 1d4dd6a6c..d4a9c4c77 100644 --- a/test/browser/admin_object_manager_test.rb +++ b/test/browser/admin_object_manager_test.rb @@ -8,7 +8,7 @@ class AdminObjectManagerTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -161,7 +161,7 @@ class AdminObjectManagerTest < TestCase def test_basic_b @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -385,7 +385,7 @@ class AdminObjectManagerTest < TestCase def test_basic_c @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -494,7 +494,7 @@ class AdminObjectManagerTest < TestCase def test_that_attributes_with_references_should_have_a_disabled_delete_button @browser = instance = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -591,7 +591,7 @@ class AdminObjectManagerTest < TestCase def test_proper_sorting_of_select_attributes @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -675,7 +675,7 @@ class AdminObjectManagerTest < TestCase def test_deleted_select_attributes @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -784,7 +784,7 @@ class AdminObjectManagerTest < TestCase def test_false_boolean_attributes_gets_displayed_for_organizations @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -860,7 +860,7 @@ class AdminObjectManagerTest < TestCase def test_false_boolean_attributes_gets_displayed_for_users @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/admin_object_manager_tree_select_test.rb b/test/browser/admin_object_manager_tree_select_test.rb index 12ebab0f2..c4cdd5fb2 100644 --- a/test/browser/admin_object_manager_tree_select_test.rb +++ b/test/browser/admin_object_manager_tree_select_test.rb @@ -8,7 +8,7 @@ class AdminObjectManagerTreeSelectTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -122,7 +122,7 @@ class AdminObjectManagerTreeSelectTest < TestCase def test_modify_tree_select_attributes @browser = instance = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/admin_overview_test.rb b/test/browser/admin_overview_test.rb index 9b950b727..8e6033270 100644 --- a/test/browser/admin_overview_test.rb +++ b/test/browser/admin_overview_test.rb @@ -8,7 +8,7 @@ class AdminOverviewTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -45,7 +45,7 @@ class AdminOverviewTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -131,7 +131,7 @@ class AdminOverviewTest < TestCase def test_overview_toggle_out_of_office_setting @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/admin_permissions_granular_vs_full_test.rb b/test/browser/admin_permissions_granular_vs_full_test.rb index 2a70e5d68..8f4a8918c 100644 --- a/test/browser/admin_permissions_granular_vs_full_test.rb +++ b/test/browser/admin_permissions_granular_vs_full_test.rb @@ -7,7 +7,7 @@ class AdminPermissionsGranularVsFullTest < TestCase new_group_name = "permissions_test_group#{rand(99_999_999)}" @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -30,7 +30,7 @@ class AdminPermissionsGranularVsFullTest < TestCase user_css = '.user-list .js-tableBody tr td' watch_for(css: user_css) @browser.find_elements(css: '.content.active .user-list td:first-child').each do |entry| - next if entry.text.strip != 'master@example.com' + next if entry.text.strip != 'admin@example.com' entry.click break diff --git a/test/browser/admin_role_test.rb b/test/browser/admin_role_test.rb index 849c096a9..e7a85f913 100644 --- a/test/browser/admin_role_test.rb +++ b/test/browser/admin_role_test.rb @@ -6,7 +6,7 @@ class AdminRoleTest < TestCase def test_role_device @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -79,7 +79,7 @@ class AdminRoleTest < TestCase logout login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -141,7 +141,7 @@ class AdminRoleTest < TestCase # add admin.user to agent role login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -196,7 +196,7 @@ class AdminRoleTest < TestCase # revoke admin.user logout login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -234,7 +234,7 @@ class AdminRoleTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_navigation_and_title_test.rb b/test/browser/agent_navigation_and_title_test.rb index ca5a0b3da..8cd086e81 100644 --- a/test/browser/agent_navigation_and_title_test.rb +++ b/test/browser/agent_navigation_and_title_test.rb @@ -6,7 +6,7 @@ class AgentNavigationAndTitleTest < TestCase def test_highlight_and_title @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_organization_profile_test.rb b/test/browser/agent_organization_profile_test.rb index ed7a6d241..0ec9edfdb 100644 --- a/test/browser/agent_organization_profile_test.rb +++ b/test/browser/agent_organization_profile_test.rb @@ -10,7 +10,7 @@ class AgentOrganizationProfileTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -162,7 +162,7 @@ class AgentOrganizationProfileTest < TestCase def test_org_profile_user_active_update @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_attachment_test.rb b/test/browser/agent_ticket_attachment_test.rb index 4c8466040..ebbb2d79f 100644 --- a/test/browser/agent_ticket_attachment_test.rb +++ b/test/browser/agent_ticket_attachment_test.rb @@ -195,7 +195,7 @@ class AgentTicketAttachmentTest < TestCase browser2 = browser_instance login( browser: browser2, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_create_reset_customer_selection_test.rb b/test/browser/agent_ticket_create_reset_customer_selection_test.rb index 96805462b..7307623f2 100644 --- a/test/browser/agent_ticket_create_reset_customer_selection_test.rb +++ b/test/browser/agent_ticket_create_reset_customer_selection_test.rb @@ -6,7 +6,7 @@ class AgentTicketCreateResetCustomerSelectionTest < TestCase def test_clear_customer @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -90,7 +90,7 @@ class AgentTicketCreateResetCustomerSelectionTest < TestCase def test_clear_customer_use_email @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -242,7 +242,7 @@ class AgentTicketCreateResetCustomerSelectionTest < TestCase watch_for( css: '.content.active .tabsSidebar .sidebar[data-tab="customer"]', - value: 'master@example.com', + value: 'admin@example.com', ) # cleanup diff --git a/test/browser/agent_ticket_email_reply_keep_body_test.rb b/test/browser/agent_ticket_email_reply_keep_body_test.rb index a35a0b95c..14862129d 100644 --- a/test/browser/agent_ticket_email_reply_keep_body_test.rb +++ b/test/browser/agent_ticket_email_reply_keep_body_test.rb @@ -102,7 +102,7 @@ class AgentTicketEmailReplyKeepBodyTest < TestCase def test_full_quote @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -178,7 +178,7 @@ class AgentTicketEmailReplyKeepBodyTest < TestCase def test_full_quote_german_locale @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_email_signature_test.rb b/test/browser/agent_ticket_email_signature_test.rb index cc3b48c72..b1b02de25 100644 --- a/test/browser/agent_ticket_email_signature_test.rb +++ b/test/browser/agent_ticket_email_signature_test.rb @@ -16,7 +16,7 @@ class AgentTicketEmailSignatureTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -47,7 +47,7 @@ class AgentTicketEmailSignatureTest < TestCase signature: signature_name1, member: [ { - login: 'master@example.com', + login: 'admin@example.com', access: 'full', }, ], @@ -59,7 +59,7 @@ class AgentTicketEmailSignatureTest < TestCase signature: signature_name2, member: [ { - login: 'master@example.com', + login: 'admin@example.com', access: 'full', }, ], @@ -70,7 +70,7 @@ class AgentTicketEmailSignatureTest < TestCase name: group_name3, member: [ { - login: 'master@example.com', + login: 'admin@example.com', access: 'full', }, ], diff --git a/test/browser/agent_ticket_link_test.rb b/test/browser/agent_ticket_link_test.rb index 5748b618a..d87e4fc1f 100644 --- a/test/browser/agent_ticket_link_test.rb +++ b/test/browser/agent_ticket_link_test.rb @@ -35,7 +35,7 @@ class AgentTicketLinkTest < TestCase browser2 = browser_instance login( browser: browser2, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_macro_test.rb b/test/browser/agent_ticket_macro_test.rb index 206e3f4f5..923c101c5 100644 --- a/test/browser/agent_ticket_macro_test.rb +++ b/test/browser/agent_ticket_macro_test.rb @@ -45,7 +45,7 @@ class AgentTicketMacroTest < TestCase def test_ux_flow_next_up_stay_on_tab @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -90,7 +90,7 @@ class AgentTicketMacroTest < TestCase def test_ux_flow_next_up_close_tab @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -123,7 +123,7 @@ class AgentTicketMacroTest < TestCase def test_ux_flow_next_up_advance_to_next_ticket_from_overview @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_online_notification_test.rb b/test/browser/agent_ticket_online_notification_test.rb index 6a197dede..b00cea0da 100644 --- a/test/browser/agent_ticket_online_notification_test.rb +++ b/test/browser/agent_ticket_online_notification_test.rb @@ -8,7 +8,7 @@ class AgentTicketOnlineNotificationTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -242,7 +242,7 @@ class AgentTicketOnlineNotificationTest < TestCase def test_online_notifications_render @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_overview_group_by_organization_test.rb b/test/browser/agent_ticket_overview_group_by_organization_test.rb index b8f74d49f..e8b9e8743 100644 --- a/test/browser/agent_ticket_overview_group_by_organization_test.rb +++ b/test/browser/agent_ticket_overview_group_by_organization_test.rb @@ -16,7 +16,7 @@ class AgentTicketOverviewGroupByOrganizationTest < TestCase @browser = instance = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_overview_level0_test.rb b/test/browser/agent_ticket_overview_level0_test.rb index 28bac9894..adeee71e7 100644 --- a/test/browser/agent_ticket_overview_level0_test.rb +++ b/test/browser/agent_ticket_overview_level0_test.rb @@ -6,7 +6,7 @@ class AgentTicketOverviewLevel0Test < TestCase def test_bulk_close @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -219,7 +219,7 @@ class AgentTicketOverviewLevel0Test < TestCase def test_bulk_pending @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -370,7 +370,7 @@ class AgentTicketOverviewLevel0Test < TestCase def test_bulk_owner_change @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -472,7 +472,7 @@ class AgentTicketOverviewLevel0Test < TestCase def test_no_bulk_action_when_missing_change_permission @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -495,7 +495,7 @@ class AgentTicketOverviewLevel0Test < TestCase user_edit( data: { - login: 'master@example.com', + login: 'admin@example.com', permissions: { 1 => ['full'], 2 => ['full'], 3 => ['full'], } @@ -531,7 +531,7 @@ class AgentTicketOverviewLevel0Test < TestCase } ) - logout # logout as master@example.com then login as agent2@example.com + logout # logout as admin@example.com then login as agent2@example.com login( username: 'agent2@example.com', password: 'test', @@ -612,9 +612,9 @@ class AgentTicketOverviewLevel0Test < TestCase # cleanup tasks_close_all - logout # logout as agent2@example.com and then login as master@example.com to clean up tickets + logout # logout as agent2@example.com and then login as admin@example.com to clean up tickets login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_overview_level1_test.rb b/test/browser/agent_ticket_overview_level1_test.rb index 5751034a5..ca50fd8aa 100644 --- a/test/browser/agent_ticket_overview_level1_test.rb +++ b/test/browser/agent_ticket_overview_level1_test.rb @@ -10,7 +10,7 @@ class AgentTicketOverviewLevel1Test < TestCase browser1 = browser_instance login( browser: browser1, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_overview_pending_til_test.rb b/test/browser/agent_ticket_overview_pending_til_test.rb index 8d985e972..b53732027 100644 --- a/test/browser/agent_ticket_overview_pending_til_test.rb +++ b/test/browser/agent_ticket_overview_pending_til_test.rb @@ -10,7 +10,7 @@ class AgentTicketOverviewPendingTil < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_overview_tab_test.rb b/test/browser/agent_ticket_overview_tab_test.rb index 7a4b96203..369156dea 100644 --- a/test/browser/agent_ticket_overview_tab_test.rb +++ b/test/browser/agent_ticket_overview_tab_test.rb @@ -20,7 +20,7 @@ class AgentTicketOverviewTabTest < TestCase def test_i @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_tag_test.rb b/test/browser/agent_ticket_tag_test.rb index 93ae3c8f7..4990b53a9 100644 --- a/test/browser/agent_ticket_tag_test.rb +++ b/test/browser/agent_ticket_tag_test.rb @@ -97,7 +97,7 @@ class AgentTicketTagTest < TestCase browser2 = browser_instance login( browser: browser2, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -365,7 +365,7 @@ class AgentTicketTagTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_task_changed_test.rb b/test/browser/agent_ticket_task_changed_test.rb index 577a8af96..c9c0f9f0b 100644 --- a/test/browser/agent_ticket_task_changed_test.rb +++ b/test/browser/agent_ticket_task_changed_test.rb @@ -8,7 +8,7 @@ class AgentTicketTaskChangedTest < TestCase def test_detection_of_ticket_update_after_new_attribute @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_text_module_test.rb b/test/browser/agent_ticket_text_module_test.rb index 0e071649a..0a921bb82 100644 --- a/test/browser/agent_ticket_text_module_test.rb +++ b/test/browser/agent_ticket_text_module_test.rb @@ -9,7 +9,7 @@ class AgentTicketTextModuleTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_time_accounting_test.rb b/test/browser/agent_ticket_time_accounting_test.rb index f39744688..ebf47c6ed 100644 --- a/test/browser/agent_ticket_time_accounting_test.rb +++ b/test/browser/agent_ticket_time_accounting_test.rb @@ -6,7 +6,7 @@ class AgentTicketTimeAccountingTest < TestCase def test_macro @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -145,7 +145,7 @@ class AgentTicketTimeAccountingTest < TestCase def test_closing_time_accounting_modal_by_clicking_background @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_update2_test.rb b/test/browser/agent_ticket_update2_test.rb index 17b575418..258049755 100644 --- a/test/browser/agent_ticket_update2_test.rb +++ b/test/browser/agent_ticket_update2_test.rb @@ -7,7 +7,7 @@ class AgentTicketUpdate2Test < TestCase browser1 = browser_instance login( browser: browser1, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_update3_test.rb b/test/browser/agent_ticket_update3_test.rb index 7ea552675..7ddb53545 100644 --- a/test/browser/agent_ticket_update3_test.rb +++ b/test/browser/agent_ticket_update3_test.rb @@ -9,7 +9,7 @@ class AgentTicketUpdate3Test < TestCase browser1 = browser_instance login( browser: browser1, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_ticket_update4_test.rb b/test/browser/agent_ticket_update4_test.rb index af2e295a5..52f5c5532 100644 --- a/test/browser/agent_ticket_update4_test.rb +++ b/test/browser/agent_ticket_update4_test.rb @@ -8,7 +8,7 @@ class AgentTicketUpdate4Test < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/agent_user_profile_test.rb b/test/browser/agent_user_profile_test.rb index e7fb5b5f4..75dffe6b5 100644 --- a/test/browser/agent_user_profile_test.rb +++ b/test/browser/agent_user_profile_test.rb @@ -8,7 +8,7 @@ class AgentUserProfileTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/chat_no_jquery_test.rb b/test/browser/chat_no_jquery_test.rb index 7d57bea54..05bdaed8c 100644 --- a/test/browser/chat_no_jquery_test.rb +++ b/test/browser/chat_no_jquery_test.rb @@ -9,7 +9,7 @@ class ChatNoJqueryTest < TestCase agent = browser_instance login( browser: agent, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -176,7 +176,7 @@ class ChatNoJqueryTest < TestCase agent = browser_instance login( browser: agent, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -289,7 +289,7 @@ class ChatNoJqueryTest < TestCase agent = browser_instance login( browser: agent, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -444,7 +444,7 @@ class ChatNoJqueryTest < TestCase agent = browser_instance login( browser: agent, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -598,7 +598,7 @@ class ChatNoJqueryTest < TestCase agent = browser_instance login( browser: agent, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -670,7 +670,7 @@ class ChatNoJqueryTest < TestCase agent = browser_instance login( browser: agent, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -839,7 +839,7 @@ class ChatNoJqueryTest < TestCase def disable_chat login( browser: agent, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/chat_test.rb b/test/browser/chat_test.rb index d5f24c278..40979ab13 100644 --- a/test/browser/chat_test.rb +++ b/test/browser/chat_test.rb @@ -9,7 +9,7 @@ class ChatTest < TestCase agent = browser_instance login( browser: agent, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -176,7 +176,7 @@ class ChatTest < TestCase agent = browser_instance login( browser: agent, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -289,7 +289,7 @@ class ChatTest < TestCase agent = browser_instance login( browser: agent, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -444,7 +444,7 @@ class ChatTest < TestCase agent = browser_instance login( browser: agent, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -598,7 +598,7 @@ class ChatTest < TestCase agent = browser_instance login( browser: agent, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -670,7 +670,7 @@ class ChatTest < TestCase agent = browser_instance login( browser: agent, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -839,7 +839,7 @@ class ChatTest < TestCase def disable_chat login( browser: agent, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/customer_ticket_create_fields_test.rb b/test/browser/customer_ticket_create_fields_test.rb index a007e91b1..c7ee90222 100644 --- a/test/browser/customer_ticket_create_fields_test.rb +++ b/test/browser/customer_ticket_create_fields_test.rb @@ -8,7 +8,7 @@ class CustomerTicketCreateFieldsTest < TestCase # create agent session and fetch object attributes login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -17,7 +17,7 @@ class CustomerTicketCreateFieldsTest < TestCase # re-create agent session and fetch object attributes login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/customer_ticket_create_test.rb b/test/browser/customer_ticket_create_test.rb index 10eef04aa..a39cc0a01 100644 --- a/test/browser/customer_ticket_create_test.rb +++ b/test/browser/customer_ticket_create_test.rb @@ -209,7 +209,7 @@ class CustomerTicketCreateTest < TestCase # verify if we still can create new tickets as agent login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -231,7 +231,7 @@ class CustomerTicketCreateTest < TestCase # disable ticket creation login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -261,7 +261,7 @@ class CustomerTicketCreateTest < TestCase # enable ticket creation login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/first_steps_test.rb b/test/browser/first_steps_test.rb index 3283a57ff..7fdb32482 100644 --- a/test/browser/first_steps_test.rb +++ b/test/browser/first_steps_test.rb @@ -10,7 +10,7 @@ class FirstStepsTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/integration_cti_test.rb b/test/browser/integration_cti_test.rb index f4ecbb3c1..6049cc177 100644 --- a/test/browser/integration_cti_test.rb +++ b/test/browser/integration_cti_test.rb @@ -16,7 +16,7 @@ class IntegrationCtiTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -82,7 +82,7 @@ class IntegrationCtiTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -160,7 +160,7 @@ class IntegrationCtiTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -220,7 +220,7 @@ class IntegrationCtiTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/integration_sipgate_test.rb b/test/browser/integration_sipgate_test.rb index 6126b4733..4f67d7461 100644 --- a/test/browser/integration_sipgate_test.rb +++ b/test/browser/integration_sipgate_test.rb @@ -9,7 +9,7 @@ class IntegrationSipgateTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/integration_test.rb b/test/browser/integration_test.rb index 006c156e1..5b5da02b7 100644 --- a/test/browser/integration_test.rb +++ b/test/browser/integration_test.rb @@ -7,7 +7,7 @@ class IntegrationTest < TestCase def test_sipgate @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -79,7 +79,7 @@ class IntegrationTest < TestCase def test_slack @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -165,7 +165,7 @@ class IntegrationTest < TestCase def test_clearbit @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -255,7 +255,7 @@ class IntegrationTest < TestCase def test_icinga @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/keyboard_shortcuts_test.rb b/test/browser/keyboard_shortcuts_test.rb index efa8c16ac..ae7aa5f65 100644 --- a/test/browser/keyboard_shortcuts_test.rb +++ b/test/browser/keyboard_shortcuts_test.rb @@ -6,7 +6,7 @@ class KeyboardShortcutsTest < TestCase def test_navigation @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/maintenance_app_version_test.rb b/test/browser/maintenance_app_version_test.rb index be70403e9..d745681b3 100644 --- a/test/browser/maintenance_app_version_test.rb +++ b/test/browser/maintenance_app_version_test.rb @@ -7,7 +7,7 @@ class MaintenanceAppVersionTest < TestCase def test_app_version @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/maintenance_mode_test.rb b/test/browser/maintenance_mode_test.rb index f940d3e10..691a4430d 100644 --- a/test/browser/maintenance_mode_test.rb +++ b/test/browser/maintenance_mode_test.rb @@ -8,7 +8,7 @@ class MaintenanceModeTest < TestCase browser1 = browser_instance login( browser: browser1, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -75,7 +75,7 @@ class MaintenanceModeTest < TestCase sleep 4 login( browser: browser1, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/maintenance_session_message_test.rb b/test/browser/maintenance_session_message_test.rb index ce40442f2..bcecd7a2c 100644 --- a/test/browser/maintenance_session_message_test.rb +++ b/test/browser/maintenance_session_message_test.rb @@ -14,7 +14,7 @@ class MaintenanceSessionMessageTest < TestCase browser1 = browser_instance login( browser: browser1, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/manage_test.rb b/test/browser/manage_test.rb index 6dc978247..431899732 100644 --- a/test/browser/manage_test.rb +++ b/test/browser/manage_test.rb @@ -10,7 +10,7 @@ class ManageTest < TestCase # user management @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/monitoring_test.rb b/test/browser/monitoring_test.rb index 2a30ac35b..c752a5de1 100644 --- a/test/browser/monitoring_test.rb +++ b/test/browser/monitoring_test.rb @@ -8,7 +8,7 @@ class MonitoringTest < TestCase browser1 = browser_instance login( browser: browser1, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/preferences_language_test.rb b/test/browser/preferences_language_test.rb index 4b98f0885..708ce3177 100644 --- a/test/browser/preferences_language_test.rb +++ b/test/browser/preferences_language_test.rb @@ -7,7 +7,7 @@ class PreferencesLanguageTest < TestCase def test_lang_change @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/preferences_permission_check_test.rb b/test/browser/preferences_permission_check_test.rb index b437ce6d3..9328200ad 100644 --- a/test/browser/preferences_permission_check_test.rb +++ b/test/browser/preferences_permission_check_test.rb @@ -7,7 +7,7 @@ class PreferencesPermissionCheckTest < TestCase def test_permission_agent @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/reporting_test.rb b/test/browser/reporting_test.rb index 7cbf86659..7ebb2a89f 100644 --- a/test/browser/reporting_test.rb +++ b/test/browser/reporting_test.rb @@ -7,7 +7,7 @@ class ReportingTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/setting_test.rb b/test/browser/setting_test.rb index a04d3fccc..2b588900e 100644 --- a/test/browser/setting_test.rb +++ b/test/browser/setting_test.rb @@ -6,7 +6,7 @@ class SettingTest < TestCase def test_setting @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -145,7 +145,7 @@ class SettingTest < TestCase def test_product_name @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/switch_to_user_test.rb b/test/browser/switch_to_user_test.rb index 2cbe6e87a..56a24343d 100644 --- a/test/browser/switch_to_user_test.rb +++ b/test/browser/switch_to_user_test.rb @@ -6,7 +6,7 @@ class SwitchToUserTest < TestCase def test_agent_user @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -47,7 +47,7 @@ class SwitchToUserTest < TestCase sleep 5 login = @browser.find_elements({ css: '.user-menu .user a' })[0].attribute('title') - assert_equal(login, 'master@example.com') + assert_equal(login, 'admin@example.com') end end diff --git a/test/browser/taskbar_session_test.rb b/test/browser/taskbar_session_test.rb index 216e92aea..cc3a1f5de 100644 --- a/test/browser/taskbar_session_test.rb +++ b/test/browser/taskbar_session_test.rb @@ -43,7 +43,7 @@ class TaskbarSessionTest < TestCase browser1 = browser_instance login( browser: browser1, - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/taskbar_task_test.rb b/test/browser/taskbar_task_test.rb index 187317f48..778ad5934 100644 --- a/test/browser/taskbar_task_test.rb +++ b/test/browser/taskbar_task_test.rb @@ -82,7 +82,7 @@ class TaskbarTaskTest < TestCase # relogin with master - task are not viewable login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/translation_test.rb b/test/browser/translation_test.rb index fd53b964f..f46e6de2e 100644 --- a/test/browser/translation_test.rb +++ b/test/browser/translation_test.rb @@ -7,7 +7,7 @@ class TranslationTest < TestCase def test_preferences @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -256,7 +256,7 @@ class TranslationTest < TestCase def test_admin_sync @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) @@ -323,7 +323,7 @@ class TranslationTest < TestCase def test_rerender_when_new_phrases_detected @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser/user_access_permissions_test.rb b/test/browser/user_access_permissions_test.rb index 8d0b3cee4..ba298e388 100644 --- a/test/browser/user_access_permissions_test.rb +++ b/test/browser/user_access_permissions_test.rb @@ -123,7 +123,7 @@ class AgentProfilePermissionsTest < TestCase def test_agent_to_edit_admin_ticket_user_details @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, ) diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb index c9386bbba..7808e4288 100644 --- a/test/browser_test_helper.rb +++ b/test/browser_test_helper.rb @@ -4667,7 +4667,7 @@ wait untill text in selector disabppears def fetch_settings url = URI.parse(browser_url) req = Net::HTTP::Get.new("#{browser_url}/api/v1/settings/") - req.basic_auth('master@example.com', 'test') + req.basic_auth('admin@example.com', 'test') res = Net::HTTP.start(url.host, url.port) do |http| http.request(req) @@ -4692,7 +4692,7 @@ wait untill text in selector disabppears url = URI.parse(browser_url) req = Net::HTTP::Put.new("#{browser_url}/api/v1/settings/#{id}") req['Content-Type'] = 'application/json' - req.basic_auth('master@example.com', 'test') + req.basic_auth('admin@example.com', 'test') req.body = { 'state_current' => { 'value' => value } }.to_json res = Net::HTTP.start(url.host, url.port) do |http| http.request(req) diff --git a/test/integration/aaa_auto_wizard_base_setup_test.rb b/test/integration/aaa_auto_wizard_base_setup_test.rb index 4dfca5b1d..1121a8bf9 100644 --- a/test/integration/aaa_auto_wizard_base_setup_test.rb +++ b/test/integration/aaa_auto_wizard_base_setup_test.rb @@ -10,7 +10,7 @@ class AaaAutoWizardBaseSetupTest < TestCase watch_for( css: '.user-menu .user a', attribute: 'title', - value: 'master@example.com', + value: 'admin@example.com', timeout: 14, ) end diff --git a/test/integration/email_postmaster_to_sender.rb b/test/integration/email_postmaster_to_sender.rb index 71b12c4f3..aa9ba180c 100644 --- a/test/integration/email_postmaster_to_sender.rb +++ b/test/integration/email_postmaster_to_sender.rb @@ -25,7 +25,7 @@ class EmailPostmasterToSender < ActiveSupport::TestCase @folder = "postmaster_to_sender_#{@test_id}" if ENV['MAIL_SERVER_EMAIL'].blank? - raise "Need MAIL_SERVER_EMAIL as ENV variable like export MAIL_SERVER_EMAIL='master@example.com'" + raise "Need MAIL_SERVER_EMAIL as ENV variable like export MAIL_SERVER_EMAIL='admin@example.com'" end @sender_email_address = ENV['MAIL_SERVER_EMAIL'] diff --git a/test/integration/idoit_browser_test.rb b/test/integration/idoit_browser_test.rb index 1189365b2..beee28370 100644 --- a/test/integration/idoit_browser_test.rb +++ b/test/integration/idoit_browser_test.rb @@ -24,7 +24,7 @@ class IntegrationIdoitTest < TestCase @browser = browser_instance login( - username: 'master@example.com', + username: 'admin@example.com', password: 'test', url: browser_url, auto_wizard: true, @@ -95,7 +95,7 @@ class IntegrationIdoitTest < TestCase # reselect the customer and verify if object is still shown in sidebar ticket_customer_select( css: '.content.active .newTicket', - customer: 'master', + customer: 'admin', ) watch_for(