Merge pull request #1899 from alphagov/fix-deprecation-warnings

Fix deprecation warnings when running tests
alphagov · Feb 15, 2021 · 4af2c16 · 4af2c16
2 parents fdcf482 + 23687fc
commit 4af2c16
Show file tree

Hide file tree

Showing 9 changed files with 8 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,6 +9,7 @@
 
 ## Unreleased
 
+* Fix deprecation warnings when running tests ([PR #1899](https://github.com/alphagov/govuk_publishing_components/pull/1899))
 * Update `govuk-frontend` base SCSS imports ([PR #1922](https://github.com/alphagov/govuk_publishing_components/pull/1922))
 * Remove redundant import in accordion component ([PR #1923](https://github.com/alphagov/govuk_publishing_components/pull/1923))
 * Fix toggle click tracking on step-by-steps ([PR #1925](https://github.com/alphagov/govuk_publishing_components/pull/1925))

diff --git a/app/models/govuk_publishing_components/audit_applications.rb b/app/models/govuk_publishing_components/audit_applications.rb
@@ -14,7 +14,7 @@ def initialize(path, name)
         stylesheets = Dir["#{path}/app/assets/stylesheets/**/*.scss"]
         javascripts = Dir["#{path}/app/assets/javascripts/**/*.js"]
 
-        find_components = /(?<=govuk_publishing_components\/components\/)[\/a-zA-Z_-]+(?=['"])/
+        find_components = /(?<=govuk_publishing_components\/components\/)[a-zA-Z_-]+(?=['"])/
 
         @find_all_stylesheets = /@import ["']{1}govuk_publishing_components\/all_components/
         find_stylesheets = /(?<=@import ["']{1}govuk_publishing_components\/components\/)(?!print\/)+[a-zA-Z_-]+(?=['"])/

diff --git a/app/views/govuk_publishing_components/components/_attachment.html.erb b/app/views/govuk_publishing_components/components/_attachment.html.erb
@@ -41,11 +41,11 @@
                 "aria-hidden": true,
                 data: data_attributes do %>
       <% if attachment.document? %>
-        <%= render "govuk_publishing_components/components/attachment/thumbnail_document.svg" %>
+        <%= render "govuk_publishing_components/components/attachment/thumbnail_document" %>
       <% elsif attachment.spreadsheet? %>
-        <%= render "govuk_publishing_components/components/attachment/thumbnail_spreadsheet.svg" %>
+        <%= render "govuk_publishing_components/components/attachment/thumbnail_spreadsheet" %>
       <% else %>
-        <%= render "govuk_publishing_components/components/attachment/thumbnail_generic.svg" %>
+        <%= render "govuk_publishing_components/components/attachment/thumbnail_generic" %>
       <% end %>
     <% end %>
   <% end %>

diff --git a/...onents/attachment/_thumbnail_document.svg → ...s/attachment/_thumbnail_document.html.erb b/...onents/attachment/_thumbnail_document.svg → ...s/attachment/_thumbnail_document.html.erb
diff --git a/...ponents/attachment/_thumbnail_generic.svg → ...ts/attachment/_thumbnail_generic.html.erb b/...ponents/attachment/_thumbnail_generic.svg → ...ts/attachment/_thumbnail_generic.html.erb
diff --git a/...nts/attachment/_thumbnail_spreadsheet.svg → ...ttachment/_thumbnail_spreadsheet.html.erb b/...nts/attachment/_thumbnail_spreadsheet.svg → ...ttachment/_thumbnail_spreadsheet.html.erb
diff --git a/spec/dummy/app/views/layouts/application.html.erb b/spec/dummy/app/views/layouts/application.html.erb
@@ -13,7 +13,7 @@
     <div id='wrapper'>
       <%= yield %>
     </div>
-    <%= render "govuk_publishing_components/components/attachment/thumbnail_spreadsheet.svg" %>
+    <%= render "govuk_publishing_components/components/attachment/thumbnail_spreadsheet" %>
     <%= render "govuk_publishing_components/components/feedback" %>
   </body>
 </html>
diff --git a/spec/dummy/config/environments/development.rb b/spec/dummy/config/environments/development.rb
@@ -46,7 +46,7 @@
   config.assets.quiet = true
 
   # Raises error for missing translations
-  # config.action_view.raise_on_missing_translations = true
+  # config.i18n.raise_on_missing_translations = true
 
   # Use an evented file watcher to asynchronously detect changes in source code,
   # routes, locales, etc. This feature depends on the listen gem.

diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb
@@ -38,7 +38,7 @@
   config.active_support.deprecation = :stderr
 
   # Raises error for missing translations
-  config.action_view.raise_on_missing_translations = true
+  config.i18n.raise_on_missing_translations = true
 
   config.assets.digest = false