From ccf97ee077d552e7602a106c619928e33f5fb4b4 Mon Sep 17 00:00:00 2001
From: Billy Zhou <bz@zammad.com>
Date: Mon, 17 Sep 2018 09:01:17 +0200
Subject: [PATCH] Issue #2232 hide inactive report profiles

---
 .gitlab-ci.yml                                | 268 +++++++++---------
 .../javascripts/app/controllers/report.coffee |   3 +-
 app/models/scheduler.rb                       |   2 +-
 script/build/test_shutdown.sh                 |   6 +
 script/build/test_slice_tests.sh              |   7 +-
 script/build/test_startup.sh                  |   7 +
 test/browser/aaa_getting_started_test.rb      |   3 +
 test/browser/reporting_test.rb                |  43 +++
 test/browser_test_helper.rb                   | 106 ++++++-
 test/integration/auto_wizard_browser_test.rb  |   3 +
 10 files changed, 297 insertions(+), 151 deletions(-)
 create mode 100644 test/browser/reporting_test.rb

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2a12ef724..327025eb3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -407,13 +407,13 @@ test:browser:integration:api_client_ruby:
   script:
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_test.json auto_wizard.json
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - git clone git@github.com:zammad/zammad-api-client-ruby.git || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0
+    - git clone git@github.com:zammad/zammad-api-client-ruby.git || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0
     - cd zammad-api-client-ruby
     - bundle install --jobs 8
     - export TEST_URL=http://$IP:$BROWSER_PORT/
-    - bundle exec rspec || (cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1)
-    - cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - bundle exec rspec || (cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0)
+    - cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0
 
 test:browser:integration:api_client_php:
   stage: browser-core
@@ -424,16 +424,16 @@ test:browser:integration:api_client_php:
   script:
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_test.json auto_wizard.json
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - git clone git@github.com:zammad/zammad-api-client-php || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0
+    - git clone git@github.com:zammad/zammad-api-client-php || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0
     - wget http://$IP:$BROWSER_PORT/api/v1/getting_started/auto_wizard
     - cd zammad-api-client-php
     - composer install
     - export ZAMMAD_PHP_API_CLIENT_UNIT_TESTS_URL=http://$IP:$BROWSER_PORT
     - export ZAMMAD_PHP_API_CLIENT_UNIT_TESTS_USERNAME=master@example.com
     - export ZAMMAD_PHP_API_CLIENT_UNIT_TESTS_PASSWORD=test
-    - vendor/bin/phpunit || (cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1)
-    - cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - vendor/bin/phpunit || (cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0)
+    - cd .. && script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0
 
 test:browser:twitter_ff:
   stage: browser-integration
@@ -445,12 +445,12 @@ test:browser:twitter_ff:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_test.json auto_wizard.json
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - ruby -I test/ test/integration/twitter_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0
+    - ruby -I test/ test/integration/twitter_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0
 
 test:browser:facebook_ff:
   stage: browser-integration
@@ -462,12 +462,12 @@ test:browser:facebook_ff:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_test.json auto_wizard.json
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - ruby -I test/ test/integration/facebook_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0
+    - ruby -I test/ test/integration/facebook_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0
 
 test:browser:autowizard_ff:
   stage: browser-core
@@ -478,12 +478,12 @@ test:browser:autowizard_ff:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_example.json auto_wizard.json
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - ruby -I test/ test/integration/auto_wizard_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - ruby -I test/ test/integration/auto_wizard_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:ff_1_mysql:
   stage: browser-core
@@ -495,16 +495,16 @@ test:browser:core:ff_1_mysql:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 1
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:ff_2_mysql:
   stage: browser-core
@@ -516,16 +516,16 @@ test:browser:core:ff_2_mysql:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 2
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:ff_3_mysql:
   stage: browser-core
@@ -537,12 +537,12 @@ test:browser:core:ff_3_mysql:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - script/build/test_slice_tests.sh 3
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:ff_4_mysql:
   stage: browser-core
@@ -554,16 +554,16 @@ test:browser:core:ff_4_mysql:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 4
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:ff_5_mysql:
   stage: browser-core
