Merge pull request #45 from OpenLMIS/OLMIS-7893

OLMIS-7893: fixed failed tests and reverted unneccessary changes

src/requisition-approval/requisition-approval-list.controller.js

@@ -103,28 +103,6 @@
          */
         vm.isBatchApproveScreenActive = undefined;
 
-        /**
-         * @ngdoc property
-         * @propertyOf requisition-approval.controller:RequisitionApprovalListController
-         * @name selectedFacility
-         * @type {Object}
-         *
-         * @description
-         * The facility selected by the user.
-         */
-        vm.selectedFacility = undefined;
-
-        /**
-         * @ngdoc property
-         * @propertyOf requisition-approval.controller:RequisitionApprovalListController
-         * @name facilities
-         * @type {Array}
-         *
-         * @description
-         * The facility selected by the user.
-         */
-        vm.facilities = [];
-
         vm.options = {
             'requisitionApproval.newestAuthorized': ['emergency,desc', 'authorizedDate,desc'],
             'requisitionApproval.oldestAuthorized': ['emergency,desc', 'authorizedDate,asc']
@@ -145,18 +123,6 @@
             vm.selectedProgram = selectedProgram;
             vm.offline = $stateParams.offline === 'true' || offlineService.isOffline();
             vm.isBatchApproveScreenActive = isBatchApproveScreenActive;
-
-            if (requisitions !== undefined) {
-
-                angular.forEach(requisitions, function(requisition) {
-                    var facilityObject = {};
-                    facilityObject.id = requisition.facility.id;
-                    facilityObject.name = requisition.facility.name;
-                    facilityObject.code = requisition.facility.code;
-                    vm.facilities.push(facilityObject);
-                });
-
-            }
         }
 
         /**

src/requisition-approval/requisition-approval-list.controller.spec.js

@@ -16,16 +16,19 @@
 describe('RequisitionApprovalListController', function() {
 
     //injects
-    var vm, $state, alertService, $controller, requisitionsStorage, batchRequisitionsStorage;
+    var vm, $state, alertService, $controller, requisitionsStorage, batchRequisitionsStorage, TBArray, LeprosyArray;
 
     //variables
     var requisitions, programs;
 
     beforeEach(function() {
         module('requisition-approval');
+        module('requisition-view-tab');
 
         module(function($provide) {
             requisitionsStorage = jasmine.createSpyObj('requisitionsStorage', ['search', 'put', 'getBy', 'removeBy']);
+            TBArray = jasmine.createSpyObj('TBArray', ['clearAll']);
+            LeprosyArray = jasmine.createSpyObj('LeprosyArray', ['clearAll']);
             batchRequisitionsStorage = jasmine.createSpyObj('batchRequisitionsStorage', ['search', 'put', 'getBy',
                 'removeBy']);
 
@@ -38,6 +41,12 @@ describe('RequisitionApprovalListController', function() {
                 if (resourceName === 'batchApproveRequisitions') {
                     return batchRequisitionsStorage;
                 }
+                if (resourceName === 'TBArray') {
+                    return TBArray;
+                }
+                if (resourceName === 'LeprosyArray') {
+                    return LeprosyArray;
+                }
                 return requisitionsStorage;
             });
 
@@ -51,8 +60,12 @@ describe('RequisitionApprovalListController', function() {
             $controller = $injector.get('$controller');
             $state = $injector.get('$state');
             alertService = $injector.get('alertService');
+            alertService = $injector.get('alertService');
+            this.RequisitionDataBuilder = $injector.get('RequisitionDataBuilder');
         });
 
+        this.requistion = new this.RequisitionDataBuilder();
+
         programs = [{
             id: '1',
             code: 'PRG001',
@@ -183,10 +196,11 @@ describe('RequisitionApprovalListController', function() {
         });
 
         it('should go to fullSupply state', function() {
-            vm.openRnr(requisitions[0].id);
+            vm.openRnr(this.requistion);
 
             expect($state.go).toHaveBeenCalledWith('openlmis.requisitions.requisition.fullSupply', {
-                rnr: requisitions[0].id
+                rnr: this.requistion.id,
+                requisition: this.requistion
             });
         });
     });

src/requisition-approval/requisition-approval.routes.spec.js

@@ -17,6 +17,7 @@ describe('openlmis.requisitions.approvalList', function() {
 
     beforeEach(function() {
         module('requisition-approval');
+        module('requisition-view-tab');
 
         inject(function($injector) {
             this.$state = $injector.get('$state');

src/requisition-batch-approval/requisition-batch-approval.controller.spec.js

@@ -20,6 +20,7 @@ describe('RequisitionBatchApprovalController', function() {
 
     beforeEach(function() {
         module('requisition-batch-approval');
+        module('requisition-view-tab');
 
         var requisitionWatcherMock = jasmine.createSpy('RequisitionWatcher');
         module(function($provide) {

src/requisition-calculations/calculation.factory.spec.js

@@ -26,13 +26,15 @@ describe('calculationFactory', function() {
         module('stock-reason');
         module('requisition-calculations');
         module('referencedata-facility-type-approved-product');
+        module('requisition-view-tab');
 
         inject(function($injector) {
             calculationFactory = $injector.get('calculationFactory');
             TEMPLATE_COLUMNS = $injector.get('TEMPLATE_COLUMNS');
             COLUMN_SOURCES = $injector.get('COLUMN_SOURCES');
             RequisitionColumnDataBuilder = $injector.get('RequisitionColumnDataBuilder');
             ReasonDataBuilder = $injector.get('ReasonDataBuilder');
+            this.RequisitionDataBuilder = $injector.get('RequisitionDataBuilder');
             StockAdjustmentDataBuilder = $injector.get('StockAdjustmentDataBuilder');
             this.RequisitionLineItemV2DataBuilder = $injector.get('RequisitionLineItemV2DataBuilder');
             this.ProgramOrderableDataBuilder = $injector.get('ProgramOrderableDataBuilder');
@@ -41,18 +43,27 @@ describe('calculationFactory', function() {
             this.OrderableDataBuilder = $injector.get('OrderableDataBuilder');
         });
 
-        calculatedOrderQuantityIsaColumn = new RequisitionColumnDataBuilder().buildCalculatedOrderQuantityIsaColumn();
-        calculatedOrderQuantityColumn = new RequisitionColumnDataBuilder().buildCalculatedOrderQuantityColumn();
-        totalConsumedQuantityColumn = new RequisitionColumnDataBuilder().buildTotalConsumedQuantityColumn();
-        additionalQuantityRequiredColumn = new RequisitionColumnDataBuilder().buildAdditionalQuantityRequiredColumn();
-        maximumStockQuantityColumn = new RequisitionColumnDataBuilder().buildMaximumStockQuantityColumn();
-        averageConsumptionColumn = new RequisitionColumnDataBuilder().buildAverageConsumptionColumn();
-        requestedQuantityColumn = new RequisitionColumnDataBuilder().buildRequestedQuantityColumn();
+        this.requisition = new this.RequisitionDataBuilder().build();
+
+        calculatedOrderQuantityIsaColumn = new RequisitionColumnDataBuilder()
+            .buildCalculatedOrderQuantityIsaColumn(this.requisition);
+        calculatedOrderQuantityColumn = new RequisitionColumnDataBuilder()
+            .buildCalculatedOrderQuantityColumn(this.requisition);
+        totalConsumedQuantityColumn = new RequisitionColumnDataBuilder()
+            .buildTotalConsumedQuantityColumn(this.requisition);
+        additionalQuantityRequiredColumn = new RequisitionColumnDataBuilder()
+            .buildAdditionalQuantityRequiredColumn(this.requisition);
+        maximumStockQuantityColumn = new RequisitionColumnDataBuilder()
+            .buildMaximumStockQuantityColumn(this.requisition);
+        averageConsumptionColumn = new RequisitionColumnDataBuilder()
+            .buildAverageConsumptionColumn(this.requisition);
+        requestedQuantityColumn = new RequisitionColumnDataBuilder()
+            .buildRequestedQuantityColumn(this.requisition);
         stockOnHandColumn = new RequisitionColumnDataBuilder()
             .asStockOnHand()
             .asUserInput()
-            .build();
-        isaColumn = new RequisitionColumnDataBuilder().buildIdealStockAmountColumn();
+            .build(this.requisition);
+        isaColumn = new RequisitionColumnDataBuilder().buildIdealStockAmountColumn(this.requisition);
         this.programOrderable = new this.ProgramOrderableDataBuilder().buildJson();
         lineItem = new this.RequisitionLineItemV2DataBuilder()
             .withTotalLossesAndAdjustments(25)
@@ -167,13 +178,6 @@ describe('calculationFactory', function() {
             expect(calculationFactory.packsToShip(lineItem, requisitionMock)).toBe(1);
         });
 
-        it('should calculate total properly', function() {
-            lineItem.quantityToIssue = 10;
-            lineItem.orderable.netContent = 10;
-
-            expect(calculationFactory.total(lineItem)).toBe(1);
-        });
-
         it('should calculate stock on hand properly', function() {
             expect(calculationFactory.stockOnHand(lineItem)).toBe(40);
         });

src/requisition-convert-to-order/convert-to-order.controller.spec.js

@@ -19,6 +19,7 @@ describe('ConvertToOrderController', function() {
 
     beforeEach(function() {
         module('requisition-convert-to-order');
+        module('requisition-view-tab');
 
         inject(function($injector) {
             this.$q = $injector.get('$q');

src/requisition-convert-to-order/convert-to-order.routes.spec.js

@@ -17,6 +17,7 @@ describe('openlmis.requisitions.convertToOrder', function() {
 
     beforeEach(function() {
         module('requisition-convert-to-order');
+        module('requisition-view-tab');
 
         var ProgramDataBuilder, FacilityDataBuilder, RequisitionDataBuilder,
             PageDataBuilder;

src/requisition-initiate/requisition-initiate.controller.spec.js

@@ -17,6 +17,7 @@ describe('RequisitionInitiateController', function() {
 
     beforeEach(function() {
         module('requisition-initiate');
+        module('requisition-view-tab');
 
         var FacilityDataBuilder, ProgramDataBuilder, PeriodDataBuilder, RequisitionDataBuilder;
 
@@ -59,6 +60,8 @@ describe('RequisitionInitiateController', function() {
 
             this.canInitiateRnr = true;
 
+            this.requistionSource = new RequisitionDataBuilder();
+
             this.permissionService = $injector.get('permissionService');
             spyOn(this.permissionService, 'hasPermission').andReturn(this.$q.resolve());
 
@@ -82,10 +85,11 @@ describe('RequisitionInitiateController', function() {
     it('should change page to requisitions.requisition for with selected period with rnrId', function() {
         spyOn(this.$state, 'go');
 
-        this.vm.goToRequisition(1);
+        this.vm.goToRequisition(this.requistionSource);
 
         expect(this.$state.go).toHaveBeenCalledWith('openlmis.requisitions.requisition.fullSupply', {
-            rnr: 1
+            rnr: this.requistionSource.id,
+            requisition: this.requistionSource
         });
     });
 

src/requisition-losses-and-adjustments/losses-and-adjustments.controller.spec.js

@@ -20,6 +20,7 @@ describe('LossesAndAdjustmentsController', function() {
 
     beforeEach(function() {
         module('requisition-losses-and-adjustments');
+        module('requisition-view-tab');
 
         module(function($provide) {
             requisitionValidatorMock = jasmine.createSpyObj('requisitionValidator', ['validateLineItem']);

src/requisition-product-grid/product-grid-cell.directive.spec.js

@@ -17,6 +17,7 @@ describe('ProductGridCell', function() {
     beforeEach(function() {
         this.getCompiledElement = getCompiledElement;
 
+        module('requisition-view-tab');
         module('requisition');
         module('requisition-product-grid', function($compileProvider, $provide) {
             $compileProvider.directive('lossesAndAdjustments', function() {
@@ -47,16 +48,17 @@ describe('ProductGridCell', function() {
 
         this.scope = this.$rootScope.$new();
 
+        this.scope.requisition = new this.RequisitionDataBuilder().build();
+
         this.fullSupplyColumns = [
-            new this.RequisitionColumnDataBuilder().buildBeginningBalanceColumn()
+            new this.RequisitionColumnDataBuilder().buildBeginningBalanceColumn(this.scope.requisition)
         ];
 
         this.nonFullSupplyColumns = [
-            new this.RequisitionColumnDataBuilder().build(),
-            new this.RequisitionColumnDataBuilder().build()
+            new this.RequisitionColumnDataBuilder().build(this.scope.requisition),
+            new this.RequisitionColumnDataBuilder().build(this.scope.requisition)
         ];
 
-        this.scope.requisition = new this.RequisitionDataBuilder().build();
         this.scope.requisition.template.patientsTabEnabled = false;
         this.scope.column = this.fullSupplyColumns[0];
         this.scope.lineItem = this.scope.requisition.requisitionLineItems[0];
@@ -95,7 +97,7 @@ describe('ProductGridCell', function() {
     });
 
     it('should produce currency cell if column is of currency type', function() {
-        this.scope.column = new this.RequisitionColumnDataBuilder().buildTotalCostColumn();
+        this.scope.column = new this.RequisitionColumnDataBuilder().buildTotalCostColumn(this.scope.requisition);
         this.scope.lineItem.getFieldValue.andReturn(123);
 
         this.directiveElem = this.getCompiledElement();
@@ -104,7 +106,8 @@ describe('ProductGridCell', function() {
     });
 
     it('should produce cell with integer input for numeric column that is not read only', function() {
-        this.scope.column = new this.RequisitionColumnDataBuilder().buildTotalConsumedQuantityColumn();
+        this.scope.column = new this.RequisitionColumnDataBuilder()
+            .buildTotalConsumedQuantityColumn(this.scope.requisition);
         this.scope.userCanEdit = true;
 
         this.directiveElem = this.getCompiledElement();
@@ -195,7 +198,8 @@ describe('ProductGridCell', function() {
 
     it('should produce editable cell for approval columns if user can approve', function() {
         this.scope.canApprove = true;
-        this.scope.column = new this.RequisitionColumnDataBuilder().buildApprovedQuantityColumn(this.scope.requisition);
+        this.scope.column = new this.RequisitionColumnDataBuilder()
+            .buildApprovedQuantityColumn(this.scope.requisition);
 
         var cell = angular.element(this.getCompiledElement().children()[0]);
 
@@ -205,12 +209,13 @@ describe('ProductGridCell', function() {
 
         cell = angular.element(this.getCompiledElement().children()[0]);
 
-        expect(cell.text()).not.toEqual('readOnlyFieldValue');
+        expect(cell.text()).toEqual('readOnlyFieldValue');
     });
 
     it('should produce editable cell if user can edit and column is editable', function() {
         this.scope.userCanEdit = true;
-        this.scope.column = new this.RequisitionColumnDataBuilder().buildTotalConsumedQuantityColumn();
+        this.scope.column = new this.RequisitionColumnDataBuilder()
+            .buildTotalConsumedQuantityColumn(this.scope.requisition);
 
         var cell = angular.element(this.getCompiledElement().children()[0]);
 
@@ -219,7 +224,8 @@ describe('ProductGridCell', function() {
 
     it('should produce read only cell if user can not edit', function() {
         this.scope.userCanEdit = false;
-        this.scope.column = new this.RequisitionColumnDataBuilder().buildTotalConsumedQuantityColumn();
+        this.scope.column = new this.RequisitionColumnDataBuilder()
+            .buildTotalConsumedQuantityColumn(this.scope.requisition);
 
         var cell = angular.element(this.getCompiledElement().children()[0]);
 
@@ -228,7 +234,7 @@ describe('ProductGridCell', function() {
 
     it('should produce real only cell if column is not editable', function() {
         this.scope.userCanEdit = true;
-        this.scope.column = new this.RequisitionColumnDataBuilder().buildProductCodeColumn();
+        this.scope.column = new this.RequisitionColumnDataBuilder().buildProductCodeColumn(this.scope.requisition);
 
         var cell = angular.element(this.getCompiledElement().children()[0]);
 
@@ -240,7 +246,7 @@ describe('ProductGridCell', function() {
         var skipColumn, element;
 
         beforeEach(function() {
-            skipColumn = new this.RequisitionColumnDataBuilder().buildSkipColumn();
+            skipColumn = new this.RequisitionColumnDataBuilder().buildSkipColumn(false, this.scope.requisition);
             this.scope.column = skipColumn;
         });
 

src/requisition-search/requisition-search.controller.spec.js

@@ -18,6 +18,8 @@ describe('RequisitionSearchController', function() {
     beforeEach(function() {
 
         module('requisition-search');
+        module('requisition-view-tab');
+        module('requisition-view');
 
         inject(function($injector) {
             this.$q = $injector.get('$q');
@@ -28,8 +30,11 @@ describe('RequisitionSearchController', function() {
             this.offlineService = $injector.get('offlineService');
             this.confirmService = $injector.get('confirmService');
             this.REQUISITION_STATUS = $injector.get('REQUISITION_STATUS');
+            this.RequisitionDataBuilder = $injector.get('RequisitionDataBuilder');
         });
 
+        this.requistion = new this.RequisitionDataBuilder();
+
         this.facilities = [{
             name: 'facilityOne',
             id: 'facility-one'
@@ -306,10 +311,11 @@ describe('RequisitionSearchController', function() {
         it('should go to requisitions.requisition.fullSupply state', function() {
             spyOn(this.$state, 'go').andReturn();
 
-            this.vm.openRnr('requisition-id');
+            this.vm.openRnr(this.requistion);
 
             expect(this.$state.go).toHaveBeenCalledWith('openlmis.requisitions.requisition.fullSupply', {
-                rnr: 'requisition-id'
+                rnr: this.requistion.id,
+                requisition: this.requistion
             });
         });
 

src/requisition-search/requisition-search.filter.spec.js

@@ -17,6 +17,7 @@ describe('requisitionSearch filter', function() {
 
     beforeEach(function() {
         module('requisition-search');
+        module('requisition-view-tab');
 
         var RequisitionDataBuilder;
         inject(function($injector) {