diff --git a/src/components/bulk/Innsending.ts b/src/components/bulk/Innsending.ts index c69b6be6..757fc2ca 100644 --- a/src/components/bulk/Innsending.ts +++ b/src/components/bulk/Innsending.ts @@ -33,7 +33,7 @@ export default ( if (response.status === 401) { setTokenExpired(true); return validerteAnsatte; - } else if (response.status === 200) { + } else if (response.status === 200 || response.status === 201) { return response .json() .then((data) => diff --git a/src/components/bulk/berikAnsatte.test.ts b/src/components/bulk/berikAnsatte.test.ts index a215f312..0262dd31 100644 --- a/src/components/bulk/berikAnsatte.test.ts +++ b/src/components/bulk/berikAnsatte.test.ts @@ -1,7 +1,8 @@ import berikAnsatte from './berikAnsatte'; import { BackendStatus, - BackendResponseState + BackendResponseState, + SkjemaStatus } from '../../data/types/sporenstreksTypes'; import { Ansatt } from './Ansatt'; @@ -478,4 +479,71 @@ describe('berikAnsatte', () => { expect(berikAnsatte(ansatte, backendResponce)).toEqual(expected); }); + + it('should set the status for virksomhetsnummer', () => { + const ansatte: Ansatt[] = [ + { + id: 1, + fnr: '1', + fom: 'fom', + tom: 'tom', + status: 1, + oppdatert: 1 + }, + { + id: 2, + fnr: '2', + fom: 'fom', + tom: 'tom', + status: 2, + oppdatert: 2 + }, + { + id: 3, + fnr: '3', + fom: 'fom', + tom: 'tom', + status: 3, + oppdatert: 3 + } + ]; + + const backendResponce: BackendStatus[] = [ + { + status: BackendResponseState.GENERIC_ERROR, + validationErrors: null, + genericMessage: null, + referenceNumber: null + } + ]; + + const expected: Ansatt[] = [ + { + fnr: '1', + fom: 'fom', + id: 1, + oppdatert: 1, + status: SkjemaStatus.ERRORBACKEND, + tom: 'tom' + }, + { + fnr: '2', + fom: 'fom', + id: 2, + oppdatert: 2, + status: SkjemaStatus.GODKJENT, + tom: 'tom' + }, + { + fnr: '3', + fom: 'fom', + id: 3, + oppdatert: 3, + status: SkjemaStatus.VALIDERINGSFEIL, + tom: 'tom' + } + ]; + + expect(berikAnsatte(ansatte, backendResponce)).toEqual(expected); + }); }); diff --git a/tests/bulkinnsending.ts b/tests/bulkinnsending.ts index 0c116331..eea67cda 100644 --- a/tests/bulkinnsending.ts +++ b/tests/bulkinnsending.ts @@ -50,7 +50,7 @@ const cookieMock = RequestMock() .onRequestTo(grunnBeloep) .respond(grunnBeloepVerdier, 200, mockHeaders) .onRequestTo(innsendingAPI) - .respond(null, 201, mockHeaders); + .respond([{ status: 'OK', referenceNumber: '10' }], 201, mockHeaders); fixture`Bulkinnsending` .page`http://localhost:3000/nettrefusjon/bulk/?bedrift=810007842&TestCafe=running` @@ -127,9 +127,9 @@ test('Klikk submit uten data, fjern feilmeldinger en etter en og send inn', asyn await t // .debug() .click(tilDato) - .typeText(tilDato, '01.12.2021') + .typeText(tilDato, '13.12.2021') .click(fraDato) - .typeText(fraDato, '13.12.2021') + .typeText(fraDato, '01.12.2021') .pressKey('tab') .expect(Selector('html').textContent) .notContains('Det må være en gyldig dato');