Merge branch 'develop' of https://github.com/zammad/zammad into develop

test/unit/activity_stream_test.rb

@@ -4,7 +4,6 @@ require 'test_helper'
 class ActivityStreamTest < ActiveSupport::TestCase
   admin_user = nil
   current_user = nil
-  activity_record_delay = nil
   test 'aaa - setup' do
     role  = Role.lookup(name: 'Admin')
     group = Group.lookup(name: 'Users')
@@ -21,12 +20,6 @@ class ActivityStreamTest < ActiveSupport::TestCase
       created_by_id: 1
     )
     current_user = User.lookup(email: 'nicole.braun@zammad.org')
-
-    activity_record_delay = if ENV['ZAMMAD_ACTIVITY_RECORD_DELAY']
-                              ENV['ZAMMAD_ACTIVITY_RECORD_DELAY'].to_i.seconds
-                            else
-                              90.seconds
-                            end
   end
 
   test 'ticket+user' do
@@ -101,7 +94,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
       test[:check][2][:o_id]          = ticket.id
       test[:check][2][:created_at]    = ticket.created_at
       test[:check][2][:created_by_id] = current_user.id
-      sleep 2
+      travel 2.seconds
 
       test[:create][:article][:ticket_id] = ticket.id
       article = Ticket::Article.create(test[:create][:article])
@@ -129,7 +122,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
         article.update_attributes(test[:update][:article])
       end
 
-      sleep activity_record_delay + 1
+      travel 1.second
       if test[:update][:ticket]
         ticket.update_attributes(test[:update][:ticket])
       end
@@ -196,7 +189,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
       test[:check][0][:o_id]          = organization.id
       test[:check][0][:created_at]    = organization.created_at
       test[:check][0][:created_by_id] = current_user.id
-      sleep 2
+      travel 2.seconds
 
       assert_equal(organization.class.to_s, 'Organization')
 
@@ -205,7 +198,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
         test[:check][1][:o_id]          = organization.id
         test[:check][1][:updated_at]    = organization.updated_at
         test[:check][1][:created_by_id] = current_user.id
-        sleep activity_record_delay - 1
+        travel 1.second
       end
 
       if test[:update2][:organization]
@@ -353,7 +346,7 @@ class ActivityStreamTest < ActiveSupport::TestCase
       end
 
       # to verify update which need to be logged
-      sleep activity_record_delay + 1
+      travel 1.second
 
       if test[:update2][:user]
         user.update_attributes(test[:update2][:user])

test/unit/assets_test.rb

@@ -84,7 +84,7 @@ class AssetsTest < ActiveSupport::TestCase
     assert( diff(attributes, assets[:User][user3.id]), 'check assets' )
 
     # touch org, check if user1 has changed
-    sleep 2
+    travel 2.seconds
     org2 = Organization.find(org.id)
     org2.note = "some note...#{rand(9_999_999_999_999)}"
     org2.save
@@ -232,7 +232,7 @@ class AssetsTest < ActiveSupport::TestCase
     assert_nil( assets[:User][user3.id], 'check assets' )
 
     # touch user 2, check if org has changed
-    sleep 2
+    travel 2.seconds
     user_new_2 = User.find(user2.id)
     user_new_2.lastname = 'assets2'
     user_new_2.save

test/unit/calendar_test.rb

@@ -19,7 +19,7 @@ class CalendarTest < ActiveSupport::TestCase
       updated_by_id: 1,
       created_by_id: 1,
     )
-    sleep 1
+    travel 1.second
     calendar2 = Calendar.create_or_update(
       name: 'US 2',
       timezone: 'America/Los_Angeles',

test/unit/chat_test.rb

@@ -208,19 +208,19 @@ class ChatTest < ActiveSupport::TestCase
       content: 'message 1',
       created_by_id: agent1.id,
     )
-    sleep 1
+    travel 1.second
     Chat::Message.create(
       chat_session_id: chat_session6.id,
       content: 'message 2',
       created_by_id: agent1.id,
     )
-    sleep 1
+    travel 1.second
     Chat::Message.create(
       chat_session_id: chat_session6.id,
       content: 'message 3',
       created_by_id: agent1.id,
     )
-    sleep 1
+    travel 1.second
     Chat::Message.create(
       chat_session_id: chat_session6.id,
       content: 'message 4',

test/unit/email_process_bounce_test.rb

@@ -27,7 +27,7 @@ class EmailProcessBounceTest < ActiveSupport::TestCase
       updated_by_id: 1,
       created_by_id: 1,
     )
-    sleep 1
+    travel 1.second
     email_raw_string = IO.binread('test/fixtures/mail33-undelivered-mail-returned-to-sender.box')
     ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string)
     assert_equal(ticket.id, ticket_p.id)

test/unit/email_process_follow_up_test.rb

@@ -84,45 +84,45 @@ no reference "
     setting_orig = Setting.get('postmaster_follow_up_search_in')
     Setting.set('postmaster_follow_up_search_in', %w(body attachment references))
 
