Skip to content

Commit 65abea9

Browse files
authored
Fix(CI): tests (#437)
1 parent 5dbb249 commit 65abea9

2 files changed

Lines changed: 12 additions & 9 deletions

File tree

tests/Units/GroupEscalationTest.php

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -565,11 +565,10 @@ public function testTechGroupAttributionAddTicket()
565565
],
566566
]);
567567

568-
$ticket_user = new Ticket_User();
569-
$this->assertEquals($provider['add_expected']['user_ticket'], count($ticket_user->find(['tickets_id' => $ticket->getID(), 'type' => CommonITILActor::ASSIGN])));
568+
$this->assertEquals($provider['add_expected']['user_ticket'], countElementsInTable(Ticket_User::getTable(), ['tickets_id' => $ticket->getID(), 'type' => CommonITILActor::ASSIGN]));
570569

571570
$group_ticket = new Group_Ticket();
572-
$this->assertEquals($provider['add_expected']['group_ticket'], count($group_ticket->find(['tickets_id' => $ticket->getID(), 'type' => CommonITILActor::ASSIGN])));
571+
$this->assertEquals($provider['add_expected']['group_ticket'], countElementsInTable(Group_Ticket::getTable(), ['tickets_id' => $ticket->getID(), 'type' => CommonITILActor::ASSIGN]));
573572

574573
if ($provider['conf']['use_assign_user_group_creation'] === 1) {
575574
$group = $group_ticket->getFromDBByCrit(['tickets_id' => $ticket->getID(), 'type' => CommonITILActor::ASSIGN]);
@@ -620,18 +619,18 @@ public function testTechGroupAttributionAddTicket()
620619
],
621620
);
622621

623-
$this->assertEquals($provider['update_expected']['user_ticket'], count($ticket_user->find(['tickets_id' => $ticket->getID(), 'type' => CommonITILActor::ASSIGN])), 'Failed with config: ' . json_encode($provider['conf']));
624-
$this->assertEquals($provider['update_expected']['group_ticket'], count($group_ticket->find(['tickets_id' => $ticket->getID(), 'type' => CommonITILActor::ASSIGN])), 'Failed with config: ' . json_encode($provider['conf']));
622+
$this->assertEquals($provider['update_expected']['user_ticket'], countElementsInTable(Ticket_User::getTable(), ['tickets_id' => $ticket->getID(), 'type' => CommonITILActor::ASSIGN]), 'Failed with config: ' . json_encode($provider['conf']));
623+
$this->assertEquals($provider['update_expected']['group_ticket'], countElementsInTable(Group_Ticket::getTable(), ['tickets_id' => $ticket->getID(), 'type' => CommonITILActor::ASSIGN]), 'Failed with config: ' . json_encode($provider['conf']));
625624

626625
if ($provider['conf']['use_assign_user_group_modification'] === 1) {
627626
if ($provider['conf']['use_assign_user_group'] === 1) {
628627
$group = $group_ticket->getFromDBByCrit(['tickets_id' => $ticket->getID(), 'type' => CommonITILActor::ASSIGN, 'groups_id' => $group2->getID()]);
629-
$this->assertTrue($group);
628+
$this->assertTrue($group, 'Failed with config: ' . json_encode($provider['conf']));
630629
}
631630

632631
if ($provider['conf']['use_assign_user_group'] === 2) {
633632
$group = $group_ticket->getFromDBByCrit(['tickets_id' => $ticket->getID(), 'type' => CommonITILActor::ASSIGN, 'groups_id' => $group4->getID()]);
634-
$this->assertTrue($group);
633+
$this->assertTrue($group, 'Failed with config: ' . json_encode($provider['conf']));
635634
}
636635
}
637636
}

tests/Units/TicketTest.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -872,6 +872,8 @@ public function testAddSolutionWithMandatoryTemplateFields()
872872
'name' => 'test_requester',
873873
'realname' => 'Test Requester',
874874
'firstname' => 'User',
875+
'_entities_id' => 0,
876+
'_profiles_id' => 4,
875877
]);
876878
$user_id = $user->getID();
877879

@@ -1001,7 +1003,8 @@ public function testAssignMeWithMandatoryTemplateFields()
10011003
$requester = $this->createItem('User', [
10021004
'name' => 'requester_test',
10031005
'firstname' => 'Requester',
1004-
'entities_id' => 0,
1006+
'_entities_id' => 0,
1007+
'_profiles_id' => 4,
10051008
]);
10061009
$requester_id = $requester->getID();
10071010
$this->assertGreaterThan(0, $requester_id);
@@ -1164,7 +1167,8 @@ public function testHistoryButtonEscalationWithMandatoryTemplateFields()
11641167
$requester = $this->createItem('User', [
11651168
'name' => 'requester_history_test',
11661169
'firstname' => 'Requester',
1167-
'entities_id' => 0,
1170+
'_entities_id' => 0,
1171+
'_profiles_id' => 4,
11681172
]);
11691173
$requester_id = $requester->getID();
11701174
$this->assertGreaterThan(0, $requester_id);

0 commit comments

Comments
 (0)