adding code change for ACQ-48 and updating jest config to check the c…

…ode coverage
DEFRA · Jan 9, 2025 · 929a71c · 929a71c
1 parent 53645df
commit 929a71c
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 20 deletions.
diff --git a/jest.config.js b/jest.config.js
@@ -16,11 +16,21 @@ module.exports = {
     '<rootDir>/src/__fixtures__',
     '<rootDir>/test-helpers',
     '<rootDir>/mock-api',
-    '<rootDir>/src/server/common/components'
+    '<rootDir>/src/server/common/components',
+    '<rootDir>/src/server/common/helpers',
+    '<rootDir>/src/client/assets/javascripts',
+    '<rootDir>/src/common/helpers/redis-client.js',
+    '<rootDir>/src/config',
+    '<rootDir>/src/helpers',
+    '<rootDir>/src/server/router.js',
+    '<rootDir>/src/server/index.js',
+    '<rootDir>/test-helpers/component-helpers.js',
+    '<rootDir>/src/index.js',
+    '<rootDir>/src/indextest.js'
   ],
   coverageDirectory: '<rootDir>/coverage',
-  collectCoverage: false
-  // coverageReporters: ['text', 'lcov', 'text-summary'],
+  collectCoverage: false,
+  coverageReporters: ['clover', 'json', 'text', 'lcov', 'text-summary']
   // coverageThreshold: {
   //   global: {
   //     branches: 90,

diff --git a/src/server/data/en/monitoring-sites.js b/src/server/data/en/monitoring-sites.js
@@ -2,10 +2,10 @@
 // Pollutant reference data
 
 export const pollutantTypes = {
-  NO2: {
-    title: 'Nitrogen dioxide',
-    href: '/pollutants/nitrogen-dioxide',
-    low_range: '0 to 200'
+  PM25: {
+    title: 'PM2.5',
+    href: '/pollutants/particulate-matter-25',
+    low_range: '0 to 35'
   },
   MP10: {
     title: 'PM10',
@@ -17,10 +17,10 @@ export const pollutantTypes = {
     href: '/pollutants/particulate-matter-10',
     low_range: '0 to 50'
   },
-  PM25: {
-    title: 'PM2.5',
-    href: '/pollutants/particulate-matter-25',
-    low_range: '0 to 35'
+  NO2: {
+    title: 'Nitrogen dioxide',
+    href: '/pollutants/nitrogen-dioxide',
+    low_range: '0 to 200'
   },
   O3: {
     title: 'Ozone',

diff --git a/src/server/locations/location.njk b/src/server/locations/location.njk
@@ -110,14 +110,14 @@
  <p>{{siteTypeDescriptions[site.areaType]}}</p>
   {% set rows = [] %}
 
-  {% for key, pollutant in site.pollutants %}
-
-  {% set pollutantTime = pollutant.time.hour %}
-  {% set pollutantDay = pollutant.time.day %}
-  {% set pollutantMonth = pollutant.time.month %}
-  {% set pollutantYear = pollutant.time.year %}
-      {% set pollutantDetail = pollutantTypes[key] %}
-      {% set row = [
+  {% for key, pollutantDetail in pollutantTypes %}
+   {% set pollutant = site.pollutants[key] %}
+    {% if pollutant %}
+      {% set pollutantTime = pollutant.time.hour %}
+      {% set pollutantDay = pollutant.time.day %}
+      {% set pollutantMonth = pollutant.time.month %}
+      {% set pollutantYear = pollutant.time.year %}
+        {% set row = [
           { 
               html: "<a class='govuk-!-margin-bottom-1' href='" + pollutantDetail.href + "'>" + pollutantDetail.title + "</a><span class='govuk-caption-s govuk-!-margin-bottom-1'>" + daqi.pollutantTable.e + ' ' + pollutantDetail.low_range + "</span>",
               classes: "defra-aq-levels-table__cell--pollutant" 
@@ -130,8 +130,9 @@
               html: "<strong class='daqi-tag daqi-tag--" + (pollutant.daqi if pollutant.daqi else "default-aqi-value") + "'>" + pollutant.band + "</strong>",
               classes: "defra-aq-levels-table__cell--level" 
           }
-      ] %}
+        ] %}
       {% set _ = rows.push(row) %}
+    {% endif %}
   {% endfor %}
   {{ aqLevelsTable({
       id:loop.index,