Merge pull request #3322 from DFE-Digital/static-error-pages

[LUPEYALPHA-1168] Upgrade static error pages to govuk 5.7.1
DFE-Digital · Oct 16, 2024 · bcac317 · bcac317
2 parents 2d0e251 + e94851e
commit bcac317
Show file tree

Hide file tree

Showing 19 changed files with 38 additions and 22 deletions.
diff --git a/public/404.html b/public/404.html
@@ -8,12 +8,12 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="/assets/images/favicon.ico" type="image/x-icon" />
-    <link rel="mask-icon" href="/assets/images/govuk-icon-mask.svg" color="#0b0c0c" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/assets/images/govuk-icon-180.png" />
-    <link rel="apple-touch-icon" sizes="192x192" href="/assets/images/govuk-icon-192.png" />
-    <link rel="apple-touch-icon" sizes="512x512" href="/assets/images/govuk-icon-512.png" />
-    <link href="/govuk-frontend-5.3.1.min.css" rel="stylesheet" />
+    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="/images/favicon.ico" type="image/x-icon" />
+    <link rel="mask-icon" href="/images/govuk-icon-mask.svg" color="#0b0c0c" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/images/govuk-icon-180.png" />
+    <link rel="apple-touch-icon" sizes="192x192" href="/images/govuk-icon-192.png" />
+    <link rel="apple-touch-icon" sizes="512x512" href="/images/govuk-icon-512.png" />
+    <link href="/govuk-frontend-5.7.1.min.css" rel="stylesheet" />
   </head>
 
   <body class="govuk-template__body">

diff --git a/public/422.html b/public/422.html
@@ -8,12 +8,12 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="/assets/images/favicon.ico" type="image/x-icon" />
-    <link rel="mask-icon" href="/assets/images/govuk-icon-mask.svg" color="#0b0c0c" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/assets/images/govuk-icon-180.png" />
-    <link rel="apple-touch-icon" sizes="192x192" href="/assets/images/govuk-icon-192.png" />
-    <link rel="apple-touch-icon" sizes="512x512" href="/assets/images/govuk-icon-512.png" />
-    <link href="/govuk-frontend-5.3.1.min.css" rel="stylesheet" />
+    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="/images/favicon.ico" type="image/x-icon" />
+    <link rel="mask-icon" href="/images/govuk-icon-mask.svg" color="#0b0c0c" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/images/govuk-icon-180.png" />
+    <link rel="apple-touch-icon" sizes="192x192" href="/images/govuk-icon-192.png" />
+    <link rel="apple-touch-icon" sizes="512x512" href="/images/govuk-icon-512.png" />
+    <link href="/govuk-frontend-5.7.1.min.css" rel="stylesheet" />
   </head>
 
   <body class="govuk-template__body">

diff --git a/public/500.html b/public/500.html
@@ -8,13 +8,12 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
 
-    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="/assets/images/favicon.ico" type="image/x-icon" />
-    <link rel="mask-icon" href="/assets/images/govuk-icon-mask.svg" color="#0b0c0c" />
-    <link rel="apple-touch-icon" sizes="180x180" href="/assets/images/govuk-icon-180.png" />
-    <link rel="apple-touch-icon" sizes="192x192" href="/assets/images/govuk-icon-192.png" />
-    <link rel="apple-touch-icon" sizes="512x512" href="/assets/images/govuk-icon-512.png" />
-    <link rel="apple-touch-icon" href="/assets/images/govuk-apple-touch-icon.png" />
-    <link href="/govuk-frontend-5.3.1.min.css" rel="stylesheet" />
+    <link rel="shortcut icon" sizes="16x16 32x32 48x48" href="/images/favicon.ico" type="image/x-icon" />
+    <link rel="mask-icon" href="/images/govuk-icon-mask.svg" color="#0b0c0c" />
+    <link rel="apple-touch-icon" sizes="180x180" href="/images/govuk-icon-180.png" />
+    <link rel="apple-touch-icon" sizes="192x192" href="/images/govuk-icon-192.png" />
+    <link rel="apple-touch-icon" sizes="512x512" href="/images/govuk-icon-512.png" />
+    <link href="/govuk-frontend-5.7.1.min.css" rel="stylesheet" />
   </head>
 
   <body class="govuk-template__body">

diff --git a/public/favicon.ico b/public/favicon.ico
diff --git a/public/fonts/bold-affa96571d-v2.woff b/public/fonts/bold-affa96571d-v2.woff
diff --git a/public/fonts/bold-b542beb274-v2.woff2 b/public/fonts/bold-b542beb274-v2.woff2
diff --git a/public/fonts/light-94a07e06a1-v2.woff2 b/public/fonts/light-94a07e06a1-v2.woff2
diff --git a/public/fonts/light-f591b13f7d-v2.woff b/public/fonts/light-f591b13f7d-v2.woff
diff --git a/public/govuk-frontend-5.3.1.min.css b/public/govuk-frontend-5.3.1.min.css
diff --git a/public/govuk-frontend-5.7.1.min.css b/public/govuk-frontend-5.7.1.min.css
diff --git a/public/images/favicon.ico b/public/images/favicon.ico
diff --git a/public/images/favicon.svg b/public/images/favicon.svg
diff --git a/public/images/govuk-crest.svg b/public/images/govuk-crest.svg
diff --git a/public/images/govuk-icon-180.png b/public/images/govuk-icon-180.png
diff --git a/public/images/govuk-icon-192.png b/public/images/govuk-icon-192.png
diff --git a/public/images/govuk-icon-512.png b/public/images/govuk-icon-512.png
diff --git a/public/images/govuk-icon-mask.svg b/public/images/govuk-icon-mask.svg
diff --git a/public/images/govuk-opengraph-image.png b/public/images/govuk-opengraph-image.png
diff --git a/spec/features/static_error_pages_spec.rb b/spec/features/static_error_pages_spec.rb
@@ -0,0 +1,15 @@
+require "rails_helper"
+
+RSpec.feature "static error pages", js: true do
+  scenario "404" do
+    expect { visit "/404" }.not_to raise_error
+  end
+
+  scenario "422" do
+    expect { visit "/422" }.not_to raise_error
+  end
+
+  scenario "500" do
+    expect { visit "/500" }.not_to raise_error
+  end
+end