-    sleep 1
+    travel 1.second
     ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string_subject)
     assert_equal(ticket.id, ticket_p.id)
 
-    sleep 1
+    travel 1.second
     ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string_body)
     assert_equal(ticket.id, ticket_p.id)
 
-    sleep 1
+    travel 1.second
     ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string_attachment)
     assert_equal(ticket.id, ticket_p.id)
 
-    sleep 1
+    travel 1.second
     ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string_references1)
     assert_equal(ticket.id, ticket_p.id)
 
-    sleep 1
+    travel 1.second
     ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string_references2)
     assert_equal(ticket.id, ticket_p.id)
 
     Setting.set('postmaster_follow_up_search_in', setting_orig)
 
-    sleep 1
+    travel 1.second
     ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string_subject)
     assert_equal(ticket.id, ticket_p.id)
 
-    sleep 1
+    travel 1.second
     ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string_body)
     assert_not_equal(ticket.id, ticket_p.id)
 
-    sleep 1
+    travel 1.second
     ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string_attachment)
     assert_not_equal(ticket.id, ticket_p.id)
 
-    sleep 1
+    travel 1.second
     ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string_references1)
     assert_not_equal(ticket.id, ticket_p.id)
 
-    sleep 1
+    travel 1.second
     ticket_p, article_p, user_p = Channel::EmailParser.new.process({}, email_raw_string_references2)
     assert_not_equal(ticket.id, ticket_p.id)
   end
@@ -141,7 +141,7 @@ test 123
 "
     ticket_p1, article_p1, user_p1 = Channel::EmailParser.new.process({}, data1)
 
-    sleep 1
+    travel 1.second
 
     data1 = "From: me@example.com
 To: z@example.com
@@ -193,7 +193,7 @@ test 123
       updated_by_id: 1,
       created_by_id: 1,
     )
-    sleep 1
+    travel 1.second
 
     # auto response without T# in subject, find follow up by references header
     email_raw_string = "From: bob@example.com
@@ -237,7 +237,7 @@ Some Text"
       updated_by_id: 1,
       created_by_id: 1,
     )
-    sleep 1
+    travel 1.second
 
     system_id           = Setting.get('system_id')
     ticket_hook         = Setting.get('ticket_hook')

test/unit/email_process_out_of_office_test.rb

@@ -27,7 +27,7 @@ class EmailProcessOutOfOfficeTest < ActiveSupport::TestCase
       updated_by_id: 1,
       created_by_id: 1,
     )
-    sleep 1
+    travel 1.second
 
     # exchange out of office example #1
     email_raw_string = "From: me@example.com
@@ -113,7 +113,7 @@ Some Text"
       updated_by_id: 1,
       created_by_id: 1,
     )
-    sleep 1
+    travel 1.second
 
     # exchange out of office example #1
     email_raw_string = "From: me@example.com
@@ -191,7 +191,7 @@ Some Text"
       updated_by_id: 1,
       created_by_id: 1,
     )
-    sleep 1
+    travel 1.second
 
     # exchange out of office example #1
     email_raw_string = "From: me@example.com
@@ -264,7 +264,7 @@ Some Text"
       updated_by_id: 1,
       created_by_id: 1,
     )
-    sleep 1
+    travel 1.second
 
     # gmail out of office example #1
     email_raw_string = "From: me@example.com

test/unit/karma_test.rb

@@ -329,7 +329,7 @@ class KarmaTest < ActiveSupport::TestCase
       item: 'Tag1',
       created_by_id: agent1.id,
     )
-    #sleep 5
+    #travel 5.seconds
     Tag.tag_add(
       object: 'Ticket',
       o_id: ticket1.id,

test/unit/organization_ref_object_touch_test.rb

@@ -81,7 +81,7 @@ class OrganizationRefObjectTouchTest < ActiveSupport::TestCase
     assert_equal(ticket.customer.id, customer1.id)
     assert_equal(ticket.organization.id, organization1.id)
 
-    sleep 4
+    travel 4.seconds
 
     organization1.name = 'Ref Object Update Org 1/1'
     organization1.save
@@ -101,7 +101,7 @@ class OrganizationRefObjectTouchTest < ActiveSupport::TestCase
       assert(false, 'customer1.updated_at has not been updated')
     end
 
-    sleep 4
+    travel 4.seconds
 
     customer2.organization_id = organization1.id
     customer2.save

test/unit/recent_view_test.rb

@@ -29,11 +29,11 @@ class RecentViewTest < ActiveSupport::TestCase
     RecentView.user_log_destroy(user1)
 
     RecentView.log(ticket1.class.to_s, ticket1.id, user1)
-    sleep 1
+    travel 1.second
     RecentView.log(ticket2.class.to_s, ticket2.id, user1)
-    sleep 1
+    travel 1.second
     RecentView.log(ticket1.class.to_s, ticket1.id, user1)
-    sleep 1
+    travel 1.second
     RecentView.log(ticket1.class.to_s, ticket1.id, user1)
 
     list = RecentView.list(user1)