Fixes #3000 - Login site wording could be better.

This commit is contained in:
Dominik Klein 2021-10-06 15:06:49 +02:00
parent c1cb4fdd43
commit 3c2cea9a22
6 changed files with 20 additions and 8 deletions

View file

@ -1,7 +1,7 @@
<div class="login fullscreen">
<div class="fullscreen-center">
<div class="fullscreen-body">
<p><%- @T('Login with %s', @C('fqdn')) %></p>
<p><%- @T('Log in to %s', @C('fqdn')) %></p>
<% if @C('maintenance_mode'): %>
<div class="hero-unit alert alert--danger js-maintenanceMode"><%- @T('Zammad is currently in maintenance mode. Only administrators can login. Please wait until the maintenance window is over.') %></div>

View file

@ -112,7 +112,7 @@ RSpec.describe 'Import Freshdesk', type: :system, set_up: false, authenticated_a
Rake::Task['zammad:setup:auto_wizard'].execute
expect(page).to have_text('Login')
expect(page).to have_text(Setting.get('fqdn'))
end
end
end

View file

@ -121,7 +121,7 @@ RSpec.describe 'Import Zendesk', type: :system, set_up: false, authenticated_as:
Rake::Task['zammad:setup:auto_wizard'].execute
expect(page).to have_text('Login')
expect(page).to have_text(Setting.get('fqdn'))
end
end
end

13
spec/system/login_spec.rb Normal file
View file

@ -0,0 +1,13 @@
# Copyright (C) 2012-2021 Zammad Foundation, http://zammad-foundation.org/
require 'rails_helper'
RSpec.describe 'Login', type: :system, authenticated_as: false do
before do
visit '/'
end
it 'fqdn is visible on login page' do
expect(page).to have_css('.login p', text: Setting.get('fqdn'))
end
end

View file

@ -221,10 +221,9 @@ class KeyboardShortcutsTest < TestCase
shortcut(key: 'e')
watch_for(
css: 'body',
value: 'login',
css: '#login',
value: 'username',
timeout: 4,
)
end
end

View file

@ -55,8 +55,8 @@ class OtrsImportBrowserTest < TestCase
click(css: '.js-migration-start')
watch_for(
css: 'body',
value: 'login',
css: '#login',
value: 'username',
timeout: 600,
)