Improved chat tests.

This commit is contained in:
Martin Edenhofer 2016-04-30 16:38:24 +02:00
parent b4d34bed5b
commit 1a506cd150
4 changed files with 11 additions and 8 deletions

View file

@ -102,7 +102,8 @@ class App.ControllerGenericIndex extends App.Controller
super
# set title
@title @pageData.title, true
if @pageData.title
@title @pageData.title, true
# set nav bar
if @pageData.navupdate

View file

@ -85,7 +85,7 @@ class UsersController < ApplicationController
group_ids = []
role_ids = []
if count <= 2
Role.where(name: [ Z_ROLENAME_ADMIN, 'Agent', 'Chat', 'CTI']).each { |role|
Role.where(name: [ Z_ROLENAME_ADMIN, 'Agent', 'Chat']).each { |role|
role_ids.push role.id
}
Group.all().each { |group|

View file

@ -18,8 +18,10 @@ class Setting < ApplicationModel
@@lookup_at = nil # rubocop:disable Style/ClassVars
@@lookup_timeout = if ENV['ZAMMAD_SETTING_TTL'] # rubocop:disable Style/ClassVars
ENV['ZAMMAD_SETTING_TTL'].to_i.seconds
else
elsif Rails.env.production?
2.minutes
else
15.seconds
end
=begin

View file

@ -70,7 +70,7 @@ class ChatTest < TestCase
sleep 15 # wait for rerendering
switch(
browser: agent,
css: '#navigation .js-switch',
css: '#navigation .js-chatMenuItem .js-switch',
type: 'off',
)
click(
@ -108,7 +108,7 @@ class ChatTest < TestCase
)
switch(
browser: agent,
css: '#navigation .js-switch',
css: '#navigation .js-chatMenuItem .js-switch',
type: 'on',
)
reload(
@ -610,7 +610,7 @@ class ChatTest < TestCase
exists(
browser: agent,
css: '#navigation .js-switch input[checked]'
css: '#navigation .js-chatMenuItem .js-switch input[checked]'
)
# no customer action, hide widget
@ -658,11 +658,11 @@ class ChatTest < TestCase
# check if agent is offline, idle timeout, chat not answered
exists_not(
browser: agent,
css: '#navigation .js-switch input[checked]'
css: '#navigation .js-chatMenuItem .js-switch input[checked]'
)
switch(
browser: agent,
css: '#navigation .js-switch',
css: '#navigation .js-chatMenuItem .js-switch',
type: 'on',
)