From 4f5136c95a606598c6ec87f558bc8ef21315b348 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20H=C3=A4nninen?= Date: Tue, 26 Nov 2024 10:06:09 +0200 Subject: [PATCH 1/2] =?UTF-8?q?V=C3=A4henn=C3=A4=20muistitarvetta=20k?= =?UTF-8?q?=C3=A4ytt=C3=A4m=C3=A4ll=C3=A4=20vain=20S3-pakettia=20Localstac?= =?UTF-8?q?kista?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose-arm64.yaml | 2 +- docker-compose.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose-arm64.yaml b/docker-compose-arm64.yaml index e4d46ff2d6..5ace3f2752 100644 --- a/docker-compose-arm64.yaml +++ b/docker-compose-arm64.yaml @@ -31,7 +31,7 @@ services: localstack: container_name: koski-localstack - image: localstack/localstack:3.7.2@sha256:811d4cd67e6cc833cd5849ddaac454abd90c0d0fc00d402f8f82ee47926c5e10 + image: localstack/localstack:s3-latest-arm64@sha256:f507334401cd2e074ce57680a9863dd6e2c372aedb2c7829a45db242fda89611 ports: - "127.0.0.1:4566:4566" # LocalStack Gateway - "127.0.0.1:4510-4559:4510-4559" # external services port range diff --git a/docker-compose.yaml b/docker-compose.yaml index 88c72fa281..22d276e304 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -31,7 +31,7 @@ services: localstack: container_name: koski-localstack - image: localstack/localstack:3.7.2@sha256:811d4cd67e6cc833cd5849ddaac454abd90c0d0fc00d402f8f82ee47926c5e10 + image: localstack/localstack:s3-latest@sha256:c43ea609e7957594c47adcce52359425b427feceb7a4b3283eebd64fb949e353 ports: - "127.0.0.1:4566:4566" # LocalStack Gateway - "127.0.0.1:4510-4559:4510-4559" # external services port range From 76c380fd346b41476a45f9c33edcef0d62e1fe33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilkka=20H=C3=A4nninen?= Date: Tue, 26 Nov 2024 10:37:02 +0200 Subject: [PATCH 2/2] Korjaa hajonneet testit --- web/test/spec/RaportitSpec.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/web/test/spec/RaportitSpec.js b/web/test/spec/RaportitSpec.js index 5924c6b086..549d7c7a90 100644 --- a/web/test/spec/RaportitSpec.js +++ b/web/test/spec/RaportitSpec.js @@ -74,6 +74,8 @@ describe('Raporttien luominen', function () { 'Lukiokoulutus', 'Lukiokoulutus (LOPS2021)', 'IB-koulutus', + 'VST', + 'MUKS', 'Yleiset' ]) expect(page.valittuRaporttikategoria()).to.equal('Esiopetus') @@ -110,6 +112,8 @@ describe('Raporttien luominen', function () { 'Lukiokoulutus', 'Lukiokoulutus (LOPS2021)', 'IB-koulutus', + 'VST', + 'MUKS', 'Yleiset' ]) expect(page.valittuRaporttikategoria()).to.equal('Esiopetus') @@ -282,7 +286,7 @@ describe('Raporttien luominen', function () { Authentication().login('kalle'), page.openPage(), page.odotaRaporttikategoriat(), - page.valitseRaporttikategoria(9), // Muut + page.valitseRaporttikategoria(11), // Muut page.haeOrganisaatioita('helsin') ) @@ -302,7 +306,7 @@ describe('Raporttien luominen', function () { Authentication().login('pää'), page.openPage(), page.odotaRaporttikategoriat(), - page.valitseRaporttikategoria(9), // Muut + page.valitseRaporttikategoria(11), // Muut page.haeOrganisaatioita('itä-suomen yliopisto') ) @@ -323,7 +327,7 @@ describe('Raporttien luominen', function () { Authentication().login('pää'), page.openPage(), page.odotaRaporttikategoriat(), - page.valitseRaporttikategoria(9), // Muut + page.valitseRaporttikategoria(11), // Muut page.haeOrganisaatioita('aikuisopisto') ) @@ -414,7 +418,7 @@ describe('Raporttien luominen', function () { Authentication().login('kalle'), page.openPage(), page.odotaRaporttikategoriat(), - page.valitseRaporttikategoria(9) // Muut + page.valitseRaporttikategoria(11) // Muut ) it('Näyttää organisaatiovalitsimen', function () {