From 26a6b91b4552af657c6ef1ee2c59820ab8cee280 Mon Sep 17 00:00:00 2001 From: Ben Hardill Date: Tue, 3 Oct 2023 12:54:48 +0100 Subject: [PATCH] Fix tests --- helm/flowforge/templates/configmap.yaml | 4 ++-- helm/flowforge/values.schema.json | 2 +- test/customizations.yml | 4 ++-- test/unit/configmap_spec.js | 15 ++++++++------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/helm/flowforge/templates/configmap.yaml b/helm/flowforge/templates/configmap.yaml index c813f3e0..0cdab502 100644 --- a/helm/flowforge/templates/configmap.yaml +++ b/helm/flowforge/templates/configmap.yaml @@ -150,8 +150,8 @@ data: {{ if and (hasKey .Values.forge.telemetry "sentry") (hasKey .Values.forge.telemetry.sentry "frontend_dsn") -}} sentry: dsn: {{ .Values.forge.telemetry.sentry.frontend_dsn}} - {{ if hasKey .Values.forge.telemetry.dsn "production_mode" }} - production_mode: {{ .Values.forge.telemetry.entry.production_mode }} + {{ if hasKey .Values.forge.telemetry.sentry "production_mode" }} + production_mode: {{ .Values.forge.telemetry.sentry.production_mode }} {{ else }} production_mode: true {{ end }} diff --git a/helm/flowforge/values.schema.json b/helm/flowforge/values.schema.json index d14b15c0..4c34cdc7 100644 --- a/helm/flowforge/values.schema.json +++ b/helm/flowforge/values.schema.json @@ -255,7 +255,7 @@ "production_mode": { "type": "boolean" } - }, + } } } }, diff --git a/test/customizations.yml b/test/customizations.yml index 6f75dc45..2fd1259b 100644 --- a/test/customizations.yml +++ b/test/customizations.yml @@ -45,8 +45,8 @@ forge: apikey: phc_fdlksajfdfadfsafsaf sentry: production_mode: false - frontend_dsn: https://sentry.io/flowforge/flowforge-frontend - backend_dsn: https://sentry.io/flowforge/flowforge-backend + frontend_dsn: 'https://sentry.io/flowforge/flowforge-frontend' + backend_dsn: 'https://sentry.io/flowforge/flowforge-backend' support: enabled: true hubspot: 12345678 diff --git a/test/unit/configmap_spec.js b/test/unit/configmap_spec.js index 9454ae2f..decddf8b 100644 --- a/test/unit/configmap_spec.js +++ b/test/unit/configmap_spec.js @@ -108,17 +108,18 @@ describe('Examine Config Maps', function () { let yml beforeEach(function () { const d = configMaps.filter(doc => doc.metadata.name === 'flowforge-config')[0] - yml = yaml.parse(d.data['customizations.ym']) + yml = yaml.parse(d.data['flowforge.yml']) }) it('has sentry telemetry', function () { - yml.telemetry.sentry.should.have.property('production_mode') - yml.telemetry.sentry.production_mode.should.equal(false) + console.log(yml.telemetry) + yml.telemetry.frontend.sentry.should.have.property('production_mode') + yml.telemetry.frontend.sentry.production_mode.should.equal(false) - yml.telemetry.sentry.should.have.property('frontend_dsn') - yml.telemetry.sentry.frontend_dsn.should.equal('https://sentry.io/flowforge/flowforge-frontend') + yml.telemetry.frontend.sentry.should.have.property('dsn') + yml.telemetry.frontend.sentry.dsn.should.equal('https://sentry.io/flowforge/flowforge-frontend') - yml.telemetry.sentry.should.have.property('backend_dsn') - yml.telemetry.sentry.frontend_dsn.should.equal('https://sentry.io/flowforge/flowforge-backend') + yml.telemetry.backend.sentry.should.have.property('dsn') + yml.telemetry.backend.sentry.dsn.should.equal('https://sentry.io/flowforge/flowforge-backend') }) }) })