Merge pull request #2511 from civicrm/staging

Sync master with staging

bin/drush-install.sh

@@ -45,7 +45,11 @@ CIVI_PATH=$1
 shift
 
 set -ex
-drush "$@" cvapi extension.install keys=$CORE_EXTS,$ENTITY_EXTS,$APP_EXTS
+drush "$@" cvapi extension.install keys=$CORE_EXTS
+drush cvapi Extension.refresh
+drush "$@" cvapi extension.install keys=$ENTITY_EXTS
+drush cvapi Extension.refresh
+drush "$@" cvapi extension.install keys=$APP_EXTS
 set +ex
 
 if [ "$WITH_HR_SAMPLE" == "1" ]; then

uk.co.compucorp.civicrm.hrleaveandabsences/js/angular/src/leave-absences/shared/controllers/request.controller.js

@@ -443,6 +443,7 @@ define([
      */
     function initAfterContactSelection () {
       vm.postContactSelection = true;
+      vm.staffMemberSelectionComplete = false;
 
       // when manager deselects contact it is called without a selected contact_id
       if (!vm.request.contact_id) {

uk.co.compucorp.civicrm.hrleaveandabsences/js/angular/test/shared/controllers/request.controller.spec.js

@@ -790,7 +790,27 @@
           expect(AbsenceTypeAPI.all).not.toHaveBeenCalled();
         });
 
+        describe('before contact is selected', function () {
+          it('sets post contact selection as false', function () {
+            expect(controller.postContactSelection).toBe(false);
+          });
+
+          it('sets staff member selection as false', function () {
+            expect(controller.staffMemberSelectionComplete).toBe(false);
+          });
+        });
+
         describe('after contact is selected', function () {
+          describe('when loading entitlements for the staff', function () {
+            beforeEach(function () {
+              controller.initAfterContactSelection();
+            });
+
+            it('sets post contact selection as true', function () {
+              expect(controller.postContactSelection).toBe(true);
+            });
+          });
+
           describe('when entitlement is present', function () {
             var approvalStatus;
 
@@ -817,6 +837,14 @@
               expect(controller.newStatusOnSave).toEqual(approvalStatus);
             });
 
+            it('sets post contact selection back to false', function () {
+              expect(controller.postContactSelection).toBe(false);
+            });
+
+            it('sets staff member selection as true', function () {
+              expect(controller.staffMemberSelectionComplete).toBe(true);
+            });
+
             describe('cancelled status', function () {
               var cancelStatus, availableStatuses;
 
@@ -829,6 +857,30 @@
                 expect(availableStatuses).not.toContain(cancelStatus);
               });
             });
+
+            describe('and then select a staff without entitlements', function () {
+              beforeEach(function () {
+                EntitlementAPI.all.and.returnValue($q.resolve([]));
+                controller.initAfterContactSelection();
+                $scope.$digest();
+              });
+
+              it('sets staff member selection complete as false', function () {
+                expect(controller.staffMemberSelectionComplete).toBe(false);
+              });
+            });
+          });
+
+          describe('when no entitlements are present', function () {
+            beforeEach(function () {
+              EntitlementAPI.all.and.returnValue($q.resolve([]));
+              controller.initAfterContactSelection();
+              $scope.$digest();
+            });
+
+            it('sets staff member selection complete as false', function () {
+              expect(controller.staffMemberSelectionComplete).toBe(false);
+            });
           });
         });