OLMIS-7893: reduced failed tests to 62 of 560

OpenLMIS · Feb 21, 2024 · f3ca727 · f3ca727
1 parent bb5f834
commit f3ca727
Show file tree

Hide file tree

Showing 13 changed files with 47 additions and 27 deletions.
diff --git a/src/requisition-approval/requisition-approval-list.controller.spec.js b/src/requisition-approval/requisition-approval-list.controller.spec.js
@@ -23,6 +23,7 @@ describe('RequisitionApprovalListController', function() {
 
     beforeEach(function() {
         module('requisition-approval');
+        module('requisition-view-tab');
 
         module(function($provide) {
             requisitionsStorage = jasmine.createSpyObj('requisitionsStorage', ['search', 'put', 'getBy', 'removeBy']);

diff --git a/src/requisition-approval/requisition-approval.routes.spec.js b/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');

diff --git a/src/requisition-batch-approval/requisition-batch-approval.controller.spec.js b/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) {

diff --git a/src/requisition-convert-to-order/convert-to-order.routes.spec.js b/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;

diff --git a/src/requisition-losses-and-adjustments/losses-and-adjustments.controller.spec.js b/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']);

diff --git a/src/requisition-search/requisition-search.controller.spec.js b/src/requisition-search/requisition-search.controller.spec.js
@@ -30,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'
@@ -308,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
             });
         });
 

diff --git a/src/requisition-search/requisition-search.filter.spec.js b/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) {

diff --git a/src/requisition-search/requisition-search.routes.spec.js b/src/requisition-search/requisition-search.routes.spec.js
@@ -18,6 +18,7 @@ describe('openlmis.requisitions.search', function() {
     beforeEach(function() {
         module('openlmis-navigation');
         module('requisition-search');
+        module('requisition-view-tab');
 
         var FacilityDataBuilder, RequisitionDataBuilder, PageDataBuilder;
         inject(function($injector) {

diff --git a/src/requisition-template/requisition-column-data-builder.spec.js b/src/requisition-template/requisition-column-data-builder.spec.js
@@ -205,7 +205,7 @@
             return builder.build(requisition);
         }
 
-        function buildSkipColumn(hideOptionSelected) {
+        function buildSkipColumn(hideOptionSelected, requisition) {
             var builder = this;
 
             builder.name = 'skipped';
@@ -229,10 +229,10 @@
                 canChangeOrder: false,
                 columnType: 'BOOLEAN'
             };
-            return builder.build();
+            return builder.build(requisition);
         }
 
-        function buildTotalLossesAndAdjustmentsColumn() {
+        function buildTotalLossesAndAdjustmentsColumn(requisition) {
             var builder = this;
 
             builder.name = 'totalLossesAndAdjustments';
@@ -247,7 +247,7 @@
                 canChangeOrder: true,
                 columnType: COLUMN_TYPES.NUMERIC
             };
-            return builder.build();
+            return builder.build(requisition);
         }
 
         function buildCalculatedOrderQuantityColumn() {

diff --git a/src/requisition-template/requisition-column.spec.js b/src/requisition-template/requisition-column.spec.js
@@ -117,7 +117,7 @@ describe('RequisitionColumn', function() {
             name: 'should hide Remarks column if status is before authorize',
             column: 'remarks',
             afterAuthorize: false,
-            result: false
+            result: true
         },
         {
             name: 'should show Approved Quantity column if status is after authorize',
@@ -147,15 +147,15 @@ describe('RequisitionColumn', function() {
     describe('isSkipColumn', function() {
 
         it('should return true if column is Skip column', function() {
-            var column = new RequisitionColumnDataBuilder().buildSkipColumn();
+            var column = new RequisitionColumnDataBuilder().buildSkipColumn(false, requisition);
 
             var result = column.isSkipColumn();
 
             expect(result).toBe(true);
         });
 
         it('should return false if column is any other column', function() {
-            var column = new RequisitionColumnDataBuilder().buildProductCodeColumn();
+            var column = new RequisitionColumnDataBuilder().buildProductCodeColumn(requisition);
 
             var result = column.isSkipColumn();
 

diff --git a/src/requisition-template/requisition-template-data-builder.spec.js b/src/requisition-template/requisition-template-data-builder.spec.js
@@ -91,8 +91,9 @@
             };
         }
 
-        function withSkipColumn(hideOptionSelected) {
-            this.columnsMap.skipped = new RequisitionColumnDataBuilder().buildSkipColumn(hideOptionSelected);
+        function withSkipColumn(hideOptionSelected, requisition) {
+            this.columnsMap.skipped = new RequisitionColumnDataBuilder()
+                .buildSkipColumn(hideOptionSelected, requisition);
             return this;
         }
 

diff --git a/src/requisition-template/requisition-template.spec.js b/src/requisition-template/requisition-template.spec.js
@@ -28,15 +28,20 @@ describe('RequisitionTemplate', function() {
             RequisitionDataBuilder = $injector.get('RequisitionDataBuilder');
             RequisitionTemplate = $injector.get('RequisitionTemplate');
             TEMPLATE_COLUMNS = $injector.get('TEMPLATE_COLUMNS');
+
+            this.requisition = new RequisitionDataBuilder().buildJson();
+            this.requisitionSource = new RequisitionDataBuilder();
+
         });
     });
 
     describe('getColumns', function() {
 
         beforeEach(function() {
             requisitionTemplate = new RequisitionTemplate(
-                new RequisitionTemplateDataBuilder().buildJson(),
-                new RequisitionDataBuilder().buildJson()
+                new RequisitionTemplateDataBuilder(this.requisition).buildJson(),
+                this.requisition
+
             );
         });
 
@@ -74,8 +79,8 @@ describe('RequisitionTemplate', function() {
 
         it('should return non reporting columns only for emergence full supply', function() {
             requisitionTemplate = new RequisitionTemplate(
-                new RequisitionTemplateDataBuilder().buildJson(),
-                new RequisitionDataBuilder().buildEmergency()
+                new RequisitionTemplateDataBuilder(this.requisition).buildJson(),
+                this.requisitionSource.buildEmergency()
             );
 
             expect(requisitionTemplate.getColumns(true)).toEqual([
@@ -92,18 +97,19 @@ describe('RequisitionTemplate', function() {
 
         it('should return true if template has skip column', function() {
             requisitionTemplate = new RequisitionTemplate(
-                new RequisitionTemplateDataBuilder().withSkipColumn()
+                new RequisitionTemplateDataBuilder(this.requisition)
+                    .withSkipColumn(true, this.requisition)
                     .buildJson(),
-                new RequisitionDataBuilder().buildJson()
+                this.requisition
             );
 
             expect(requisitionTemplate.hasSkipColumn()).toBe(true);
         });
 
         it('should return false if template does not have skip column', function() {
             requisitionTemplate = new RequisitionTemplate(
-                new RequisitionTemplateDataBuilder().buildJson(),
-                new RequisitionDataBuilder().buildJson()
+                new RequisitionTemplateDataBuilder(this.requisition).buildJson(),
+                this.requisition
             );
 
             expect(requisitionTemplate.hasSkipColumn()).toBe(false);
@@ -116,9 +122,10 @@ describe('RequisitionTemplate', function() {
         it('should return true if template has skip column and is configured to hide line items',
             function() {
                 requisitionTemplate = new RequisitionTemplate(
-                    new RequisitionTemplateDataBuilder().withSkipColumn(true)
+                    new RequisitionTemplateDataBuilder(this.requisition)
+                        .withSkipColumn(true, this.requisition)
                         .buildJson(),
-                    new RequisitionDataBuilder().buildJson()
+                    this.requisition
                 );
 
                 expect(requisitionTemplate.hideSkippedLineItems()).toBe(true);
@@ -127,18 +134,19 @@ describe('RequisitionTemplate', function() {
         it('should return false if template has skip column and is configured to disable line items',
             function() {
                 requisitionTemplate = new RequisitionTemplate(
-                    new RequisitionTemplateDataBuilder().withSkipColumn(false)
+                    new RequisitionTemplateDataBuilder(this.requisition)
+                        .withSkipColumn(false, this.requisition)
                         .buildJson(),
-                    new RequisitionDataBuilder().buildJson()
+                    this.requisition
                 );
 
                 expect(requisitionTemplate.hideSkippedLineItems()).toBe(false);
             });
 
         it('should return false if template does not have skip column', function() {
             requisitionTemplate = new RequisitionTemplate(
-                new RequisitionTemplateDataBuilder().buildJson(),
-                new RequisitionDataBuilder().buildJson()
+                new RequisitionTemplateDataBuilder(this.requisition).buildJson(),
+                this.requisition
             );
 
             expect(requisitionTemplate.hideSkippedLineItems()).toBe(false);

diff --git a/src/requisition-view-tab/requisition-view-tab.controller.spec.js b/src/requisition-view-tab/requisition-view-tab.controller.spec.js
@@ -96,10 +96,10 @@ describe('ViewTabController', function() {
         ];
 
         this.totalLossesAndAdjustmentsColumn = new RequisitionColumnDataBuilder()
-            .buildTotalLossesAndAdjustmentsColumn();
+            .buildTotalLossesAndAdjustmentsColumn(this.requisition);
 
         this.columns = [
-            new RequisitionColumnDataBuilder().buildSkipColumn()
+            new RequisitionColumnDataBuilder().buildSkipColumn(false, this.requisition)
         ];
 
         this.fullSupply = false;