Merge branch 'staging' into PCHR-3997-allow-own-leave-approver

compucorp · Jul 30, 2018 · e1bee09 · e1bee09
2 parents ce5c991 + f2a12db
commit e1bee09
Show file tree

Hide file tree

Showing 100 changed files with 11,949 additions and 9,401 deletions.
diff --git a/contactaccessrights/js/dist/access-rights.min.js b/contactaccessrights/js/dist/access-rights.min.js
diff --git a/contactsummary/js/dist/contact-summary.min.js b/contactsummary/js/dist/contact-summary.min.js
diff --git a/contactsummary/js/test/controllers/key-dates.controller.spec.js b/contactsummary/js/test/controllers/key-dates.controller.spec.js
@@ -14,7 +14,7 @@ define([
     var $httpBackend, $rootScope, $q, contractServiceMock, controller, ctrlConstructor,
       jobRoleServiceMock, pubSub;
 
-    beforeEach(module('contactsummary', 'contactsummary.mocks'));
+    beforeEach(module('contactsummary', 'contactsummary.mocks', 'contact-summary.templates'));
 
     beforeEach(module(function ($provide) {
       $provide.factory('contractService', function () {

diff --git a/hrjobcontract/js/test/controllers/form/form-general.controller.spec.js b/hrjobcontract/js/test/controllers/form/form-general.controller.spec.js
@@ -10,20 +10,23 @@ define([
   'use strict';
 
   describe('FormGeneralController', function () {
-    var $controller, $provide, $rootScope, $scope;
+    var $controller, $httpBackend, $provide, $rootScope, $scope;
 
     beforeEach(function () {
-      module('job-contract', 'common.mocks', function (_$provide_) {
+      module('job-contract', 'job-contract.templates', 'common.mocks', function (_$provide_) {
         $provide = _$provide_;
       });
       inject(['HR_settingsMock', function (hrSettingsMock) {
         $provide.value('HR_settings', hrSettingsMock);
       }]);
     });
 
-    beforeEach(inject(function (_$controller_, _$rootScope_) {
+    beforeEach(inject(function (_$controller_, _$httpBackend_, _$rootScope_) {
       $controller = _$controller_;
+      $httpBackend = _$httpBackend_;
       $rootScope = _$rootScope_;
+
+      $httpBackend.whenGET(/action=get&entity=HRJobContract/).respond(200);
     }));
 
     describe('Min and max allowed dates', function () {

diff --git a/hrjobcontract/js/test/controllers/form/form-hour.controller.spec.js b/hrjobcontract/js/test/controllers/form/form-hour.controller.spec.js
@@ -8,7 +8,7 @@ define([
   'use strict';
 
   describe('FormHourController', function () {
-    var $controller, $rootScope, $scope;
+    var $controller, $httpBackend, $rootScope, $scope;
     var entityData = {
       'hour': {
         'id': '1',
@@ -23,13 +23,14 @@ define([
       }
     };
 
-    beforeEach(module('job-contract'));
-    beforeEach(function () {
-      inject(function (_$controller_, _$rootScope_) {
-        $controller = _$controller_;
-        $rootScope = _$rootScope_;
-      });
-    });
+    beforeEach(module('job-contract', 'job-contract.templates'));
+    beforeEach(inject(function (_$controller_, _$httpBackend_, _$rootScope_) {
+      $controller = _$controller_;
+      $httpBackend = _$httpBackend_;
+      $rootScope = _$rootScope_;
+
+      $httpBackend.whenGET(/action=get&entity=HRJobContract/).respond(200);
+    }));
 
     describe('init', function () {
       describe('when no existing data is passed to the form', function () {

diff --git a/hrjobcontract/js/test/controllers/form/form-leave.controller.spec.js b/hrjobcontract/js/test/controllers/form/form-leave.controller.spec.js
@@ -6,12 +6,13 @@ define([
   'use strict';
 
   describe('FormLeaveController', function () {
-    var ctrl, $controller, $rootScope, $scope, utilsService;
+    var ctrl, $controller, $httpBackend, $rootScope, $scope, utilsService;
 
-    beforeEach(module('job-contract'));
+    beforeEach(module('job-contract', 'job-contract.templates'));
 
-    beforeEach(inject(function (_$controller_, _$rootScope_, _utilsService_, $q) {
+    beforeEach(inject(function (_$controller_, _$httpBackend_, _$rootScope_, _utilsService_, $q) {
       $controller = _$controller_;
+      $httpBackend = _$httpBackend_;
       $rootScope = _$rootScope_;
       utilsService = _utilsService_;
 
@@ -23,6 +24,7 @@ define([
         return deferred.promise;
       });
 
+      $httpBackend.whenGET(/action=get&entity=HRJobContract/).respond(200);
       initController();
     }));
 

diff --git a/hrjobcontract/js/test/controllers/form/form-pension.controller.spec.js b/hrjobcontract/js/test/controllers/form/form-pension.controller.spec.js
@@ -7,20 +7,23 @@ define([
   'use strict';
 
   describe('FormPensionController', function () {
-    var $controller, $rootScope, $scope, $q, contactService, response, params;
+    var $controller, $httpBackend, $rootScope, $scope, $q, contactService, response, params;
 
-    beforeEach(module('job-contract'));
+    beforeEach(module('job-contract', 'job-contract.templates'));
 
     beforeEach(function () {
-      inject(function (_$controller_, _$rootScope_, _$q_, _contactService_) {
+      inject(function (_$controller_, _$httpBackend_, _$rootScope_, _$q_, _contactService_) {
         $controller = _$controller_;
+        $httpBackend = _$httpBackend_;
         $rootScope = _$rootScope_;
         contactService = _contactService_;
         $q = _$q_;
         params = {
           contact_type: 'Organization',
           contact_sub_type: 'Life_Insurance_Provider'
         };
+
+        $httpBackend.whenGET(/action=get&entity=HRJobContract/).respond(200);
         contactServiceSpy();
       });
     });

diff --git a/hrjobcontract/js/test/services/contract-details.service.spec.js b/hrjobcontract/js/test/services/contract-details.service.spec.js
@@ -15,6 +15,7 @@ define([
       $httpBackend = _$httpBackend_;
       $rootScope = _$rootScope_;
 
+      $httpBackend.whenGET(/action=get&entity=HRJobContract/).respond(200);
       $httpBackend.whenGET(/action=get&entity=HRJobDetails/).respond(MockContract.contract);
       $httpBackend.whenGET(/views.*/).respond({});
     }));

diff --git a/hrjobcontract/js/test/services/contract-health.service.spec.js b/hrjobcontract/js/test/services/contract-health.service.spec.js
@@ -12,13 +12,14 @@ define([
 
     beforeEach(module('job-contract'));
     beforeEach(inject(function (_contractHealthService_, _$httpBackend_,
-    _$rootScope_) {
+      _$rootScope_) {
       contractHealthService = _contractHealthService_;
       $httpBackend = _$httpBackend_;
       $rootScope = _$rootScope_;
     }));
 
     beforeEach(function () {
+      $httpBackend.whenGET(/action=get&entity=HRJobContract/).respond(200);
       $httpBackend.whenGET(/action=get&entity=HRJobHealth/).respond(ContractMock.contractRevision);
       $httpBackend.whenGET(/action=getoptions&entity=HRJobHealth/).respond(InsuranceMock);
       $httpBackend.whenGET(/views.*/).respond({});

diff --git a/hrjobcontract/js/test/services/contract-hour.service.spec.js b/hrjobcontract/js/test/services/contract-hour.service.spec.js
@@ -15,6 +15,7 @@ define([
       $httpBackend = _$httpBackend_;
       $rootScope = _$rootScope_;
 
+      $httpBackend.whenGET(/action=get&entity=HRJobContract/).respond(200);
       $httpBackend.whenGET(/action=get&entity=HRJobHour/).respond(MockContract.contractHour);
       $httpBackend.whenGET(/views.*/).respond({});
     }));

diff --git a/hrjobcontract/js/test/services/contract-leave.service.spec.js b/hrjobcontract/js/test/services/contract-leave.service.spec.js
@@ -78,6 +78,7 @@ define([
      * Mocks back-end API calls
      */
     function mockBackendCalls () {
+      $httpBackend.whenGET(/action=get&entity=HRJobContract/).respond(200);
       $httpBackend.whenGET(/action=get&entity=HRJobLeave/).respond(MockContract.contractLeaves);
       $httpBackend.whenGET(/action=getfields&entity=HRJobLeave/).respond({ values: [] });
       $httpBackend.whenGET(/views.*/).respond({});

diff --git a/hrjobcontract/js/test/services/contract-pay.service.spec.js b/hrjobcontract/js/test/services/contract-pay.service.spec.js
@@ -15,8 +15,8 @@ define([
       $httpBackend = _$httpBackend_;
       $rootScope = _$rootScope_;
 
-      $httpBackend.whenGET(/action=get&entity=HRJobContract/).respond(MockContract.contractPayment);
-      $httpBackend.whenGET(/action=get&entity=HRJobPay/).respond({});
+      $httpBackend.whenGET(/action=get&entity=HRJobContract/).respond(200);
+      $httpBackend.whenGET(/action=get&entity=HRJobPay/).respond(MockContract.contractPayment);
       $httpBackend.whenGET(/views.*/).respond({});
     }));
 

diff --git a/hrjobcontract/js/test/services/contract-pension.service.spec.js b/hrjobcontract/js/test/services/contract-pension.service.spec.js
@@ -16,6 +16,7 @@ define([
       $httpBackend = _$httpBackend_;
       $rootScope = _$rootScope_;
 
+      $httpBackend.whenGET(/action=get&entity=HRJobContract/).respond(200);
       $httpBackend.whenGET(/action=get&entity=HRJobPension/).respond(MockContract.contractPension);
       $httpBackend.whenGET(/views.*/).respond({});
     }));