Skip to content

Commit

Permalink
Remove image tag frmo favicon_link_tag
Browse files Browse the repository at this point in the history
  • Loading branch information
richardpattinson committed Jan 14, 2025
1 parent 16d6e22 commit 6f70a3e
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 8 deletions.
11 changes: 5 additions & 6 deletions app/views/layouts/base.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,13 @@
<%= tag :meta, name: 'viewport', content: 'width=device-width, initial-scale=1' %>
<%= tag :meta, name: 'theme-color', content: '#0b0c0c' %>

<link rel="shortcut icon" sizes="16x16 32x32 48x48" href="favicon.ico" type="image/x-icon">
<link rel="mask-icon" href="govuk-mask-icon.svg" color="#0b0c0c">
<%= favicon_link_tag image_path('favicon.ico'), type: nil, sizes: "48x48" %>
<%= favicon_link_tag image_path('favicon.svg'), type: 'image/svg+xml', sizes: "any" %>
<%= favicon_link_tag image_path('govuk-icon-mask.svg'), rel: 'mask-icon', color: "#0b0c0c", type: nil %>
<%= favicon_link_tag image_path('govuk-icon-180.png'), rel: 'apple-touch-icon', type: nil %>
<%= favicon_link_tag 'favicon.ico', type: nil, sizes: "48x48" %>
<%= favicon_link_tag 'favicon.svg', type: 'image/svg+xml', sizes: "48x48" %>
<%= favicon_link_tag 'govuk-icon-mask.svg', rel: 'mask-icon', color: "#0b0c0c", type: nil %>
<%= favicon_link_tag 'govuk-icon-180.png', rel: 'apple-touch-icon', type: nil %>

<%= tag :meta, property: 'og:image', content: image_path('govuk-opengraph-image.png') %>
<%= tag :meta, property: 'og:image', content: 'govuk-opengraph-image.png' %>

<%= stylesheet_link_tag "main" %>
<%= javascript_include_tag "main", defer: true %>
Expand Down
1 change: 1 addition & 0 deletions public/favicon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/govuk-icon-180.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 1 addition & 0 deletions public/govuk-icon-mask.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added public/govuk-opengraph-image.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 11 additions & 2 deletions spec/system/trn_requests_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -372,8 +372,7 @@

it "service is closed" do
given_the_service_is_closed
and_i_visit_the_home_page
then_i_should_not_see_the_home_page
when_i_visit_the_homepage_i_should_get_an_authentication_error

when_i_am_authorized_as_a_support_user
and_i_visit_the_home_page
Expand Down Expand Up @@ -1158,4 +1157,14 @@ def when_i_navigate_to_the_name_page
def when_i_navigate_to_the_email_page
visit email_path
end

def then_i_should_see_an_auth_error
expect(response).to raise_error(Ferrum::AuthError)
end

def when_i_visit_the_homepage_i_should_get_an_authentication_error
expect {
visit root_path
}.to raise_error(Ferrum::StatusError, /ERR_INVALID_AUTH_CREDENTIALS/)
end
end

0 comments on commit 6f70a3e

Please sign in to comment.