From 6c1b102cb439873949791e31acd07ccd24cb848b Mon Sep 17 00:00:00 2001 From: mdulko Date: Thu, 22 Feb 2024 14:22:18 +0100 Subject: [PATCH] OLMIS-7893: reduced failed tests to 46 of 560 --- .../product-grid-cell.directive.spec.js | 29 +++++++++++-------- .../requisition-column-data-builder.spec.js | 8 ++--- 2 files changed, 21 insertions(+), 16 deletions(-) diff --git a/src/requisition-product-grid/product-grid-cell.directive.spec.js b/src/requisition-product-grid/product-grid-cell.directive.spec.js index 3ad209ed..408db615 100644 --- a/src/requisition-product-grid/product-grid-cell.directive.spec.js +++ b/src/requisition-product-grid/product-grid-cell.directive.spec.js @@ -48,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]; @@ -96,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(); @@ -105,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(); @@ -196,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]); @@ -206,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]); @@ -220,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]); @@ -229,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]); @@ -241,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; }); diff --git a/src/requisition-template/requisition-column-data-builder.spec.js b/src/requisition-template/requisition-column-data-builder.spec.js index 671af86e..50ab666e 100644 --- a/src/requisition-template/requisition-column-data-builder.spec.js +++ b/src/requisition-template/requisition-column-data-builder.spec.js @@ -273,7 +273,7 @@ return builder.build(); } - function buildTotalConsumedQuantityColumn() { + function buildTotalConsumedQuantityColumn(requisition) { var builder = this; builder.columnDefinition = { @@ -293,7 +293,7 @@ builder.source = 'USER_INPUT'; builder.tag = null; - return builder.build(); + return builder.build(requisition); } function buildAdditionalQuantityRequiredColumn() { @@ -414,7 +414,7 @@ return builder.build(); } - function buildTotalCostColumn() { + function buildTotalCostColumn(requisition) { var builder = this; builder.columnDefinition = { @@ -434,7 +434,7 @@ builder.source = 'CALCULATED'; builder.tag = null; - return builder.build(); + return builder.build(requisition); } function buildApprovedQuantityColumn(requisition) {