@@ -575,16 +575,16 @@ test:browser:core:ff_5_mysql:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 5
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:ff_6_mysql:
   stage: browser-core
@@ -596,16 +596,16 @@ test:browser:core:ff_6_mysql:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 6
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:ff_1_postgresql:
   stage: browser-core
@@ -617,16 +617,16 @@ test:browser:core:ff_1_postgresql:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 1
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:ff_2_postgresql:
   stage: browser-core
@@ -638,16 +638,16 @@ test:browser:core:ff_2_postgresql:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 2
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:ff_3_postgresql:
   stage: browser-core
@@ -659,12 +659,12 @@ test:browser:core:ff_3_postgresql:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - script/build/test_slice_tests.sh 3
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:ff_4_postgresql:
   stage: browser-core
@@ -676,16 +676,16 @@ test:browser:core:ff_4_postgresql:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 4
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:ff_5_postgresql:
   stage: browser-core
@@ -697,16 +697,16 @@ test:browser:core:ff_5_postgresql:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 5
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:ff_6_postgresql:
   stage: browser-core
@@ -718,16 +718,16 @@ test:browser:core:ff_6_postgresql:
   script:
     - export BROWSER=firefox
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 6
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:chrome_1_mysql:
   stage: browser-core
@@ -739,16 +739,16 @@ test:browser:core:chrome_1_mysql:
   script:
     - export BROWSER=chrome
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 1
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:chrome_2_mysql:
   stage: browser-core
@@ -760,16 +760,16 @@ test:browser:core:chrome_2_mysql:
   script:
     - export BROWSER=chrome
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 2
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:chrome_3_mysql:
   stage: browser-core
@@ -781,16 +781,16 @@ test:browser:core:chrome_3_mysql:
   script:
     - export BROWSER=chrome
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 3
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:chrome_4_mysql:
   stage: browser-core
@@ -802,16 +802,16 @@ test:browser:core:chrome_4_mysql:
   script:
     - export BROWSER=chrome
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 4
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:chrome_5_mysql:
   stage: browser-core
@@ -823,16 +823,16 @@ test:browser:core:chrome_5_mysql:
   script:
     - export BROWSER=chrome
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 5
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:chrome_6_mysql:
   stage: browser-core
@@ -844,16 +844,16 @@ test:browser:core:chrome_6_mysql:
   script:
     - export BROWSER=chrome
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 6
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:chrome_1_postgresql:
   stage: browser-core
@@ -865,16 +865,16 @@ test:browser:core:chrome_1_postgresql:
   script:
     - export BROWSER=chrome
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 1
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:chrome_2_postgresql:
   stage: browser-core
@@ -886,16 +886,16 @@ test:browser:core:chrome_2_postgresql:
   script:
     - export BROWSER=chrome
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 2
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:chrome_3_postgresql:
   stage: browser-core
@@ -907,16 +907,16 @@ test:browser:core:chrome_3_postgresql:
   script:
     - export BROWSER=chrome
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 3
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:chrome_4_postgresql:
   stage: browser-core
@@ -928,16 +928,16 @@ test:browser:core:chrome_4_postgresql:
   script:
     - export BROWSER=chrome
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 4
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:chrome_5_postgresql:
   stage: browser-core
@@ -949,16 +949,16 @@ test:browser:core:chrome_5_postgresql:
   script:
     - export BROWSER=chrome
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 5
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:core:chrome_6_postgresql:
   stage: browser-core
@@ -970,16 +970,16 @@ test:browser:core:chrome_6_postgresql:
   script:
     - export BROWSER=chrome
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
-    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
+    - export APP_RESTART_CMD="script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0 0 && script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 0"
     - unset MAILBOX_AUTO1
     - unset MAILBOX_AUTO2
     - unset MAILBOX_MANUAL1
     - unset MAILBOX_MANUAL2
     - script/build/test_slice_tests.sh 6
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - rake test:browser || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:autowizard_chrome:
   stage: browser-core
@@ -992,9 +992,9 @@ test:browser:autowizard_chrome:
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_example.json auto_wizard.json
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - ruby -I test/ test/integration/auto_wizard_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
+    - ruby -I test/ test/integration/auto_wizard_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 1
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 1
 
 test:browser:integration:twitter_chrome:
   stage: browser-integration
