Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update deps #398

Merged
merged 2 commits into from
Mar 29, 2023
Merged

Update deps #398

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8071299
Update deps
tkataja Mar 28, 2023
fec1b47
Fix e2e test regression
tkataja Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
237 changes: 121 additions & 116 deletions backend/package-lock.json
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions backend/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
"@trivago/prettier-plugin-sort-imports": "^4.1.1",
"@types/connect-pg-simple": "^7.0.0",
"@types/email-templates": "^10.0.1",
"@types/node": "^18.15.5",
"@types/node": "^18.15.10",
"@types/nodemailer": "^6.4.7",
"@typescript-eslint/eslint-plugin": "^5.56.0",
"@typescript-eslint/parser": "^5.56.0",
"@typescript-eslint/eslint-plugin": "^5.57.0",
"@typescript-eslint/parser": "^5.57.0",
"concurrently": "^7.6.0",
"eslint": "^8.36.0",
"node-dev": "^8.0.0",
Expand All @@ -50,7 +50,7 @@
"vitest": "^0.29.7"
},
"dependencies": {
"@fastify/compress": "^6.2.0",
"@fastify/compress": "^6.2.1",
"@fastify/cookie": "^8.3.0",
"@fastify/formbody": "^7.4.0",
"@fastify/passport": "^2.2.0",
Expand All @@ -73,7 +73,7 @@
"postgres-migrations": "^5.3.0",
"pug": "^3.0.2",
"server-text-width": "^1.0.2",
"slonik": "^33.1.3",
"slonik": "^33.1.4",
"soap": "^1.0.0",
"superjson": "^1.12.2",
"tre-hanna-shared": "file:../shared",
Expand Down
14 changes: 7 additions & 7 deletions docker/oidc-provider/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docker/oidc-provider/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
"ts-node": "^10.9.1"
},
"devDependencies": {
"@types/node": "^18.15.3"
"@types/node": "^18.15.10"
}
}
48 changes: 24 additions & 24 deletions e2e/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions e2e/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
"author": "",
"license": "ISC",
"devDependencies": {
"@playwright/test": "^1.32.0",
"@playwright/test": "^1.32.1",
"nodemon": "^2.0.22",
"playwright": "^1.32.0"
"playwright": "^1.32.1"
},
"dependencies": {
"@trpc/client": "^10.18.0",
Expand Down
9 changes: 3 additions & 6 deletions e2e/test/project.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import { expect, Locator, Page, test } from '@playwright/test';
import { expect, Page, test } from '@playwright/test';
import type { InvestmentProject } from '@shared/schema/project/investment';
import { sleep } from '@shared/utils';
import { fillDatePickerValue, getDatePickerValue } from '@utils/date-picker';
import { login } from '@utils/page';
import { client } from '@utils/trpc';
import type { InvestmentProject } from '@shared/schema/project/investment';
import { fillDatePickerValue, getDatePickerValue } from '@utils/date-picker';

const keskustoriGeom = {
type: 'Polygon',
Expand Down Expand Up @@ -55,9 +55,6 @@ async function createProject(page: Page, project: InvestmentProject) {
await fillDatePickerValue(page.locator('input[name="startDate"]'), project.startDate);
await fillDatePickerValue(page.locator('input[name="endDate"]'), project.endDate);

// await page.locator('input[name="startDate"]').type(project.startDate);
// await page.locator('input[name="endDate"]').type(project.endDate);

const lifecycleText = lifecycleStateToText[project.lifecycleState];
if (lifecycleText) {
await page.getByLabel('Elinkaaren tila').click();
Expand Down
8 changes: 7 additions & 1 deletion e2e/utils/date-picker.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,14 @@ dayjs.extend(customParseFormat);
*/
export async function fillDatePickerValue(locator: Locator, date: string) {
const inputString = dayjs(date, 'D.M.YYYY').format('DDMMYYYY');
await locator.page().pause();
await locator.focus();
await locator.type(inputString);
// TODO: Try to remove at some point. Now there is a need to press left arrow three times
// due to potential playwright regression in focus handling with MUI date picker.
for (let i = 0; i < 3; i++) {
await locator.press('ArrowLeft');
}
await locator.type(inputString, { delay: 50 });
}

/**
Expand Down
Loading