Skip to content

Commit

Permalink
OLMIS-7893: reduced failed tests to 0 of 560
Browse files Browse the repository at this point in the history
  • Loading branch information
@mdulko
mdulko committed Feb 22, 2024
1 parent 6c1b102 commit 1802fe2
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 33 deletions.
19 changes: 16 additions & 3 deletions src/requisition-approval/requisition-approval-list.controller.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
describe('RequisitionApprovalListController', function() {

//injects
var vm, $state, alertService, $controller, requisitionsStorage, batchRequisitionsStorage;
var vm, $state, alertService, $controller, requisitionsStorage, batchRequisitionsStorage, TBArray, LeprosyArray;

//variables
var requisitions, programs;
Expand All @@ -27,6 +27,8 @@ describe('RequisitionApprovalListController', function() {

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']);

Expand All @@ -39,6 +41,12 @@ describe('RequisitionApprovalListController', function() {
if (resourceName === 'batchApproveRequisitions') {
return batchRequisitionsStorage;
}
if (resourceName === 'TBArray') {
return TBArray;
}
if (resourceName === 'LeprosyArray') {
return LeprosyArray;
}
return requisitionsStorage;
});

Expand All @@ -52,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',
Expand Down Expand Up @@ -184,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
});
});
});
Expand Down
35 changes: 19 additions & 16 deletions src/requisition-calculations/calculation.factory.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ describe('calculationFactory', function() {
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');
Expand All @@ -42,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)
Expand Down Expand Up @@ -168,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);
});
Expand Down
7 changes: 5 additions & 2 deletions src/requisition-initiate/requisition-initiate.controller.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,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());

Expand All @@ -83,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
});
});

Expand Down
24 changes: 12 additions & 12 deletions src/requisition-template/requisition-column-data-builder.spec.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@
return builder.build(requisition);
}

function buildCalculatedOrderQuantityColumn() {
function buildCalculatedOrderQuantityColumn(requisition) {
var builder = this;

builder.columnDefinition = {
Expand All @@ -270,7 +270,7 @@
builder.source = 'CALCULATED';
builder.tag = null;

return builder.build();
return builder.build(requisition);
}

function buildTotalConsumedQuantityColumn(requisition) {
Expand All @@ -296,7 +296,7 @@
return builder.build(requisition);
}

function buildAdditionalQuantityRequiredColumn() {
function buildAdditionalQuantityRequiredColumn(requisition) {
var builder = this;

builder.columnDefinition = {
Expand All @@ -315,10 +315,10 @@
builder.source = 'USER_INPUT';
builder.tag = null;

return builder.build();
return builder.build(requisition);
}

function buildMaximumStockQuantityColumn() {
function buildMaximumStockQuantityColumn(requisition) {
var builder = this;

builder.columnDefinition = {
Expand All @@ -342,10 +342,10 @@
builder.source = 'USER_INPUT';
builder.tag = null;

return builder.build();
return builder.build(requisition);
}

function buildAverageConsumptionColumn() {
function buildAverageConsumptionColumn(requisition) {
var builder = this;

builder.columnDefinition = {
Expand All @@ -365,10 +365,10 @@
builder.source = 'USER_INPUT';
builder.tag = null;

return builder.build();
return builder.build(requisition);
}

function buildIdealStockAmountColumn() {
function buildIdealStockAmountColumn(requisition) {
var builder = this;

builder.columnDefinition = {
Expand All @@ -388,10 +388,10 @@
builder.source = 'REFERENCE_DATA';
builder.tag = null;

return builder.build();
return builder.build(requisition);
}

function buildCalculatedOrderQuantityIsaColumn() {
function buildCalculatedOrderQuantityIsaColumn(requisition) {
var builder = this;

builder.columnDefinition = {
Expand All @@ -411,7 +411,7 @@
builder.source = 'CALCULATED';
builder.tag = null;

return builder.build();
return builder.build(requisition);
}

function buildTotalCostColumn(requisition) {
Expand Down

0 comments on commit 1802fe2

Please sign in to comment.