@@ -1008,9 +1008,9 @@ test:browser:integration:twitter_chrome:
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_test.json auto_wizard.json
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - ruby -I test/ test/integration/twitter_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0
+    - ruby -I test/ test/integration/twitter_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0
 
 test:browser:integration:facebook_chrome:
   stage: browser-integration
@@ -1024,9 +1024,9 @@ test:browser:integration:facebook_chrome:
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_test.json auto_wizard.json
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - ruby -I test/ test/integration/facebook_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0
+    - ruby -I test/ test/integration/facebook_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0
 
 test:browser:integration:otrs_chrome:
   stage: browser-integration
@@ -1038,9 +1038,9 @@ test:browser:integration:otrs_chrome:
     - export BROWSER=chrome
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - ruby -I test/ test/integration/otrs_import_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0
+    - ruby -I test/ test/integration/otrs_import_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0
 
 test:browser:integration:zendesk_chrome:
   stage: browser-integration
@@ -1052,9 +1052,9 @@ test:browser:integration:zendesk_chrome:
     - export BROWSER=chrome
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - RAILS_ENV=test rake db:create
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - ruby -I test/ test/integration/zendesk_import_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0
+    - ruby -I test/ test/integration/zendesk_import_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0
 
 test:browser:integration:idoit_chrome:
   stage: browser-integration
@@ -1067,6 +1067,6 @@ test:browser:integration:idoit_chrome:
     - export BROWSER_URL=http://$IP:$BROWSER_PORT
     - RAILS_ENV=test rake db:create
     - cp contrib/auto_wizard_test.json auto_wizard.json
-    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1
-    - ruby -I test/ test/integration/idoit_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1
-    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1
+    - script/build/test_startup.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 0
+    - ruby -I test/ test/integration/idoit_browser_test.rb || script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 1 1 0
+    - script/build/test_shutdown.sh $RAILS_ENV $BROWSER_PORT $WS_PORT 0 1 0
diff --git a/app/assets/javascripts/app/controllers/report.coffee b/app/assets/javascripts/app/controllers/report.coffee
index c8cc04620..51d9704cf 100644
--- a/app/assets/javascripts/app/controllers/report.coffee
+++ b/app/assets/javascripts/app/controllers/report.coffee
@@ -550,9 +550,8 @@ class Sidebar extends App.Controller
     @render()
 
   render: =>
-
     metrics = @config.metric
