Skip to content

Commit

Permalink
Try #6910:
Browse files Browse the repository at this point in the history
  • Loading branch information
bors[bot] authored Jan 17, 2023
2 parents c02fbdc + 28da93c commit cde030e
Show file tree
Hide file tree
Showing 6 changed files with 104 additions and 255 deletions.
2 changes: 0 additions & 2 deletions .semaphore/semaphore.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,6 @@ blocks:
- '8.0'
- env_var: NODEJS_VERSION
values:
- '14'
- '16'
- 'node'

Expand Down Expand Up @@ -119,6 +118,5 @@ blocks:
- '8.0'
- env_var: NODEJS_VERSION
values:
- '14'
- '16'
- 'node'
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
"jeremielodi"
],
"dependencies": {
"@ima-worldhealth/coral": "^2.12.0",
"@ima-worldhealth/coral": "^2.13.0",
"@ima-worldhealth/odk-central-api-cjs": "^2.4.0",
"@ima-worldhealth/tree": "^2.6.0",
"@types/angular": "^1.8.4",
Expand All @@ -100,7 +100,7 @@
"angular-translate-loader-url": "^2.19.0",
"angular-ui-bootstrap": "^2.5.6",
"angular-ui-grid": "^4.11.1",
"body-parser": "^1.20.0",
"body-parser": "^1.20.1",
"bootstrap": "^3.3.0",
"chart.js": "^3.9.1",
"chartjs-plugin-datalabels": "^2.1.0",
Expand All @@ -113,14 +113,14 @@
"delay": "^5.0.0",
"dotenv": "^16.0.2",
"excel4node": "^1.7.0",
"express": "^4.18.1",
"express": "^4.18.2",
"express-handlebars": "^6.0.6",
"express-session": "^1.17.3",
"font-awesome": "^4.7.0",
"handlebars": "^4.7.7",
"helmet": "^6.0.0",
"inline-source": "^8.0.2",
"ioredis": "^5.2.3",
"ioredis": "^5.2.5",
"jaro-winkler": "^0.2.8",
"jquery": "^3.6.1",
"jsbarcode": "^3.11.5",
Expand Down
3 changes: 3 additions & 0 deletions test/data.sql
Original file line number Diff line number Diff line change
Expand Up @@ -380,6 +380,9 @@ CALL CreateFiscalYear(1, @fiscalYear2020, @superUser, 'Fiscal Year 2021', 12, DA
SET @fiscalYear2022 = 0;
CALL CreateFiscalYear(1, @fiscalYear2021, @superUser, 'Fiscal Year 2022', 12, DATE('2022-01-01'), DATE('2022-12-31'), 'Notes for 2022', @fiscalYear2022);

SET @fiscalYear2023 = 0;
CALL CreateFiscalYear(1, @fiscalYear2022, @superUser, 'Fiscal Year 2023', 12, DATE('2023-01-01'), DATE('2023-12-31'), 'Notes for 2023', @fiscalYear2023);

-- give test permission to all projects
INSERT INTO `project_permission` VALUES (1, 1, 1),(2, 1, 2),(3, 2, 1),(4, 4, 1);

Expand Down
6 changes: 5 additions & 1 deletion test/integration/cash.invoices.js
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,11 @@ function PatientInvoicePayments() {
.catch(helpers.handler);
});

it('POST /cash should not create a cash payment if cash items are empty', () => {
it('POST /cash should not create a cash payment if cash items are empty', function () { // eslint-disable-line

// increase timeout
this.timeout(6000);

return agent.post('/cash')
.send({ payment : INVALID_INVOICE_PAYMENT })
.then((res) => {
Expand Down
10 changes: 5 additions & 5 deletions test/integration/fiscalYear.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ const helpers = require('./helpers');

describe('(/fiscal) Fiscal Year', () => {
const newFiscalYear = {
label : 'A New Fiscal Year 2023',
start_date : new Date('2023-01-01 01:00'),
end_date : new Date('2023-12-31 01:00'),
label : 'A New Fiscal Year 2024',
start_date : new Date('2024-01-01 01:00'),
end_date : new Date('2024-12-31 01:00'),
number_of_months : 12,
note : 'Fiscal Year for Integration Test',
closing_account : 111, // 1311 - Résusltat net : Bénéfice *
Expand Down Expand Up @@ -47,7 +47,7 @@ describe('(/fiscal) Fiscal Year', () => {
it('GET /fiscal returns a list of fiscal_years', () => {
return agent.get('/fiscal')
.then(res => {
helpers.api.listed(res, 9);
helpers.api.listed(res, 10);
const firstYearPeriods = res.body[0].periods;
expect(firstYearPeriods).to.be.equal(undefined);
})
Expand All @@ -57,7 +57,7 @@ describe('(/fiscal) Fiscal Year', () => {
it('GET /fiscal returns a list of fiscal_years width their periods', () => {
return agent.get('/fiscal?includePeriods=1')
.then(res => {
helpers.api.listed(res, 9);
helpers.api.listed(res, 10);
const firstYearPeriods = res.body[0].periods;
expect(firstYearPeriods).to.not.be.empty;
})
Expand Down
Loading

0 comments on commit cde030e

Please sign in to comment.