Moved to new mini test 6 changes.

test/unit/chat_test.rb

@@ -242,7 +242,7 @@ class ChatTest < ActiveSupport::TestCase
     assert_equal('message 3', customer_state[:session][2]['content'])
     assert_equal('message 4', customer_state[:session][3]['content'])
     assert_equal('Notification Agent1', customer_state[:agent][:name])
-    assert_equal(nil, customer_state[:agent][:avatar])
+    assert_nil(customer_state[:agent][:avatar])
 
     # check agent1 state
     agent_state = Chat.agent_state_with_sessions(agent1.id)

test/unit/cti_caller_id_test.rb

@@ -194,7 +194,7 @@ Mob: +49 333 1112222",
     assert_equal(1, caller_ids.length)
     assert_equal('maybe', caller_ids[0].level)
     assert_equal(2, caller_ids[0].user_id)
-    assert_equal(nil, caller_ids[0].comment)
+    assert_nil(caller_ids[0].comment)
 
     Cti::CallerId.maybe_add(
       caller_id: '4912345678901',
@@ -208,7 +208,7 @@ Mob: +49 333 1112222",
     assert_equal(1, caller_ids.length)
     assert_equal('maybe', caller_ids[0].level)
     assert_equal(2, caller_ids[0].user_id)
-    assert_equal(nil, caller_ids[0].comment)
+    assert_nil(caller_ids[0].comment)
 
     Cti::CallerId.maybe_add(
       caller_id: '4912345678901',
@@ -222,10 +222,10 @@ Mob: +49 333 1112222",
     assert_equal(2, caller_ids.length)
     assert_equal('maybe', caller_ids[0].level)
     assert_equal(3, caller_ids[0].user_id)
-    assert_equal(nil, caller_ids[0].comment)
+    assert_nil(caller_ids[0].comment)
     assert_equal('maybe', caller_ids[1].level)
     assert_equal(2, caller_ids[1].user_id)
-    assert_equal(nil, caller_ids[1].comment)
+    assert_nil(caller_ids[1].comment)
 
     Cti::CallerId.maybe_add(
       caller_id: '4912345678901',
@@ -239,7 +239,7 @@ Mob: +49 333 1112222",
     assert_equal(1, caller_ids.length)
     assert_equal('known', caller_ids[0].level)
     assert_equal(3, caller_ids[0].user_id)
-    assert_equal(nil, caller_ids[0].comment)
+    assert_nil(caller_ids[0].comment)
 
   end
 end

test/unit/email_build_test.rb

@@ -70,13 +70,13 @@ class EmailBuildTest < ActiveSupport::TestCase
     if data[:attachments]
       data[:attachments].each { |attachment|
         if attachment[:filename] == 'message.html'
-          assert_equal(nil, attachment[:preferences]['Content-ID'])
+          assert_nil(attachment[:preferences]['Content-ID'])
           assert_equal(true, attachment[:preferences]['content-alternative'])
           assert_equal('text/html', attachment[:preferences]['Mime-Type'])
           assert_equal('UTF-8', attachment[:preferences]['Charset'])
         elsif attachment[:filename] == 'somename.png'
-          assert_equal(nil, attachment[:preferences]['Content-ID'])
-          assert_equal(nil, attachment[:preferences]['content-alternative'])
+          assert_nil(attachment[:preferences]['Content-ID'])
+          assert_nil(attachment[:preferences]['content-alternative'])
           assert_equal('image/png', attachment[:preferences]['Mime-Type'])
           assert_equal('UTF-8', attachment[:preferences]['Charset'])
         else
@@ -109,7 +109,7 @@ class EmailBuildTest < ActiveSupport::TestCase
 > Thank you for installing Zammad. äöüß
 >'
     assert_equal(should, mail.text_part.body.to_s)
-    assert_equal(nil, mail.html_part)
+    assert_nil(mail.html_part)
 
     parser = Channel::EmailParser.new
     data = parser.parse(mail.to_s)
@@ -124,8 +124,8 @@ class EmailBuildTest < ActiveSupport::TestCase
     if data[:attachments]
       data[:attachments].each { |attachment|
         if attachment[:filename] == 'somename.png'
-          assert_equal(nil, attachment[:preferences]['Content-ID'])
-          assert_equal(nil, attachment[:preferences]['content-alternative'])
+          assert_nil(attachment[:preferences]['Content-ID'])
+          assert_nil(attachment[:preferences]['content-alternative'])
           assert_equal('image/png', attachment[:preferences]['Mime-Type'])
           assert_equal('UTF-8', attachment[:preferences]['Charset'])
         else
@@ -151,7 +151,7 @@ class EmailBuildTest < ActiveSupport::TestCase
 > Thank you for installing Zammad. äöüß
 >'
     assert_equal(should, mail.body.to_s)
-    assert_equal(nil, mail.html_part)
+    assert_nil(mail.html_part)
 
     parser = Channel::EmailParser.new
     data = parser.parse(mail.to_s)

test/unit/integration_icinga_test.rb

@@ -222,7 +222,7 @@ Comment: [] =
     assert_equal('icinga', ticket_3.preferences['integration'])
     assert(ticket_3.preferences['icinga'])
     assert_equal('apn4711.dc.example.com', ticket_3.preferences['icinga']['host'])
-    assert_equal(nil, ticket_3.preferences['icinga']['service'])
+    assert_nil(ticket_3.preferences['icinga']['service'])
     assert_equal('DOWN', ticket_3.preferences['icinga']['state'])
     assert_not_equal(ticket_3.id, ticket_1.id)
 
@@ -258,7 +258,7 @@ Comment: [] =
     assert_equal('icinga', ticket_3_1.preferences['integration'])
     assert(ticket_3_1.preferences['icinga'])
     assert_equal('apn4711.dc.example.com', ticket_3.preferences['icinga']['host'])
-    assert_equal(nil, ticket_3_1.preferences['icinga']['service'])
+    assert_nil(ticket_3_1.preferences['icinga']['service'])
     assert_equal('DOWN', ticket_3_1.preferences['icinga']['state'])
 
     #Setting.set('icinga_integration', false)

test/unit/integration_nagios_test.rb

@@ -208,7 +208,7 @@ Comment: [] =
     assert_equal('nagios', ticket_3.preferences['integration'])
     assert(ticket_3.preferences['nagios'])
     assert_equal('apn4711.dc.example.com', ticket_3.preferences['nagios']['host'])
-    assert_equal(nil, ticket_3.preferences['nagios']['service'])
+    assert_nil(ticket_3.preferences['nagios']['service'])
     assert_equal('DOWN', ticket_3.preferences['nagios']['state'])
     assert_not_equal(ticket_3.id, ticket_1.id)
 
@@ -244,7 +244,7 @@ Comment: [] =
     assert_equal('nagios', ticket_3_1.preferences['integration'])
     assert(ticket_3_1.preferences['nagios'])
     assert_equal('apn4711.dc.example.com', ticket_3.preferences['nagios']['host'])
-    assert_equal(nil, ticket_3_1.preferences['nagios']['service'])
+    assert_nil(ticket_3_1.preferences['nagios']['service'])
     assert_equal('DOWN', ticket_3_1.preferences['nagios']['state'])
 
     #Setting.set('nagios_integration', false)

test/unit/notification_factory_mailer_test.rb

@@ -187,14 +187,14 @@ class NotificationFactoryMailerTest < ActiveSupport::TestCase
     assert_equal(true, result[:channels][:email])
 
     result = NotificationFactory::Mailer.notification_settings(agent2, ticket2, 'create')
-    assert_equal(nil, result)
+    assert_nil(result)
 
     result = NotificationFactory::Mailer.notification_settings(agent2, ticket3, 'create')
     assert_equal(true, result[:channels][:online])
     assert_equal(true, result[:channels][:email])
 
     result = NotificationFactory::Mailer.notification_settings(agent2, ticket4, 'create')
-    assert_equal(nil, result)
+    assert_nil(result)
 
     # no group selection
     agent1.preferences[:notification_config][:group_ids] = []
@@ -224,14 +224,14 @@ class NotificationFactoryMailerTest < ActiveSupport::TestCase
     assert_equal(true, result[:channels][:email])
 
     result = NotificationFactory::Mailer.notification_settings(agent2, ticket2, 'create')
-    assert_equal(nil, result)
+    assert_nil(result)
 
     result = NotificationFactory::Mailer.notification_settings(agent2, ticket3, 'create')
     assert_equal(true, result[:channels][:online])
     assert_equal(true, result[:channels][:email])
 
     result = NotificationFactory::Mailer.notification_settings(agent2, ticket4, 'create')
-    assert_equal(nil, result)
+    assert_nil(result)
 
     agent1.preferences[:notification_config][:group_ids] = ['-']
     agent1.save
@@ -260,14 +260,14 @@ class NotificationFactoryMailerTest < ActiveSupport::TestCase
     assert_equal(true, result[:channels][:email])
 
     result = NotificationFactory::Mailer.notification_settings(agent2, ticket2, 'create')
-    assert_equal(nil, result)
+    assert_nil(result)
 
     result = NotificationFactory::Mailer.notification_settings(agent2, ticket3, 'create')
     assert_equal(true, result[:channels][:online])
     assert_equal(true, result[:channels][:email])
 
     result = NotificationFactory::Mailer.notification_settings(agent2, ticket4, 'create')
-    assert_equal(nil, result)
+    assert_nil(result)
 
     # dedecated group selection
     agent1.preferences[:notification_config][:group_ids] = [Group.lookup(name: 'Users').id]
@@ -282,7 +282,7 @@ class NotificationFactoryMailerTest < ActiveSupport::TestCase
     assert_equal(true, result[:channels][:email])
 
     result = NotificationFactory::Mailer.notification_settings(agent1, ticket3, 'create')
-    assert_equal(nil, result)
+    assert_nil(result)
 
     result = NotificationFactory::Mailer.notification_settings(agent1, ticket4, 'create')
     assert_equal(true, result[:channels][:online])
@@ -296,14 +296,14 @@ class NotificationFactoryMailerTest < ActiveSupport::TestCase
     assert_equal(true, result[:channels][:email])
 
     result = NotificationFactory::Mailer.notification_settings(agent2, ticket2, 'create')
-    assert_equal(nil, result)
+    assert_nil(result)
 
     result = NotificationFactory::Mailer.notification_settings(agent2, ticket3, 'create')
-    assert_equal(nil, result)
-    assert_equal(nil, result)
+    assert_nil(result)
+    assert_nil(result)
 
     result = NotificationFactory::Mailer.notification_settings(agent2, ticket4, 'create')
-    assert_equal(nil, result)
+    assert_nil(result)
 
   end
 

test/unit/object_create_update_with_ref_name_test.rb

@@ -118,7 +118,7 @@ class ObjectCreateUpdateWithRefNameTest < ActiveSupport::TestCase
     assert(user1.role_ids.include?(agent_role.id))
     assert_not(user1.role_ids.include?(customer_role.id))
 
-    assert_equal(nil, user2.organization_id)
+    assert_nil(user2.organization_id)
     assert_not(user2.group_ids.include?(users_group.id))
     assert_not(user2.role_ids.include?(admin_role.id))
     assert_not(user2.role_ids.include?(agent_role.id))

test/unit/object_manager_test.rb

@@ -655,10 +655,10 @@ class ObjectManagerTest < ActiveSupport::TestCase
     assert_equal('some attribute test2', ticket2.title)
     assert_equal('Users', ticket2.group.name)
     assert_equal('new', ticket2.state.name)
-    assert_equal(nil, ticket2[:attribute1])
-    assert_equal(nil, ticket2[:attribute2])
-    assert_equal(nil, ticket2[:attribute3])
-    assert_equal(nil, ticket2[:attribute4])
+    assert_nil(ticket2[:attribute1])
+    assert_nil(ticket2[:attribute2])
+    assert_nil(ticket2[:attribute3])
+    assert_nil(ticket2[:attribute4])
 
   end
 

test/unit/organization_domain_based_assignment_test.rb

@@ -58,7 +58,7 @@ class OrganizationDomainBasedAssignmentTest < ActiveSupport::TestCase
       updated_by_id: 1,
       created_by_id: 1,
     )
-    assert_equal(nil, customer3.organization_id)
+    assert_nil(customer3.organization_id)
 
     customer4 = User.create_or_update(
       login: 'organization-based_assignment-customer4',
@@ -71,7 +71,7 @@ class OrganizationDomainBasedAssignmentTest < ActiveSupport::TestCase
       updated_by_id: 1,
       created_by_id: 1,
     )
-    assert_equal(nil, customer4.organization_id)
+    assert_nil(customer4.organization_id)
 
   end
 

test/unit/session_basic_test.rb

@@ -41,7 +41,7 @@ class SessionBasicTest < ActiveSupport::TestCase
     assert_equal(true, result, 'check 2')
 
     result = Sessions::CacheIn.get('last_run_test')
-    assert_equal(nil, result, 'check 2')
+    assert_nil(result, 'check 2')
 
     # check delete cache
     Sessions::CacheIn.set('last_run_delete', true, { expires_in: 5.seconds })
@@ -49,7 +49,7 @@ class SessionBasicTest < ActiveSupport::TestCase
     assert_equal(true, result, 'check 1')
     Sessions::CacheIn.delete('last_run_delete')
     result = Sessions::CacheIn.get('last_run_delete')
-    assert_equal(nil, nil, 'check delete')
+    assert_nil(result, 'check delete')
     travel_back
   end
 
@@ -84,7 +84,7 @@ class SessionBasicTest < ActiveSupport::TestCase
     data = Sessions.get(client_id1)
     assert(data[:meta], 'check if meta exists')
     assert(data[:user], 'check if user exists')
-    assert_equal(data[:user]['id'], nil, 'check if user id is correct')
+    assert_nil(data[:user]['id'], 'check if user id is correct')
 
     # recreate session
     Sessions.create(client_id1, agent1.attributes, { type: 'websocket' })