PCHR-3820: Refactor some tests. Fix typo.

compucorp · Jun 13, 2018 · 20d8441 · 20d8441
1 parent 6229df3
commit 20d8441
Showing 1 changed file with 12 additions and 14 deletions.
diff --git a/...veandabsences/tests/phpunit/CRM/HRLeaveAndAbsences/Service/LeaveRequestAttachmentTest.php b/...veandabsences/tests/phpunit/CRM/HRLeaveAndAbsences/Service/LeaveRequestAttachmentTest.php
@@ -53,10 +53,7 @@ public function testDeleteShouldThrowAnExceptionWhenLoggedInUserIsNotAnAdminOrLe
   public function testDeleteShouldDeleteAttachmentWhenLoggedInUserIsAnAdmin() {
     $params = $this->getDefaultLeaveRequestParams();
     $leaveRequest = LeaveRequestFabricator::fabricateWithoutValidation($params);
-
-    $leaveManagerService = $this->getLeaveManagerServiceWhenUserIsAdmin();
-    $leaveRequestRights = new LeaveRightsService($leaveManagerService);
-    $leaveRequestAttachmentService = new LeaveRequestAttachmentService($leaveRequestRights, $leaveManagerService);
+    $leaveRequestAttachmentService = $this->createLeaveRequestAttachmentsServiceWhenUserIsAdmin();
 
     $attachment = $this->createAttachmentForLeaveRequest(['entity_id' => $leaveRequest->id]);
     $attachment2 = $this->createAttachmentForLeaveRequest(['entity_id' => $leaveRequest->id]);
@@ -112,10 +109,7 @@ public function testDeleteShouldDeleteAttachmentWhenLoggedInUserIsTheLeaveApprov
   public function testDeleteShouldThrowAnExceptionWhenAttachmentHasBeenDeletedBefore() {
     $params = $this->getDefaultLeaveRequestParams();
     $leaveRequest = LeaveRequestFabricator::fabricateWithoutValidation($params);
-
-    $leaveManagerService = $this->getLeaveManagerServiceWhenUserIsAdmin();
-    $leaveRequestRights = new LeaveRightsService($leaveManagerService);
-    $leaveRequestAttachmentService = new LeaveRequestAttachmentService($leaveRequestRights, $leaveManagerService);
+    $leaveRequestAttachmentService = $this->createLeaveRequestAttachmentsServiceWhenUserIsAdmin();
 
     $attachment = $this->createAttachmentForLeaveRequest(['entity_id' => $leaveRequest->id]);
 
@@ -132,10 +126,7 @@ public function testDeleteShouldThrowAnExceptionWhenAttachmentHasBeenDeletedBefo
    */
   public function testDeleteShouldThrowAnExceptionWhenAttachmentDoesNotExist() {
     $leaveRequestID = 1;
-
-    $leaveManagerService = $this->getLeaveManagerServiceWhenUserIsAdmin();
-    $leaveRequestRights = new LeaveRightsService($leaveManagerService);
-    $leaveRequestAttachmentService = new LeaveRequestAttachmentService($leaveRequestRights, $leaveManagerService);
+    $leaveRequestAttachmentService = $this->createLeaveRequestAttachmentsServiceWhenUserIsAdmin();
 
     $leaveRequestAttachmentService->delete(['leave_request_id' => $leaveRequestID, 'attachment_id' => 1]);
   }
@@ -204,7 +195,6 @@ public function testGetReturnsLeaveAttachmentDataOnlyForAllContactsForAdmin() {
     $attachment1 = $this->createAttachmentForLeaveRequest(['entity_id' => $leaveRequest1->id]);
     $attachment2 = $this->createAttachmentForLeaveRequest(['entity_id' => $leaveRequest2->id]);
 
-
     $leaveManagerService = $this->getLeaveManagerServiceWhenUserIsAdmin();
     $leaveRightsService = $this->prophesize(LeaveRightsService::class);
     $leaveRightsService->getLeaveContactsCurrentUserHasAccessTo()->willReturn([]);
@@ -218,7 +208,7 @@ public function testGetReturnsLeaveAttachmentDataOnlyForAllContactsForAdmin() {
     $this->assertEquals($staff1Attachment['values'][0]['id'], $attachment1['id']);
     $this->assertEquals($staff1Attachment['values'][0]['name'], $attachment1['name']);
 
-    $this->assertCount(1, $staff1Attachment['values']);
+    $this->assertCount(1, $staff2Attachment['values']);
     $this->assertEquals($staff2Attachment['values'][0]['id'], $attachment2['id']);
     $this->assertEquals($staff2Attachment['values'][0]['name'], $attachment2['name']);
   }
@@ -241,4 +231,12 @@ private function getLeaveManagerServiceWhenUserIsAdmin() {
   private function getLeaveManagerServiceWhenUserIsLeaveApprover($leaveContact) {
    return $this->getLeaveManagerService(FALSE, $leaveContact);
   }
+
+  private function createLeaveRequestAttachmentsServiceWhenUserIsAdmin() {
+    $leaveManagerService = $this->getLeaveManagerServiceWhenUserIsAdmin();
+    $leaveRequestRights = new LeaveRightsService($leaveManagerService);
+    $leaveRequestAttachmentService = new LeaveRequestAttachmentService($leaveRequestRights, $leaveManagerService);
+
+    return $leaveRequestAttachmentService;
+  }
 }