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.

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

Playwright tester i PSB (v2) #1859

Merged
merged 31 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
81a348a
Init playwright
frodehansen2 May 21, 2024
a0ca3a3
Enkel søknad
frodehansen2 May 21, 2024
f1ae6d4
Endre test workflow
frodehansen2 May 21, 2024
f3f2040
Test av barn-steget
frodehansen2 May 21, 2024
46857d4
Starter med mellomlagring
frodehansen2 May 21, 2024
e8c1057
Oppdatere med mellomlagring test
frodehansen2 May 21, 2024
2101598
Test av periodesteg
frodehansen2 May 22, 2024
47aa19d
Test - Arbeidssituasjonsteg
frodehansen2 May 22, 2024
3af2b43
Justere mock routes
frodehansen2 May 22, 2024
7f09c6b
Justere mockRoutes
frodehansen2 May 22, 2024
7e61e51
flytte mockdate
frodehansen2 May 22, 2024
54a421f
Erstatte constanter med funksjoner
frodehansen2 May 23, 2024
25c5672
Fikse pw-test
frodehansen2 May 23, 2024
78cb3b7
Merge branch 'date-utils-fix' into pw-psb-test
frodehansen2 May 24, 2024
d658ad6
Justere tester
frodehansen2 May 24, 2024
f3a4b81
Retry
frodehansen2 May 24, 2024
d79516f
Jobb i søknadsperioden
frodehansen2 May 24, 2024
4c79a89
Merge branch 'main' into pw-psb-test
frodehansen2 May 29, 2024
22d79ec
Omsorgstilbud
frodehansen2 May 29, 2024
ecf4b3b
Oppdatere test
frodehansen2 May 29, 2024
3f8c599
Resterende steg
frodehansen2 May 30, 2024
3e4bf71
Restrukturere arbeidssituasjon
frodehansen2 May 30, 2024
23e1a88
Merge branch 'main' into pw-psb-test
frodehansen2 Jun 3, 2024
1fb779d
Merge branch 'main' into pw-psb-test
frodehansen2 Jun 5, 2024
7c8d465
Arbeidssituasjoner arbeidstaker
frodehansen2 Jun 5, 2024
c0ca72c
Frilans
frodehansen2 Jun 5, 2024
7c8f1ff
Slett cypress
frodehansen2 Jun 5, 2024
a7a9e6d
Justering
frodehansen2 Jun 5, 2024
700577d
Fix av await og expect
frodehansen2 Jun 5, 2024
2cc4e1e
Mer await på expect
frodehansen2 Jun 5, 2024
c14a1c2
Changeset
frodehansen2 Jun 5, 2024
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
5 changes: 5 additions & 0 deletions .changeset/eleven-pots-laugh.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
'@navikt/pleiepenger-sykt-barn': minor
---

Erstatte cypress med playwright
37 changes: 14 additions & 23 deletions .github/workflows/test.pleiepenger-sykt-barn.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,7 @@ jobs:
yarn config set npmScopes.navikt.npmAlwaysAuth true
yarn config set npmScopes.navikt.npmAuthToken $NODE_AUTH_TOKEN
env:
NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}

NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}

- name: Setup Node.js environment
uses: actions/setup-node@v4
Expand All @@ -43,7 +42,8 @@ jobs:
- name: Run code tests
run: yarn test --filter=pleiepenger-sykt-barn

run-cypress-test:
run-playwright-test:
timeout-minutes: 60
runs-on: ubuntu-latest
steps:
- name: Checkout
Expand All @@ -55,31 +55,22 @@ jobs:
yarn config set npmScopes.navikt.npmAlwaysAuth true
yarn config set npmScopes.navikt.npmAuthToken $NODE_AUTH_TOKEN
env:
NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}
NODE_AUTH_TOKEN: ${{ secrets.READER_TOKEN }}

- name: Setup Node.js environment
uses: actions/setup-node@v4
with:
node-version: 18
cache: 'yarn'

- name: Build and start e2e server
uses: cypress-io/github-action@v6.7.0
env:
DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false
PUBLIC_PATH: /familie/sykdom-i-familien/soknad/pleiepenger
FRONTEND_API_PATH: http://localhost:8082/
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
with:
project: ./apps/pleiepenger-sykt-barn/e2e
build: yarn turbo run build --filter=@navikt/pleiepenger-sykt-barn
start: yarn turbo start-e2e-server --filter=pleiepenger-sykt-barn
wait-on: 'http://localhost:8080'
wait-on-timeout: 60
runTests: false
- name: Install dependencies
run: yarn

- name: Run cypress tests
run: yarn turbo cypress-run --filter=pleiepenger-sykt-barn
env:
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
- name: Install Playwright Browsers
run: npx playwright install chromium --with-deps

- name: Build application
run: yarn build --filter=pleiepenger-sykt-barn

- name: Run tests
run: yarn turbo playwright-test --filter=pleiepenger-sykt-barn
2 changes: 1 addition & 1 deletion apps/pleiepenger-sykt-barn/.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ API_URL=http://localhost:8089
APP_VERSION=dev
APPSTATUS_DATASET=staging
APPSTATUS_PROJECT_ID=ryujtq87
CYPRESS_ENV=false
DEKORATOR_URL=https://www.nav.no/dekoratoren/?simple=true&chatbot=false
FRONTEND_API_PATH=http://localhost:8089/
FRONTEND_INNSYN_API_PATH=http://localhost:8089/
Expand All @@ -13,3 +12,4 @@ LOGIN_URL=http://localhost:8081/auth-mock/cookie?subject=mockSubject&redirect_lo
MIN_SIDE_URL=https://www.intern.dev.nav.no/minside
NODE_ENV=development
PUBLIC_PATH=/familie/sykdom-i-familien/soknad/pleiepenger
USE_AMPLITUDE=false
2 changes: 2 additions & 0 deletions apps/pleiepenger-sykt-barn/api-mock/mock-server.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -77,13 +77,15 @@ const privatArbeidsgiverMock = {
ansattFom: '2021-01-01',
ansattTom: '2021-12-31',
};

const frilansoppdrag = {
type: 'type oppdrag',
organisasjonsnummer: '991012133',
navn: 'Hurdal frilanssenter',
ansattFom: '2022-01-01',
ansattTom: '2022-01-15',
};

const frilansoppdrag2 = {
type: 'type oppdrag',
organisasjonsnummer: '991012134',
Expand Down
12 changes: 0 additions & 12 deletions apps/pleiepenger-sykt-barn/e2e/cypress.config.js

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Binary file not shown.

This file was deleted.

This file was deleted.

Loading