Merge branch 'main' into fetch-decorator

navikt · Nov 2, 2023 · a30841b · a30841b
2 parents 864dd3e + 0bd37b5
commit a30841b
Show file tree

Hide file tree

Showing 50 changed files with 918 additions and 579 deletions.
diff --git a/.changeset/clean-camels-run.md b/.changeset/clean-camels-run.md
@@ -0,0 +1,5 @@
+---
+'@navikt/sif-common-forms-ds': minor
+---
+
+Bytte regexp på telefonnummer til regnskapsfører, som nå tillater kun + space og tall. Noen tekstendringer.
diff --git a/.changeset/curvy-cooks-relax.md b/.changeset/curvy-cooks-relax.md
@@ -0,0 +1,5 @@
+---
+'@navikt/sif-common-formik-ds': patch
+---
+
+Legge til manglende default valideringstekst når tekst har ugyldig format
diff --git a/.changeset/rude-kings-cheer.md b/.changeset/rude-kings-cheer.md
@@ -0,0 +1,5 @@
+---
+'@navikt/omsorgspengerutbetaling-soknad': patch
+---
+
+Legge til manglende env variable USE_AMPLITUDE
diff --git a/.changeset/three-bees-repeat.md b/.changeset/three-bees-repeat.md
@@ -0,0 +1,5 @@
+---
+'@navikt/pleiepenger-sykt-barn': patch
+---
+
+Fjerne ubrukt tekst
diff --git a/.github/workflows/dispatch.deploy-pleiepenger-sykt-barn-to-prod.yml b/.github/workflows/dispatch.deploy-pleiepenger-sykt-barn-to-prod.yml
@@ -30,7 +30,7 @@ jobs:
               run: yarn test --filter=pleiepenger-sykt-barn
 
             - name: Build and start e2e server
-              uses: cypress-io/github-action@v6.5.0
+              uses: cypress-io/github-action@v6.6.0
               env:
                   DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false
                   PUBLIC_PATH: /familie/sykdom-i-familien/soknad/pleiepenger

diff --git a/.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml b/.github/workflows/test.ekstra-omsorgsdager-andre-forelder-ikke-tilsyn.yml
@@ -47,7 +47,7 @@ jobs:
                   cache: 'yarn'
 
             - name: Build and start e2e server
-              uses: cypress-io/github-action@v6.5.0
+              uses: cypress-io/github-action@v6.6.0
               env:
                   DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false
                   PUBLIC_PATH: /familie/sykdom-i-familien/soknad/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn

diff --git a/.github/workflows/test.endringsmelding-pleiepenger.yml b/.github/workflows/test.endringsmelding-pleiepenger.yml
@@ -47,7 +47,7 @@ jobs:
                   cache: 'yarn'
 
             - name: Build and start e2e server
-              uses: cypress-io/github-action@v6.5.0
+              uses: cypress-io/github-action@v6.6.0
               env:
                   API_URL_INNSYN: http://localhost:8099
                   API_URL: http://localhost:8099

diff --git a/.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml b/.github/workflows/test.omsorgsdager-aleneomsorg-dialog.yml
@@ -47,7 +47,7 @@ jobs:
                   cache: 'yarn'
 
             - name: Build and start e2e server
-              uses: cypress-io/github-action@v6.5.0
+              uses: cypress-io/github-action@v6.6.0
               env:
                   DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false
                   PUBLIC_PATH: /familie/sykdom-i-familien/soknad/omsorgsdager-aleneomsorg

diff --git a/.github/workflows/test.omsorgspengesøknad.yml b/.github/workflows/test.omsorgspengesøknad.yml
@@ -47,7 +47,7 @@ jobs:
                   cache: 'yarn'
 
             - name: Build and start e2e server
-              uses: cypress-io/github-action@v6.5.0
+              uses: cypress-io/github-action@v6.6.0
               env:
                   DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false
                   PUBLIC_PATH: /familie/sykdom-i-familien/soknad/omsorgspenger

diff --git a/.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml b/.github/workflows/test.pleiepenger-i-livets-sluttfase-soknad.yml
@@ -34,7 +34,8 @@ jobs:
             - name: Run code tests
               run: yarn test --filter=pleiepenger-i-livets-sluttfase-soknad
 
