From 1a506cd1509359607509b4aec224a5f56fe2dafa Mon Sep 17 00:00:00 2001
From: Martin Edenhofer <me@edenhofer.de>
Date: Sat, 30 Apr 2016 16:38:24 +0200
Subject: [PATCH] Improved chat tests.

---
 .../controllers/_application_controller_generic.coffee |  3 ++-
 app/controllers/users_controller.rb                    |  2 +-
 app/models/setting.rb                                  |  4 +++-
 test/browser/chat_test.rb                              | 10 +++++-----
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee
index 346405980..5b7127bb1 100644
--- a/app/assets/javascripts/app/controllers/_application_controller_generic.coffee
+++ b/app/assets/javascripts/app/controllers/_application_controller_generic.coffee
@@ -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
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 072fb7e0a..a2c727aae 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -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|
diff --git a/app/models/setting.rb b/app/models/setting.rb
index 8ca6e1911..63c520ccc 100644
--- a/app/models/setting.rb
+++ b/app/models/setting.rb
@@ -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
diff --git a/test/browser/chat_test.rb b/test/browser/chat_test.rb
index 6fa4d3c46..34452be89 100644
--- a/test/browser/chat_test.rb
+++ b/test/browser/chat_test.rb
@@ -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',
     )