Skip to content

Commit

Permalink
Upgrade dependencies
Browse files Browse the repository at this point in the history
In order to get the tests passing, we need to upgrade the GOVUK
component library and Pagy, which is a dependency of GOVUK components.
  • Loading branch information
felixclack committed Oct 18, 2024
1 parent c083804 commit 253f55e
Show file tree
Hide file tree
Showing 6 changed files with 104 additions and 122 deletions.
3 changes: 0 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,5 @@ jobs:
- name: Setup DB
run: bin/rails db:prepare

- name: Start tmate session
uses: mxschmitt/action-tmate@v3

- name: Run tests
run: bin/bundle exec rspec --format documentation
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ gem "dfe-autocomplete",
ref: "11738c0"
gem "faraday", "~> 2.9"
gem "gds_zendesk"
gem "govuk-components", "~> 5.0.2"
gem "govuk-components", "~> 5.7.0"
gem "govuk_design_system_formbuilder"
gem "govuk_markdown", "~> 2.0"
gem "jsbundling-rails"
Expand Down
36 changes: 18 additions & 18 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -186,10 +186,10 @@ GEM
zendesk_api (>= 1.37, < 4.0)
globalid (1.2.1)
activesupport (>= 6.1)
govuk-components (5.0.2)
govuk-components (5.7.0)
html-attributes-utils (~> 1.0.0, >= 1.0.0)
pagy (~> 6.0)
view_component (>= 3.9, < 3.10)
pagy (>= 6, < 10)
view_component (>= 3.9, < 3.17)
govuk_design_system_formbuilder (5.0.0)
actionview (>= 6.1)
activemodel (>= 6.1)
Expand Down Expand Up @@ -242,7 +242,7 @@ GEM
rack (>= 2.1.4.1)
marcel (1.0.4)
matrix (0.4.2)
method_source (1.0.0)
method_source (1.1.0)
mini_mime (1.1.5)
minitest (5.25.1)
msgpack (1.6.0)
Expand Down Expand Up @@ -288,7 +288,7 @@ GEM
actionpack (>= 4.2)
omniauth (~> 2.0)
orm_adapter (0.5.0)
pagy (6.4.3)
pagy (9.1.0)
parallel (1.24.0)
parser (3.3.5.0)
ast (~> 2.4.1)
Expand Down Expand Up @@ -378,18 +378,18 @@ GEM
rinku (2.0.6)
rladr (1.2.0)
rouge (4.4.0)
rspec (3.12.0)
rspec-core (~> 3.12.0)
rspec-expectations (~> 3.12.0)
rspec-mocks (~> 3.12.0)
rspec-core (3.12.2)
rspec-support (~> 3.12.0)
rspec-expectations (3.12.3)
rspec (3.13.0)
rspec-core (~> 3.13.0)
rspec-expectations (~> 3.13.0)
rspec-mocks (~> 3.13.0)
rspec-core (3.13.1)
rspec-support (~> 3.13.0)
rspec-expectations (3.13.3)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-mocks (3.12.6)
rspec-support (~> 3.13.0)
rspec-mocks (3.13.2)
diff-lcs (>= 1.2.0, < 2.0)
rspec-support (~> 3.12.0)
rspec-support (~> 3.13.0)
rspec-rails (6.1.1)
actionpack (>= 6.1)
activesupport (>= 6.1)
Expand All @@ -398,7 +398,7 @@ GEM
rspec-expectations (~> 3.12)
rspec-mocks (~> 3.12)
rspec-support (~> 3.12)
rspec-support (3.12.1)
rspec-support (3.13.1)
rubocop (1.60.2)
json (~> 2.3)
language_server-protocol (>= 3.17.0)
Expand Down Expand Up @@ -513,7 +513,7 @@ GEM
useragent (0.16.10)
vcr (6.2.0)
version_gem (1.1.1)
view_component (3.9.0)
view_component (3.16.0)
activesupport (>= 5.2.0, < 8.0)
concurrent-ruby (~> 1.0)
method_source (~> 1.0)
Expand Down Expand Up @@ -571,7 +571,7 @@ DEPENDENCIES
faraday (~> 2.9)
foreman (~> 0.87.2)
gds_zendesk
govuk-components (~> 5.0.2)
govuk-components (~> 5.7.0)
govuk_design_system_formbuilder
govuk_markdown (~> 2.0)
jsbundling-rails
Expand Down
2 changes: 0 additions & 2 deletions app/views/layouts/base.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
<%= 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 %>
Expand Down
Loading

0 comments on commit 253f55e

Please sign in to comment.