From 3d4e3edaed56704fca1c361ddcf2429309985cc8 Mon Sep 17 00:00:00 2001 From: Martin Edenhofer Date: Sun, 18 Jun 2017 22:21:06 +0200 Subject: [PATCH] Improved test. --- test/controllers/search_controller_test.rb | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/test/controllers/search_controller_test.rb b/test/controllers/search_controller_test.rb index d348240ac..2528238a2 100644 --- a/test/controllers/search_controller_test.rb +++ b/test/controllers/search_controller_test.rb @@ -152,14 +152,17 @@ class SearchControllerTest < ActionDispatch::IntegrationTest # Setting.set('es_user', 'elasticsearch') # Setting.set('es_password', 'zammad') + if ENV['ES_INDEX_RAND'].present? + ENV['ES_INDEX'] = "es_index_#{rand(999_999_999)}" + end + if ENV['ES_INDEX'].blank? + raise "ERROR: Need ES_INDEX - hint ES_INDEX='estest.local_zammad'" + end + Setting.set('es_index', ENV['ES_INDEX']) + # set max attachment size in mb Setting.set('es_attachment_max_size_in_mb', 1) - if ENV['ES_INDEX'].present? - #fail "ERROR: Need ES_INDEX - hint ES_INDEX='estest.local_zammad'" - Setting.set('es_index', ENV['ES_INDEX']) - end - travel 1.minute # drop/create indexes