-    profiles = App.ReportProfile.all()
+    profiles = App.ReportProfile.search(filter: { active: true })
     @html App.view('report/sidebar')(
       metrics:  metrics
       params:   @params
diff --git a/app/models/scheduler.rb b/app/models/scheduler.rb
index d5c0f079b..5710d400d 100644
--- a/app/models/scheduler.rb
+++ b/app/models/scheduler.rb
@@ -345,7 +345,7 @@ class Scheduler < ApplicationModel
     end
 
     # used for production
-    wait = 8
+    wait = 4
     Thread.new do
       sleep wait
 
diff --git a/script/build/test_shutdown.sh b/script/build/test_shutdown.sh
index 3965fcbe4..bf62a0168 100755
--- a/script/build/test_shutdown.sh
+++ b/script/build/test_shutdown.sh
@@ -4,6 +4,7 @@ APP_PORT=$2
 WS_PORT=$3
 EXIT=$4 || 0
 WITH_DB=$5 || 0
+WITH_ELASTICSEARCH=$6 || 0
 
 SERVER_PID='tmp/pids/server.pid'
 LOG_HOST='cilog@schneeberg.znuny.com'
@@ -11,6 +12,7 @@ LOG_HOST='cilog@schneeberg.znuny.com'
 bundle exec script/scheduler.rb stop
 bundle exec script/websocket-server.rb stop
 kill $(cat $SERVER_PID)
+
 sleep 5
 if [ -f $SERVER_PID ]; then
    kill -9 $(cat $SERVER_PID)
@@ -20,6 +22,10 @@ if test $WITH_DB -eq 1; then
   script/build/test_cleanup.sh
 fi
 
+if test $WITH_ELASTICSEARCH -eq 1; then
+  rake searchindex:drop
+fi
+
 # if build has failed, copy logs for analyzing
 if test $EXIT -eq 1; then
   ssh $LOG_HOST "mkdir -p logs/$CI_BUILD_ID"
diff --git a/script/build/test_slice_tests.sh b/script/build/test_slice_tests.sh
index 15ea96f8a..1f2243163 100755
--- a/script/build/test_slice_tests.sh
+++ b/script/build/test_slice_tests.sh
@@ -74,6 +74,7 @@ if [ "$LEVEL" == '1' ]; then
   rm test/browser/preferences_language_test.rb
   rm test/browser/preferences_permission_check_test.rb
   rm test/browser/preferences_token_access_test.rb
+  rm test/browser/reporting_test.rb
   rm test/browser/setting_test.rb
   # test/browser/signup_password_change_and_reset_test.rb
   # test/browser/swich_to_user_test.rb
@@ -152,6 +153,7 @@ elif [ "$LEVEL" == '2' ]; then
   rm test/browser/preferences_language_test.rb
   rm test/browser/preferences_permission_check_test.rb
   rm test/browser/preferences_token_access_test.rb
+  rm test/browser/reporting_test.rb
   rm test/browser/setting_test.rb
   rm test/browser/signup_password_change_and_reset_test.rb
   rm test/browser/switch_to_user_test.rb
@@ -230,6 +232,7 @@ elif [ "$LEVEL" == '3' ]; then
   rm test/browser/preferences_language_test.rb
   rm test/browser/preferences_permission_check_test.rb
   rm test/browser/preferences_token_access_test.rb
+  rm test/browser/reporting_test.rb
   rm test/browser/setting_test.rb
   rm test/browser/signup_password_change_and_reset_test.rb
   rm test/browser/switch_to_user_test.rb
@@ -308,6 +311,7 @@ elif [ "$LEVEL" == '4' ]; then
   rm test/browser/preferences_language_test.rb
   rm test/browser/preferences_permission_check_test.rb
   rm test/browser/preferences_token_access_test.rb
+  rm test/browser/reporting_test.rb
   rm test/browser/setting_test.rb
   rm test/browser/signup_password_change_and_reset_test.rb
   rm test/browser/switch_to_user_test.rb
@@ -385,6 +389,7 @@ elif [ "$LEVEL" == '5' ]; then
   rm test/browser/preferences_language_test.rb
   rm test/browser/preferences_permission_check_test.rb
   rm test/browser/preferences_token_access_test.rb
+  rm test/browser/reporting_test.rb
   rm test/browser/setting_test.rb
   rm test/browser/signup_password_change_and_reset_test.rb
   rm test/browser/switch_to_user_test.rb
@@ -465,6 +470,7 @@ elif [ "$LEVEL" == '6' ]; then
   # test/browser/preferences_language_test.rb
   # test/browser/preferences_permission_check_test.rb
   # test/browser/preferences_token_access_test.rb
+  # test/browser/reporting_test.rb
   # test/browser/setting_test.rb
   rm test/browser/signup_password_change_and_reset_test.rb
   rm test/browser/switch_to_user_test.rb
@@ -478,4 +484,3 @@ else
   echo "ERROR: Invalid level $LEVEL - 1, 2, 3, 4, 5 or 6 is available"
   exit 1
 fi
-
diff --git a/script/build/test_startup.sh b/script/build/test_startup.sh
index 47573168d..9133e3852 100755
--- a/script/build/test_startup.sh
+++ b/script/build/test_startup.sh
@@ -3,6 +3,7 @@ RAILS_ENV=$1
 APP_PORT=$2
 WS_PORT=$3
 WITH_DB=$4 || 0
+WITH_ELASTICSEARCH=$5 || 0
 
 if test $WITH_DB -eq 1; then
   script/bootstrap.sh
@@ -15,6 +16,12 @@ rails r "Setting.set('websocket_port', '$WS_PORT')"
 rails r "Setting.set('fqdn', '$IP:$BROWSER_PORT')"
 rails r "Setting.set('chat_agent_idle_timeout', '45')"
 
+if test $WITH_ELASTICSEARCH -eq 1; then
+  rails r "Setting.set('es_url', 'http://localhost:9200')"
+  rails r "Setting.set('es_index', 'browser_test_$CI_BUILD_ID')"
+  rake searchindex:rebuild
+fi
+
 echo "env used for script/build/test_startup.sh $1 $2 $3"
 echo "export RAILS_ENV=$RAILS_ENV"
 echo "export IP=$IP"
diff --git a/test/browser/aaa_getting_started_test.rb b/test/browser/aaa_getting_started_test.rb
index 6a6857dbe..252caa6ab 100644
--- a/test/browser/aaa_getting_started_test.rb
+++ b/test/browser/aaa_getting_started_test.rb
@@ -129,6 +129,9 @@ class AaaGettingStartedTest < TestCase
     location_check(
       url: '#getting_started/agents',
     )
+    watch_for(
+      css: '.js-agent input[name="firstname"]',
+    )
     set(
       css: '.js-agent input[name="firstname"]',
       value: 'Agent 1',
diff --git a/test/browser/reporting_test.rb b/test/browser/reporting_test.rb
new file mode 100644
index 000000000..834990644
--- /dev/null
+++ b/test/browser/reporting_test.rb
@@ -0,0 +1,43 @@
+
+require 'browser_test_helper'
+
+class ReportingTest < TestCase
+  def test_only_show_active_reporting_profiles
+    @browser = browser_instance
+
+    login(
+      username: 'master@example.com',
+      password: 'test',
+      url: browser_url,
+    )
+    tasks_close_all()
+
+    report_profile_create(
+      data: {
+        name: 'active_report_profile',
+        active: true,
+      }
+    )
+    report_profile_create(
+      data: {
+        name: 'inactive_report_profile',
+        active: false,
+      }
+    )
+
+    click(
+      css:  'a[href="#manage"]',
+    )
+    click(
+      css: '.content.active a[href="#manage/report_profiles"]',
+    )
+    click(
+      css:  'a[href="#report"]',
+    )
+    watch_for(
+      css:  '.content ul.checkbox-list',
+    )
+    labels = @browser.find_elements(css: '.content ul.checkbox-list .label-text').map(&:text)
+    assert_equal labels, %w[-all- active_report_profile]
+  end
+end
diff --git a/test/browser_test_helper.rb b/test/browser_test_helper.rb
index 84058f50c..8e7d742ef 100644
--- a/test/browser_test_helper.rb
+++ b/test/browser_test_helper.rb
@@ -2151,8 +2151,10 @@ wait untill text in selector disabppears
       css:  '.content.active .newTicket button.js-submit',
       mute_log: true,
     )
+    screenshot(browser: instance, comment: 'ticket_create_after_submit_1')
 
     sleep 1
+    screenshot(browser: instance, comment: 'ticket_create_after_submit_2')
     9.times do
       if instance.current_url.match?(/#{Regexp.quote('#ticket/zoom/')}/)
         assert(true, 'ticket created')
@@ -2644,7 +2646,10 @@ wait untill text in selector disabppears
     # open ticket
     #instance.find_element(partial_link_text: params[:number] } ).click
     instance.execute_script("$(\".js-global-search-result a:contains('#{params[:number]}') .nav-tab-icon\").first().click()")
-    sleep 1
+    watch_for(
+      browser: instance,
+      css: '.content.active .ticketZoom-header .ticket-number'
+    )
     number = instance.find_elements(css: '.content.active .ticketZoom-header .ticket-number')[0].text
     if !number.match?(/#{params[:number]}/)
       screenshot(browser: instance, comment: 'ticket_open_by_search_failed')
@@ -2765,7 +2770,10 @@ wait untill text in selector disabppears
     sleep 2
     #instance.find_element(partial_link_text: params[:value] } ).click
     instance.execute_script("$(\".js-global-search-result a:contains('#{params[:value]}') .nav-tab-icon\").click()")
-    sleep 1
+    watch_for(
+      browser: instance,
+      css: '.content.active h1'
+    )
     name = instance.find_elements(css: '.content.active h1')[0].text
     if !name.match?(/#{params[:value]}/)
       screenshot(browser: instance, comment: 'organization_open_by_search_failed')
@@ -2798,7 +2806,10 @@ wait untill text in selector disabppears
 
     #instance.find_element(partial_link_text: params[:value]).click
     instance.execute_script("$(\".js-global-search-result a:contains('#{params[:value]}') .nav-tab-icon\").click()")
-    sleep 1
+    watch_for(
+      browser: instance,
+      css: '.content.active h1'
+    )
     name = instance.find_elements(css: '.content.active h1')[0].text
     if !name.match?(/#{params[:value]}/)
       screenshot(browser: instance, comment: 'user_open_by_search_failed')
@@ -2830,6 +2841,8 @@ wait untill text in selector disabppears
     instance = params[:browser] || @browser
     data     = params[:data]
 
+    raise 'user_create() requires either email or phone' if data[:email].blank? && data[:phone].blank?
+
     click(
       browser: instance,
       css:  'a[href="#manage"]',
@@ -2897,16 +2910,31 @@ wait untill text in selector disabppears
       browser: instance,
       timeout: 10,
     )
-    set(
-      browser: instance,
-      css: '.content .js-search',
-      value: data[:email],
-    )
-    watch_for(
-      browser: instance,
-      css: 'body',
-      value: data[:lastname],
-    )
+
+    if data[:email]
+      search_query =  data[:email]
+      search_target = data[:email]
+      search_css =    '.content.active .user-list .js-tableBody td:first-child'
+    else
+      search_query =  data[:phone]
+      search_target = data[:firstname]
+      search_css =    '.content.active .user-list .js-tableBody td:nth-child(2)'
+    end
+
+    60.times do |i|
+      if (i % 10).zero?
+        set(
+          browser: instance,
+          css: '.content.active .js-search',
+          value: search_query,
+        )
+      end
+      sleep 1
+      search_result = instance.find_elements(css: search_css).map(&:text).map(&:strip)
+      break if search_result.include? search_target
+      raise 'user creation failed' if i >= 19
+      log "new user #{search_query} not found on the #{i.ordinalize} try, retrying"
+    end
 
     assert(true, 'user created')
   end
@@ -3621,6 +3649,58 @@ wait untill text in selector disabppears
     raise 'role edit failed'
   end
 
+=begin
+
+  report_profile_create(
+    browser: browser2,
+    data: {
+      name: 'some profile' + random,
+      active: true
+    },
+  )
+
+=end
+
+  def report_profile_create(params = {})
+    switch_window_focus(params)
+    log('report_profile_create', params)
+
+    instance = params[:browser] || @browser
+    data     = params[:data]
+
+    click(
+      browser: instance,
+      css:  'a[href="#manage"]',
+      mute_log: true,
+    )
+    click(
+      browser: instance,
+      css: '.content.active a[href="#manage/report_profiles"]',
+      mute_log: true,
+    )
+    click(
+      browser: instance,
+      css: '.content.active a.btn.primary[data-type="new"]',
+      mute_log: true,
+    )
+    set(
+      browser:  instance,
+      css:      '.modal input[name=name]',
+      value:    data[:name],
+      mute_log: true,
+    )
+    if data[:active] == false
+      select(css: '.content.active .modal select[name="active"]', value: 'inactive')
+    end
+    sleep 0.5
+    click(
+      browser: instance,
+      css: '.content.active .modal .js-submit',
+      mute_log: true,
+    )
+    modal_disappear
+  end
+
 =begin
 
   object_manager_attribute_create(
diff --git a/test/integration/auto_wizard_browser_test.rb b/test/integration/auto_wizard_browser_test.rb
index 2a71f78a9..f3fe539e7 100644
--- a/test/integration/auto_wizard_browser_test.rb
+++ b/test/integration/auto_wizard_browser_test.rb
@@ -31,6 +31,9 @@ class AutoWizardBrowserTest < TestCase
 
     clues_close
 
+    # wait unless elasticsearch has index all objects from auto wizard
+    sleep 10
+
     organization_open_by_search(
       value: 'Demo Organization',
     )