Skip to content

Commit

Permalink
Fiks test
Browse files Browse the repository at this point in the history
  • Loading branch information
@AndreasDybdahl
AndreasDybdahl committed Nov 12, 2024
1 parent c59a828 commit 7e8daf1
Show file tree
Hide file tree
Showing 10 changed files with 34 additions and 34 deletions.
2 changes: 1 addition & 1 deletion apps/foreldrepengeoversikt/.storybook/storybook-data/annenPartVedtak/annenPartVedtak.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"trekkerDager": true,
"årsak": "ANNET"
},
"forelder": "farMedmor"
"forelder": "FAR_MEDMOR"
}
],
"termindato": "2022-08-17",
Expand Down
16 changes: 8 additions & 8 deletions apps/foreldrepengeoversikt/.storybook/storybook-data/saker/saker.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
},
{
"fom": "2022-07-01",
Expand All @@ -45,7 +45,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
},
{
"fom": "2022-08-12",
Expand All @@ -58,7 +58,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
},
{
"fom": "2022-10-14",
Expand All @@ -71,7 +71,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor",
"forelder": "MOR",
"samtidigUttak": 50
}
]
Expand Down Expand Up @@ -118,7 +118,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
},
{
"fom": "2023-01-10",
Expand All @@ -131,7 +131,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
},
{
"fom": "2023-02-21",
Expand All @@ -144,7 +144,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
},
{
"fom": "2024-05-28",
Expand All @@ -157,7 +157,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
}
]
},
Expand Down
8 changes: 4 additions & 4 deletions apps/foreldrepengeoversikt/mock-api/mock_data/annenPartVedtak.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
},
{
"fom": "2021-07-01",
Expand All @@ -24,7 +24,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
},
{
"fom": "2021-08-12",
Expand All @@ -37,7 +37,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
},
{
"fom": "2021-10-14",
Expand All @@ -50,7 +50,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
}
],
"termindato": "2021-07-01",
Expand Down
10 changes: 5 additions & 5 deletions apps/foreldrepengeoversikt/mock-api/mock_data/saker.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
},
{
"fom": "2024-09-30",
Expand All @@ -44,7 +44,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
},
{
"fom": "2024-10-28",
Expand All @@ -57,7 +57,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
},
{
"fom": "2024-12-30",
Expand All @@ -70,7 +70,7 @@
"årsak": "ANNET"
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
},
{
"fom": "2025-03-10",
Expand All @@ -93,7 +93,7 @@
}
},
"flerbarnsdager": false,
"forelder": "mor"
"forelder": "MOR"
}
]
},
Expand Down
2 changes: 1 addition & 1 deletion apps/foreldrepengeoversikt/src/sections/din-plan/DinPlan.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ describe('<Default>', () => {
expect(screen.getByText('Helg (er ikke dager med foreldrepenger)')).toBeInTheDocument();
});

