Merge pull request #106 from OpenLMIS-Angola/OAM-45-fixTestsIssues

OAM-45: fixed test issues
OpenLMIS-Angola · Jun 3, 2024 · 726ad10 · 726ad10
2 parents 88b70c9 + 5455749
commit 726ad10
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 7 deletions.
diff --git a/src/admin-facility-view/facility-view.controller.js b/src/admin-facility-view/facility-view.controller.js
@@ -328,7 +328,6 @@
             var newWard = angular.copy(vm.newWard);
 
             newWard.code = vm.generateWardCode(vm.facility.code);
-            console.log(newWard.type.code);
 
             vm.addedWards.push(newWard);
 

diff --git a/src/admin-facility-view/facility-view.controller.spec.js b/src/admin-facility-view/facility-view.controller.spec.js
@@ -262,7 +262,7 @@ describe('FacilityViewController', function() {
             };
             this.vm.newWard = {
                 enabled: true,
-                active: true
+                active: false
             };
             spyOn(this.vm, 'generateWardCode').andReturn('generated-code');
         });
@@ -290,7 +290,7 @@ describe('FacilityViewController', function() {
 
             expect(this.vm.newWard).toEqual({
                 enabled: true,
-                active: true,
+                active: false,
                 type: undefined,
                 geograpicZone: undefined
             });

diff --git a/src/admin-user-form/admin-user-form.routes.js b/src/admin-user-form/admin-user-form.routes.js
@@ -29,7 +29,7 @@
             accessRights: [ADMINISTRATION_RIGHTS.USERS_MANAGE],
             resolve: {
                 facilities: function(facilityService) {
-                    return facilityService.getFacilitiesWithoutWards();
+                    return facilityService.getAllMinimal();
                 },
                 user: function(UserService, $stateParams) {
                     return new UserService().get($stateParams.id);

diff --git a/src/admin-user-form/user-form.controller.js b/src/admin-user-form/user-form.controller.js
@@ -124,9 +124,7 @@
             vm.initialUsername = vm.user.username;
             vm.homeFacility = getHomeFacility();
             vm.initialHomeFacility = vm.homeFacility;
-            vm.facilities = facilities.filter(function(facility) {
-                return facility.type.code !== 'WS';
-            });
+            vm.facilities = facilities;
             vm.pendingVerificationEmail = pendingVerificationEmail;
         }