-    run-cypress-test:
+    run-playwright-test:
+        timeout-minutes: 60
         runs-on: ubuntu-latest
         steps:
             - name: Checkout
@@ -46,25 +47,14 @@ jobs:
                   node-version: 18
                   cache: 'yarn'
 
-            - name: Build and start e2e server
-              uses: cypress-io/[email protected]
-              env:
-                  DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false
-                  PUBLIC_PATH: /familie/sykdom-i-familien/soknad/pleiepenger-i-livets-sluttfase
-                  FRONTEND_API_PATH: http://localhost:8089/
-                  CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-                  APPSTATUS_PROJECT_ID: ryujtq87
-                  APPSTATUS_DATASET: staging
-              with:
-                  project: ./apps/pleiepenger-i-livets-sluttfase-soknad/e2e
-                  build: yarn build-pleiepenger-i-livets-sluttfase-soknad
-                  start: yarn turbo start-e2e-server --filter=pleiepenger-i-livets-sluttfase-soknad
-                  wait-on: 'http://localhost:8080/familie/sykdom-i-familien/soknad/pleiepenger-i-livets-sluttfase/alive'
-                  wait-on-timeout: 60
-                  runTests: false
+            - name: Install dependencies
+              run: yarn
+
+            - name: Install Playwright Browsers
+              run: npx playwright install chromium
+
+            - name: Build application
+              run: yarn build-app --filter=pleiepenger-i-livets-sluttfase-soknad
 
-            - name: Run cypress tests
-              run: yarn turbo cypress-run --filter=pleiepenger-i-livets-sluttfase-soknad
-              env:
-                  CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
+            - name: Run tests
+              run: yarn turbo playwright-test --filter=pleiepenger-i-livets-sluttfase-soknad
diff --git a/.github/workflows/test.pleiepenger-sykt-barn.yml b/.github/workflows/test.pleiepenger-sykt-barn.yml
@@ -44,7 +44,7 @@ jobs:
                   cache: 'yarn'
 
             - name: Build and start e2e server
-              uses: cypress-io/github-action@v6.5.0
+              uses: cypress-io/github-action@v6.6.0
               env:
                   DEKORATOR_URL: https://www.nav.no/dekoratoren/?simple=true&chatbot=false
                   PUBLIC_PATH: /familie/sykdom-i-familien/soknad/pleiepenger

diff --git a/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json b/apps/ekstra-omsorgsdager-andre-forelder-ikke-tilsyn/package.json
@@ -22,9 +22,9 @@
         "test": "react-scripts test --watchAll=false --env=jsdom"
     },
     "dependencies": {
-        "@navikt/ds-css": "5.8.0",
-        "@navikt/ds-react": "5.8.0",
-        "@navikt/ds-tailwind": "5.8.0",
+        "@navikt/ds-css": "5.9.1",
+        "@navikt/ds-react": "5.9.1",
+        "@navikt/ds-tailwind": "5.9.1",
         "@navikt/sif-app-register": "workspace:*",
         "@navikt/sif-common-amplitude": "workspace:*",
         "@navikt/sif-common-core-ds": "workspace:*",
@@ -44,7 +44,7 @@
         "helmet": "7.0.0",
         "history": "5.3.0",
         "http-proxy-middleware": "2.0.6",
-        "jose": "5.0.1",
+        "jose": "5.0.2",
         "mustache-express": "1.3.2",
         "object-hash": "3.0.0",
         "openid-client": "5.6.1",
@@ -53,7 +53,7 @@
         "react-dom": "18.2.0",
         "react-fast-compare": "3.2.2",
         "react-intl": "6.5.1",
-        "react-router-dom": "6.17.0",
+        "react-router-dom": "6.18.0",
         "vite": "4.5.0",
         "vite-plugin-checker": "0.6.2"
     },
@@ -67,7 +67,7 @@
         "@testing-library/react": "14.0.0",
         "@types/jest": "29.5.7",
         "@types/object-hash": "3.0.5",
-        "@types/react": "18.2.33",
+        "@types/react": "18.2.34",
         "@types/react-dom": "18.2.14",
         "@types/react-router-dom": "5.3.3",
         "babel-polyfill": "6.26.0",