it.skip('Skal sjekke at fars kalender er korrekt', async () => {
it('Skal sjekke at fars kalender er korrekt', async () => {
await applyRequestHandlers(FarSøker.parameters.msw);
render(<FarSøker />);

Expand Down
2 changes: 1 addition & 1 deletion apps/foreldrepengesoknad/src/app-data/useSendSøknad.test.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,7 +344,7 @@ describe('useEsSendSøknad', () => {
uttaksplan: [
expect.objectContaining({
erArbeidstaker: false,
forelder: 'farMedmor',
forelder: 'FAR_MEDMOR',
type: 'utsettelse',
årsak: 'FRI',
}),
Expand Down
4 changes: 2 additions & 2 deletions apps/foreldrepengesoknad/src/steps/oppsummering/Oppsummering.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ const defaultUttaksplan = [
{
id: '0',
type: 'uttak',
forelder: 'mor',
forelder: 'MOR',
konto: 'FORELDREPENGER_FØR_FØDSEL',
tidsperiode: {
fom: new Date('2021-11-23T23:00:00.000Z'),
Expand All @@ -152,7 +152,7 @@ const defaultUttaksplan = [
{
id: '3',
type: 'uttak',
forelder: 'mor',
forelder: 'MOR',
konto: 'FELLESPERIODE',
tidsperiode: {
fom: new Date('2022-03-29T23:00:00.000Z'),
Expand Down
8 changes: 4 additions & 4 deletions apps/foreldrepengesoknad/src/utils/eksisterendeSakUtils.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ describe('eksisterendeSakUtils', () => {
fom: new Date('2022-11-09'),
tom: new Date('2022-11-29'),
},
forelder: 'mor',
forelder: 'MOR',
ønskerSamtidigUttak: false,
gradert: false,
samtidigUttakProsent: undefined,
Expand All @@ -148,7 +148,7 @@ describe('eksisterendeSakUtils', () => {
fom: new Date('2022-11-30'),
tom: new Date('2022-12-13'),
},
forelder: 'mor',
forelder: 'MOR',
ønskerSamtidigUttak: true,
gradert: false,
samtidigUttakProsent: '100',
Expand Down Expand Up @@ -248,7 +248,7 @@ describe('eksisterendeSakUtils', () => {
fom: new Date('2022-11-09'),
tom: new Date('2022-11-29'),
},
forelder: 'mor',
forelder: 'MOR',
ønskerSamtidigUttak: false,
gradert: false,
samtidigUttakProsent: undefined,
Expand Down Expand Up @@ -344,7 +344,7 @@ describe('eksisterendeSakUtils', () => {
fom: new Date('2022-11-09'),
tom: new Date('2022-11-29'),
},
forelder: 'farMedmor',
forelder: 'FAR_MEDMOR',
ønskerSamtidigUttak: false,
gradert: false,
samtidigUttakProsent: undefined,
Expand Down
4 changes: 2 additions & 2 deletions packages/fp-common/src/common/types/Forelder.ts
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
export enum Forelder {
mor = 'mor',
farMedmor = 'farMedmor',
mor = 'MOR',
farMedmor = 'FAR_MEDMOR',
}
12 changes: 6 additions & 6 deletions packages/uttaksplan-kalender/src/Uttaksplankalender.stories.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -687,7 +687,7 @@ export const MorAvslåttPeriodeFørste6UkeneGirTapteDager: Story = {
fom: new Date('2023-06-12'),
tom: new Date('2023-06-30'),
},
forelder: 'mor',
forelder: 'MOR',
ønskerSamtidigUttak: false,
gradert: false,
},
Expand All @@ -701,7 +701,7 @@ export const MorAvslåttPeriodeFørste6UkeneGirTapteDager: Story = {
},
avslåttPeriodeType: Periodetype.Uttak,
kontoType: StønadskontoType.Foreldrepenger,
forelder: 'mor',
forelder: 'MOR',
overskrives: true,
visPeriodeIPlan: true,
kanSlettes: true,
Expand All @@ -714,7 +714,7 @@ export const MorAvslåttPeriodeFørste6UkeneGirTapteDager: Story = {
fom: new Date('2023-07-10'),
tom: new Date('2024-05-17'),
},
forelder: 'mor',
forelder: 'MOR',
ønskerSamtidigUttak: false,
gradert: false,
},
Expand All @@ -740,7 +740,7 @@ export const MorAvslåttPeriodeUtenTapteDager: Story = {
fom: new Date('2023-06-12'),
tom: new Date('2023-06-30'),
},
forelder: 'mor',
forelder: 'MOR',
ønskerSamtidigUttak: false,
gradert: false,
},
Expand All @@ -752,7 +752,7 @@ export const MorAvslåttPeriodeUtenTapteDager: Story = {
fom: new Date('2023-07-03'),
tom: new Date('2024-05-17'),
},
forelder: 'mor',
forelder: 'MOR',
ønskerSamtidigUttak: false,
gradert: false,
},
Expand All @@ -766,7 +766,7 @@ export const MorAvslåttPeriodeUtenTapteDager: Story = {
},
avslåttPeriodeType: Periodetype.Uttak,
kontoType: StønadskontoType.Foreldrepenger,
forelder: 'mor',
forelder: 'MOR',
overskrives: true,
visPeriodeIPlan: true,
kanSlettes: true,
Expand Down

0 comments on commit 7e8daf1

Please sign in to comment.