Rubocop: Layout/HashAlignment

Merge pull request #4536 from Growstuff/Capybara/NegationMatcher
Rubocop: Capybara/NegationMatcher
2026-05-25 01:13:03 -04:00 · 2026-04-23 12:56:58 +00:00 · 2026-04-23 22:15:53 +09:30 · 2026-04-23 22:15:42 +09:30 · 2026-04-23 22:07:41 +09:30 · 2026-04-23 12:30:06 +00:00
43 changed files with 1279 additions and 1619 deletions
--- a/.github/workflows/ci-features-admin.yml
+++ b/.github/workflows/ci-features-admin.yml
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-comments.yml
+++ b/.github/workflows/ci-features-comments.yml
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-conversations.yml
+++ b/.github/workflows/ci-features-conversations.yml
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-crops.yml
+++ b/.github/workflows/ci-features-crops.yml
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-gardens.yml
+++ b/.github/workflows/ci-features-gardens.yml
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-harvests.yml
+++ b/.github/workflows/ci-features-harvests.yml
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-home.yml
+++ b/.github/workflows/ci-features-home.yml
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-members.yml
+++ b/.github/workflows/ci-features-members.yml
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-places.yml
+++ b/.github/workflows/ci-features-places.yml
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-plantings.yml
+++ b/.github/workflows/ci-features-plantings.yml
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-posts.yml
+++ b/.github/workflows/ci-features-posts.yml
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-seeds.yml
+++ b/.github/workflows/ci-features-seeds.yml
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-timeline.yml
+++ b/.github/workflows/ci-features-timeline.yml
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -103,7 +103,7 @@ jobs:

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features.yml
+++ b/.github/workflows/ci-features.yml
@@ -61,7 +61,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
@@ -112,7 +112,7 @@ jobs:

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,7 +76,7 @@ jobs:
        id: yarn-cache-dir-path
        run: echo "::set-output name=dir::$(yarn cache dir)"
      - name: Setup yarn cache
-        uses: actions/cache@v4
+        uses: actions/cache@v5
        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
        with:
          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
@@ -91,7 +91,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -13,14 +13,6 @@ Bundler/OrderedGems:
  Exclude:
    - 'Gemfile'

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: have_no, not_to
-Capybara/NegationMatcher:
-  Exclude:
-    - 'spec/features/admin/reverting_crops_spec.rb'
-
 # Offense count: 19
 Capybara/NegationMatcherAfterVisit:
  Exclude:
@@ -99,14 +91,6 @@ FactoryBot/ExcessiveCreateList:
 FactoryBot/SyntaxMethods:
  Enabled: false

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
-Layout/EmptyLinesAroundClassBody:
-  Exclude:
-    - 'db/migrate/20251130035700_create_versions.rb'
-
 # Offense count: 312
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
@@ -115,35 +99,9 @@ Layout/EmptyLinesAroundClassBody:
 # SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
 Layout/HashAlignment:
  Exclude:
-    - 'app/helpers/application_helper.rb'
-    - 'app/helpers/crops_helper.rb'
-    - 'app/models/concerns/search_harvests.rb'
-    - 'app/models/concerns/search_plantings.rb'
-    - 'app/models/crop.rb'
-    - 'config/sitemap.rb'
-    - 'lib/tasks/import.rake'
    - 'spec/requests/api/v1/activities_request_spec.rb'
    - 'spec/requests/api/v1/members_request_spec.rb'

-# Offense count: 7
-# This cop supports safe autocorrection (--autocorrect).
-Layout/HeredocIndentation:
-  Exclude:
-    - 'db/migrate/20190712003735_add_like_counter_caches.rb'
-    - 'db/migrate/20191226024813_crop_harvest_counter_cache.rb'
-    - 'db/migrate/20191226024957_crop_photo_counter_cache.rb'
-    - 'db/migrate/20191226025124_plant_part_harvest_counter_cache.rb'
-    - 'db/migrate/20191226025225_post_comment_counter_cache.rb'
-    - 'db/migrate/20250824085224_add_photos_comment_count.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Width, EnforcedStyleAlignWith, AllowedPatterns.
-# SupportedStylesAlignWith: start_of_line, relative_to_receiver
-Layout/IndentationWidth:
-  Exclude:
-    - 'spec/requests/api/v1/activities_request_spec.rb'
-
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
@@ -157,14 +115,6 @@ Layout/LineLength:
    - 'db/seeds.rb'
    - 'spec/requests/api/v1/activities_request_spec.rb'

-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'Gemfile'
-    - 'app/helpers/crops_helper.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Lint/AmbiguousOperatorPrecedence:
@@ -692,12 +642,6 @@ Rails/RakeEnvironment:
    - 'lib/tasks/i18n.rake'
    - 'lib/tasks/testing.rake'

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Rails/RedirectBackOrTo:
-  Exclude:
-    - 'app/controllers/follows_controller.rb'
-
 # Offense count: 9
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedReceivers.
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,31 +0,0 @@
-sudo: required
-language: ruby
-dist: bionic
-branches:
-  only:
-    - mainline
-    - dev
-cache:
-  bundler: true
-  yarn: true
-  directories:
-    - tmp/cache/assets/test/sprockets
-env:
-  global:
-    - secure: "Z5TpM2jEX4UCvNePnk/LwltQX48U2u9BRc+Iypr1x9QW2o228QJhPIOH39a8RMUrepGnkQIq9q3ZRUn98RfrJz1yThtlNFL3NmzdQ57gKgjGwfpa0e4Dwj/ZJqV2D84tDGjvdVYLP7zzaYZxQcwk/cgNpzKf/jq97HLNP7CYuf4="
-before_deploy:
-  - bundle exec script/heroku_maintenance.rb on
-deploy:
-  provider: heroku
-  api_key:
-    secure: "WrQxf0fEKkCdXrjcejurobOnNNz3he4dDwjBbToXbQTQNDObPp7NetJrLsfM8FiUFEeOuvhIHHiDQtMvY720zGGAGxDptvgFS+0QHCUqoTRZA/yFfUmHlG2jROXTzk5uVK0AE4k6Ion5kX8+mM0EnMT/7u+MTFiukrJctSiEXfg="
-  on:
-    repo: Growstuff/growstuff
-  app:
-    dev: growstuff-staging
-    mainline: growstuff-prod
-  run:
-    - "script/deploy-tasks.sh"
-    - restart
-after_deploy:
-  - bundle exec script/heroku_maintenance.rb off
--- a/6
+++ b/6
@@ -139,7 +139,7 @@ gem "msgpack"
 # Pinned due to RAILS_ENV=production bundle exec rake assets:precompile failing with ArgumentError: wrong number of arguments (given 1, expected 0) (ArgumentError)
 # /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/connection_pool-3.0.2/lib/connection_pool.rb:48:in `initialize'
 # /tmp/build_8301a541/vendor/bundle/ruby/3.3.0/gems/activesupport-7.2.3/lib/active_support/cache/mem_cache_store.rb:63:in `new'
-gem "connection_pool", "< 3" 
+gem "connection_pool", "< 3"

 group :production do
  gem 'bonsai-elasticsearch-rails' # Integration with Bonsa-Elasticsearch on heroku
@@ -200,10 +200,6 @@ group :test do
  gem 'vcr'
 end

-group :travis do
-  gem 'platform-api'
-end
-
 gem "i18n_data", "~> 1.1"

 gem "paper_trail", "~> 17.0"
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -33,29 +33,29 @@ GEM
 GEM
  remote: https://rubygems.org/
  specs:
-    actioncable (7.2.3)
-      actionpack (= 7.2.3)
-      activesupport (= 7.2.3)
+    actioncable (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
      nio4r (~> 2.0)
      websocket-driver (>= 0.6.1)
      zeitwerk (~> 2.6)
-    actionmailbox (7.2.3)
-      actionpack (= 7.2.3)
-      activejob (= 7.2.3)
-      activerecord (= 7.2.3)
-      activestorage (= 7.2.3)
-      activesupport (= 7.2.3)
+    actionmailbox (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
      mail (>= 2.8.0)
-    actionmailer (7.2.3)
-      actionpack (= 7.2.3)
-      actionview (= 7.2.3)
-      activejob (= 7.2.3)
-      activesupport (= 7.2.3)
+    actionmailer (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      actionview (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
      mail (>= 2.8.0)
      rails-dom-testing (~> 2.2)
-    actionpack (7.2.3)
-      actionview (= 7.2.3)
-      activesupport (= 7.2.3)
+    actionpack (7.2.3.1)
+      actionview (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
      cgi
      nokogiri (>= 1.8.5)
      racc
@@ -65,15 +65,15 @@ GEM
      rails-dom-testing (~> 2.2)
      rails-html-sanitizer (~> 1.6)
      useragent (~> 0.16)
-    actiontext (7.2.3)
-      actionpack (= 7.2.3)
-      activerecord (= 7.2.3)
-      activestorage (= 7.2.3)
-      activesupport (= 7.2.3)
+    actiontext (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
      globalid (>= 0.6.0)
      nokogiri (>= 1.8.5)
-    actionview (7.2.3)
-      activesupport (= 7.2.3)
+    actionview (7.2.3.1)
+      activesupport (= 7.2.3.1)
      builder (~> 3.1)
      cgi
      erubi (~> 1.11)
@@ -82,29 +82,29 @@ GEM
    active_link_to (1.0.5)
      actionpack
      addressable
-    active_median (0.6.0)
-      activesupport (>= 7.1)
+    active_median (1.0.0)
+      activesupport (>= 7.2)
    active_record_union (1.4.0)
      activerecord (>= 6.0)
    active_utils (3.6.0)
      activesupport (>= 4.2)
      i18n
-    activejob (7.2.3)
-      activesupport (= 7.2.3)
+    activejob (7.2.3.1)
+      activesupport (= 7.2.3.1)
      globalid (>= 0.3.6)
-    activemodel (7.2.3)
-      activesupport (= 7.2.3)
-    activerecord (7.2.3)
-      activemodel (= 7.2.3)
-      activesupport (= 7.2.3)
+    activemodel (7.2.3.1)
+      activesupport (= 7.2.3.1)
+    activerecord (7.2.3.1)
+      activemodel (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
      timeout (>= 0.4.0)
-    activestorage (7.2.3)
-      actionpack (= 7.2.3)
-      activejob (= 7.2.3)
-      activerecord (= 7.2.3)
-      activesupport (= 7.2.3)
+    activestorage (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
      marcel (~> 1.0)
-    activesupport (7.2.3)
+    activesupport (7.2.3.1)
      base64
      benchmark (>= 0.3)
      bigdecimal
@@ -113,17 +113,17 @@ GEM
      drb
      i18n (>= 1.6, < 2)
      logger (>= 1.4.2)
-      minitest (>= 5.1)
+      minitest (>= 5.1, < 6)
      securerandom (>= 0.3)
      tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.8)
+    addressable (2.9.0)
      public_suffix (>= 2.0.2, < 8.0)
    ast (2.4.3)
    autoprefixer-rails (10.4.16.0)
      execjs (~> 2)
    aws-eventstream (1.4.0)
-    aws-partitions (1.1206.0)
-    aws-sdk-core (3.241.4)
+    aws-partitions (1.1240.0)
+    aws-sdk-core (3.245.0)
      aws-eventstream (~> 1, >= 1.3.0)
      aws-partitions (~> 1, >= 1.992.0)
      aws-sigv4 (~> 1.9)
@@ -131,24 +131,24 @@ GEM
      bigdecimal
      jmespath (~> 1, >= 1.6.1)
      logger
-    aws-sdk-kms (1.121.0)
-      aws-sdk-core (~> 3, >= 3.241.4)
+    aws-sdk-kms (1.123.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.212.0)
-      aws-sdk-core (~> 3, >= 3.241.4)
+    aws-sdk-s3 (1.220.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
      aws-sdk-kms (~> 1)
      aws-sigv4 (~> 1.5)
    aws-sigv4 (1.12.1)
      aws-eventstream (~> 1, >= 1.0.2)
-    axe-core-api (4.11.1)
+    axe-core-api (4.11.2)
      dumb_delegator
      ostruct
      virtus
-    axe-core-capybara (4.11.1)
-      axe-core-api (= 4.11.1)
+    axe-core-capybara (4.11.2)
+      axe-core-api (= 4.11.2)
      dumb_delegator
-    axe-core-rspec (4.11.1)
-      axe-core-api (= 4.11.1)
+    axe-core-rspec (4.11.2)
+      axe-core-api (= 4.11.2)
      dumb_delegator
      ostruct
      virtus
@@ -157,13 +157,13 @@ GEM
      ice_nine (~> 0.11.0)
      thread_safe (~> 0.3, >= 0.3.1)
    base64 (0.3.0)
-    bcrypt (3.1.21)
+    bcrypt (3.1.22)
    benchmark (0.5.0)
    better_errors (2.10.1)
      erubi (>= 1.0.0)
      rack (>= 0.9.0)
      rouge (>= 1.0.0)
-    bigdecimal (3.3.1)
+    bigdecimal (4.1.2)
    bluecloth (2.2.0)
    bonsai-elasticsearch-rails (7.0.1)
      elasticsearch-model (< 8)
@@ -177,10 +177,11 @@ GEM
      actionpack (>= 6.1)
      activemodel (>= 6.1)
    builder (3.3.0)
-    bullet (8.1.0)
+    bullet (8.1.1)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
-    byebug (12.0.0)
+    byebug (13.0.0)
+      reline (>= 0.6.0)
    cancancan (3.6.1)
    capybara (3.40.0)
      addressable
@@ -235,7 +236,7 @@ GEM
    csv_shaper (1.4.0)
      activesupport (>= 3.0.0)
      csv
-    dalli (5.0.1)
+    dalli (5.0.2)
      logger
    database_cleaner (2.1.0)
      database_cleaner-active_record (>= 2, < 3)
@@ -246,7 +247,7 @@ GEM
    date (3.5.1)
    descendants_tracker (0.0.4)
      thread_safe (~> 0.3, >= 0.3.1)
-    devise (5.0.2)
+    devise (5.0.3)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
      railties (>= 7.0)
@@ -275,18 +276,15 @@ GEM
    elasticsearch-transport (7.0.0)
      faraday
      multi_json
-    erb (6.0.1)
+    erb (6.0.2)
    erubi (1.13.1)
-    erubis (2.7.0)
-    excon (1.3.2)
-      logger
    execjs (2.10.0)
    factory_bot (6.5.5)
      activesupport (>= 6.1.0)
    factory_bot_rails (6.5.1)
      factory_bot (~> 6.5)
      railties (>= 6.1.0)
-    faker (3.5.3)
+    faker (3.8.0)
      i18n (>= 1.8.11, < 2)
    faraday (2.14.1)
      faraday-net_http (>= 2.0, < 3.5)
@@ -315,7 +313,7 @@ GEM
    gravatar-ultimate (2.0.0)
      activesupport (>= 2.3.14)
      rack
-    haml (7.1.0)
+    haml (7.2.0)
      temple (>= 0.8.2)
      thor
      tilt
@@ -324,21 +322,14 @@ GEM
      activesupport (>= 5.1)
      haml (>= 4.0.6)
      railties (>= 5.1)
-    haml_lint (0.68.0)
+    haml_lint (0.73.0)
      haml (>= 5.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
      rainbow
      rubocop (>= 1.0)
      sysexits (~> 1.1)
    hashie (5.1.0)
      logger
-    heroics (0.1.3)
-      base64
-      erubis (~> 2.0)
-      excon
-      moneta
-      multi_json (>= 1.9.2)
-      webrick
    highline (3.1.2)
      reline
    http-accept (1.7.0)
@@ -364,7 +355,7 @@ GEM
      terminal-table (>= 1.5.1)
    i18n_data (1.1.0)
      simple_po_parser (~> 1.1)
-    icalendar (2.12.1)
+    icalendar (2.12.2)
      base64
      ice_cube (~> 0.16)
      logger
@@ -385,10 +376,10 @@ GEM
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
-    json (2.18.1)
-    json-schema (6.0.0)
+    json (2.19.3)
+    json-schema (6.2.0)
      addressable (~> 2.8)
-      bigdecimal (~> 3.1)
+      bigdecimal (>= 3.1, < 5)
    jsonapi-resources (0.10.7)
      activerecord (>= 4.1)
      concurrent-ruby
@@ -413,7 +404,7 @@ GEM
      rb-fsevent (~> 0.10, >= 0.10.3)
      rb-inotify (~> 0.9, >= 0.9.10)
    logger (1.7.0)
-    loofah (2.25.0)
+    loofah (2.25.1)
      crass (~> 1.0.2)
      nokogiri (>= 1.12.0)
    mail (2.9.0)
@@ -432,8 +423,6 @@ GEM
    material_icons (4.0.0)
      railties (>= 3.2)
    matrix (0.4.3)
-    mcp (0.7.1)
-      json-schema (>= 4.1)
    memcachier (0.0.2)
    method_source (1.1.0)
    mime-types (3.7.0)
@@ -446,9 +435,7 @@ GEM
    mini_magick (4.12.0)
    mini_mime (1.1.5)
    mini_portile2 (2.8.9)
-    minitest (6.0.1)
-      prism (~> 1.5)
-    moneta (1.0.0)
+    minitest (5.27.0)
    msgpack (1.8.0)
    multi_json (1.19.1)
    multi_xml (0.8.1)
@@ -466,13 +453,13 @@ GEM
      net-protocol
    netrc (0.11.0)
    nio4r (2.7.5)
-    nokogiri (1.19.1)
+    nokogiri (1.19.2)
      mini_portile2 (~> 2.8.2)
      racc (~> 1.4)
-    nokogiri (1.19.1-x86_64-linux-gnu)
+    nokogiri (1.19.2-x86_64-linux-gnu)
      racc (~> 1.4)
    oauth (0.5.6)
-    oj (3.16.15)
+    oj (3.17.0)
      bigdecimal (>= 3.0)
      ostruct (>= 0.2)
    omniauth (1.9.2)
@@ -490,18 +477,14 @@ GEM
    paper_trail (17.0.0)
      activerecord (>= 7.1)
      request_store (~> 1.4)
-    parallel (1.27.0)
-    parser (3.3.10.2)
+    parallel (2.0.1)
+    parser (3.3.11.1)
      ast (~> 2.4.1)
      racc
    percy-capybara (5.0.0)
      capybara (>= 3)
    pg (1.6.3)
    pg (1.6.3-x86_64-linux)
-    platform-api (3.9.0)
-      heroics (~> 0.1.1)
-      moneta (~> 1.0.0)
-      rate_throttle_client (~> 0.1.0)
    popper_js (2.11.8)
    pp (0.6.3)
      prettyprint
@@ -514,12 +497,12 @@ GEM
    psych (5.3.1)
      date
      stringio
-    public_suffix (7.0.2)
-    puma (7.1.0)
+    public_suffix (7.0.5)
+    puma (7.2.0)
      nio4r (~> 2.0)
    query_diet (0.7.3)
    racc (1.8.1)
-    rack (2.2.22)
+    rack (2.2.23)
    rack-cors (2.0.2)
      rack (>= 2.0.0)
    rack-protection (3.2.0)
@@ -532,20 +515,20 @@ GEM
    rackup (1.0.1)
      rack (< 3)
      webrick
-    rails (7.2.3)
-      actioncable (= 7.2.3)
-      actionmailbox (= 7.2.3)
-      actionmailer (= 7.2.3)
-      actionpack (= 7.2.3)
-      actiontext (= 7.2.3)
-      actionview (= 7.2.3)
-      activejob (= 7.2.3)
-      activemodel (= 7.2.3)
-      activerecord (= 7.2.3)
-      activestorage (= 7.2.3)
-      activesupport (= 7.2.3)
+    rails (7.2.3.1)
+      actioncable (= 7.2.3.1)
+      actionmailbox (= 7.2.3.1)
+      actionmailer (= 7.2.3.1)
+      actionpack (= 7.2.3.1)
+      actiontext (= 7.2.3.1)
+      actionview (= 7.2.3.1)
+      activejob (= 7.2.3.1)
+      activemodel (= 7.2.3.1)
+      activerecord (= 7.2.3.1)
+      activestorage (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
      bundler (>= 1.15.0)
-      railties (= 7.2.3)
+      railties (= 7.2.3.1)
    rails-controller-testing (1.0.5)
      actionpack (>= 5.0.1.rc1)
      actionview (>= 5.0.1.rc1)
@@ -554,8 +537,8 @@ GEM
      activesupport (>= 5.0.0)
      minitest
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.6.2)
-      loofah (~> 2.21)
+    rails-html-sanitizer (1.7.0)
+      loofah (~> 2.25)
      nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
    rails-i18n (7.0.10)
      i18n (>= 0.7, < 2)
@@ -565,9 +548,9 @@ GEM
      rails_stdout_logging
    rails_serve_static_assets (0.0.5)
    rails_stdout_logging (0.0.5)
-    railties (7.2.3)
-      actionpack (= 7.2.3)
-      activesupport (= 7.2.3)
+    railties (7.2.3.1)
+      actionpack (= 7.2.3.1)
+      activesupport (= 7.2.3.1)
      cgi
      irb (~> 1.13)
      rackup (>= 1.0.0)
@@ -577,8 +560,7 @@ GEM
      zeitwerk (~> 2.6)
    rainbow (3.1.1)
    raindrops (0.20.1)
-    rake (13.3.1)
-    rate_throttle_client (0.1.2)
+    rake (13.4.2)
    rb-fsevent (0.11.2)
    rb-inotify (0.11.1)
      ffi (~> 1.0)
@@ -586,10 +568,10 @@ GEM
      erb
      psych (>= 4.0.0)
      tsort
-    recaptcha (5.21.1)
+    recaptcha (5.21.2)
    redis-client (0.26.2)
      connection_pool
-    regexp_parser (2.11.3)
+    regexp_parser (2.12.0)
    reline (0.6.3)
      io-console (~> 0.5)
    request_store (1.7.0)
@@ -617,17 +599,17 @@ GEM
    rspec-expectations (3.13.5)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.7)
+    rspec-mocks (3.13.8)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.13.0)
-    rspec-rails (8.0.3)
+    rspec-rails (8.0.4)
      actionpack (>= 7.2)
      activesupport (>= 7.2)
      railties (>= 7.2)
-      rspec-core (~> 3.13)
-      rspec-expectations (~> 3.13)
-      rspec-mocks (~> 3.13)
-      rspec-support (~> 3.13)
+      rspec-core (>= 3.13.0, < 5.0.0)
+      rspec-expectations (>= 3.13.0, < 5.0.0)
+      rspec-mocks (>= 3.13.0, < 5.0.0)
+      rspec-support (>= 3.13.0, < 5.0.0)
    rspec-rebound (0.2.1)
      rspec-core (~> 3.3)
    rspec-support (3.13.7)
@@ -646,19 +628,18 @@ GEM
    rswag-ui (2.17.0)
      actionpack (>= 5.2, < 8.2)
      railties (>= 5.2, < 8.2)
-    rubocop (1.85.0)
+    rubocop (1.86.1)
      json (~> 2.3)
      language_server-protocol (~> 3.17.0.2)
      lint_roller (~> 1.1.0)
-      mcp (~> 0.6)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
      parser (>= 3.3.0.2)
      rainbow (>= 2.2.2, < 4.0)
      regexp_parser (>= 2.9.3, < 3.0)
      rubocop-ast (>= 1.49.0, < 2.0)
      ruby-progressbar (~> 1.7)
      unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.49.0)
+    rubocop-ast (1.49.1)
      parser (>= 3.3.7.2)
      prism (~> 1.7)
    rubocop-capybara (2.22.1)
@@ -701,13 +682,13 @@ GEM
      sprockets (> 3.0)
      sprockets-rails
      tilt
-    scout_apm (6.0.2)
+    scout_apm (6.2.0)
      parser
    searchkick (5.3.1)
      activemodel (>= 6.1)
      hashie
    securerandom (0.4.1)
-    selenium-webdriver (4.40.0)
+    selenium-webdriver (4.43.0)
      base64 (~> 0.2)
      logger (~> 1.4)
      rexml (~> 3.2, >= 3.2.5)
@@ -736,12 +717,12 @@ GEM
    temple (0.10.4)
    terminal-table (4.0.0)
      unicode-display_width (>= 1.1.1, < 4)
-    terser (1.2.6)
+    terser (1.2.7)
      execjs (>= 0.3.0, < 3)
    thor (1.5.0)
    thread_safe (0.3.6)
-    tilt (2.6.1)
-    timecop (0.9.10)
+    tilt (2.7.0)
+    timecop (0.9.11)
    timeout (0.5.0)
    tsort (0.2.0)
    tzinfo (2.0.6)
@@ -758,8 +739,7 @@ GEM
    validate_url (1.0.15)
      activemodel (>= 3.0.0)
      public_suffix
-    vcr (6.3.1)
-      base64
+    vcr (6.4.0)
    virtus (2.0.0)
      axiom-types (~> 0.1)
      coercible (~> 1.0)
@@ -779,7 +759,8 @@ GEM
    will_paginate (4.0.1)
    will_paginate-bootstrap-style (0.3.0)
      will_paginate (~> 4.0, >= 4.0.0)
-    xmlrpc (0.3.3)
+    xmlrpc (0.3.4)
+      rexml
      webrick
    xpath (3.2.0)
      nokogiri (~> 1.8)
@@ -857,7 +838,6 @@ DEPENDENCIES
  paper_trail (~> 17.0)
  percy-capybara (~> 5.0.0)
  pg
-  platform-api
  pry
  puma
  query_diet
--- a/app/controllers/follows_controller.rb
+++ b/app/controllers/follows_controller.rb
@@ -17,7 +17,7 @@ class FollowsController < ApplicationController
    else
      flash[:error] = "Already following or error while following."
    end
-    redirect_back fallback_location: root_path
+    redirect_back_or_to(root_path)
  end

  def destroy
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -130,9 +130,9 @@ module ApplicationHelper
      doc = Nokogiri::XML(response.body)
      doc.xpath('//xmlns:entry').first(2).map do |entry|
        {
-          title: entry.xpath('xmlns:title').text,
+          title:   entry.xpath('xmlns:title').text,
          content: entry.xpath('xmlns:content').text,
-          link: entry.xpath('xmlns:link/@href').text,
+          link:    entry.xpath('xmlns:link/@href').text,
          updated: entry.xpath('xmlns:updated').text
        }
      end
--- a/app/helpers/crops_helper.rb
+++ b/app/helpers/crops_helper.rb
@@ -56,13 +56,13 @@ module CropsHelper

      crop.posts.each do |post|
        subject_of_entities << {
-          '@type': "SocialMediaPosting",
-          url:     post_url(post),
-          author:  {
+          '@type':         "SocialMediaPosting",
+          url:             post_url(post),
+          author:          {
            '@type': 'Person',
-            name: post.author.login_name
+            name:    post.author.login_name
          },
-          'datePublished': post.created_at 
+          'datePublished': post.created_at
        }
      end

--- a/app/models/concerns/search_harvests.rb
+++ b/app/models/concerns/search_harvests.rb
@@ -56,7 +56,7 @@ module SearchHarvests
          # Disabled for now so that more relevant harvests are
          # surfaced; even if we're falling back to crop photos.
          # photos_count: { gt: 0 },
-          owner_id:     { not: owners }
+          owner_id: { not: owners }
        }
        one_record = search('*',
                            limit:    1,
--- a/app/models/concerns/search_plantings.rb
+++ b/app/models/concerns/search_plantings.rb
@@ -69,7 +69,7 @@ module SearchPlantings
          # Disabled for now so that more relevant plantings are
          # surfaced; even if we're falling back to crop photos.
          # photos_count: { gt: 0 },
-          owner_id:     { not: owners }
+          owner_id: { not: owners }
        }
        one_record = search('*',
                            limit:    1,
--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -61,7 +61,7 @@ class Crop < ApplicationRecord
            },
            if:     :approved?
  validates :en_youtube_url,
-            format: {
+            format:      {
              with:    %r{\A(?:https?://)?(?:www\.)?(?:youtube(?:-nocookie)?\.com/(?:(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)[a-zA-Z0-9_-]{11}(?:[?&]\S*)?\z},
              message: 'is not a valid YouTube URL'
            },
--- a/app/views/crops/_nutritional_data.html.haml
+++ b/app/views/crops/_nutritional_data.html.haml
@@ -35,4 +35,4 @@
              %th Sodium
              %td= "#{data.sodium_na_mg.to_f.round(1)} mg"
    .card-footer
-      = link_to "See more", "https://afcd.foodstandards.gov.au/fooddetails.aspx?PFKID=#{data.public_food_key}", target: "_blank", rel: "noopener noreferrer"
+      = link_to "See more", "https://www.foodstandards.gov.au/science-data/food-nutrient-databases/afcd/search/food/#{data.public_food_key}", target: "_blank", rel: "noopener noreferrer"
--- a/app/views/home/_harvests.html.haml
+++ b/app/views/home/_harvests.html.haml
@@ -9,4 +9,5 @@
          %small.text-muted
            harvested by #{harvest.owner_login_name}
        %p.mb-2
-          = image_tag harvest.thumbnail_url, width: 75, class: 'rounded shadow', alt: "Image of #{harvest.crop_name} by #{harvest.owner}"
+          - if harvest.thumbnail_url
+            = image_tag harvest.thumbnail_url, width: 75, class: 'rounded shadow', alt: "Image of #{harvest.crop_name} by #{harvest.owner}"
--- a/config/sitemap.rb
+++ b/config/sitemap.rb
@@ -7,9 +7,9 @@ SitemapGenerator::Sitemap.default_host = 'https://growstuff.org'

 SitemapGenerator::Sitemap.adapter = SitemapGenerator::AwsSdkAdapter.new(
  ENV['S3_SITEMAP_BUCKET'],
-  access_key_id: ENV['S3_ACCESS_KEY'],
+  access_key_id:     ENV['S3_ACCESS_KEY'],
  secret_access_key: ENV['S3_SECRET_KEY'],
-  region: ENV.fetch('S3_AWS_REGION', 'us-east-1')
+  region:            ENV.fetch('S3_AWS_REGION', 'us-east-1')
 )

 SitemapGenerator::Sitemap.create do
--- a/db/migrate/20190712003735_add_like_counter_caches.rb
+++ b/db/migrate/20190712003735_add_like_counter_caches.rb
@@ -14,23 +14,23 @@ class AddLikeCounterCaches < ActiveRecord::Migration[5.2]
  end

  def data
-    execute <<-SQL.squish
-        UPDATE photos
-           SET likes_count = (
-             SELECT count(1)
-               FROM likes
-              WHERE likes.likeable_id = photos.id
-              AND likeable_type = 'Photo'
-              )
+    execute <<~SQL.squish
+      UPDATE photos
+         SET likes_count = (
+           SELECT count(1)
+             FROM likes
+            WHERE likes.likeable_id = photos.id
+            AND likeable_type = 'Photo'
+            )
    SQL
-    execute <<-SQL.squish
-        UPDATE posts
-           SET likes_count = (
-             SELECT count(1)
-               FROM likes
-              WHERE likes.likeable_id = posts.id
-              AND likeable_type = 'Post'
-              )
+    execute <<~SQL.squish
+      UPDATE posts
+         SET likes_count = (
+           SELECT count(1)
+             FROM likes
+            WHERE likes.likeable_id = posts.id
+            AND likeable_type = 'Post'
+            )
    SQL
  end
 end
--- a/db/migrate/20191226024813_crop_harvest_counter_cache.rb
+++ b/db/migrate/20191226024813_crop_harvest_counter_cache.rb
@@ -11,13 +11,13 @@ class CropHarvestCounterCache < ActiveRecord::Migration[5.2]
  end

  def set_counter_value
-    execute <<-SQL.squish
-        UPDATE crops
-           SET harvests_count = (
-             SELECT count(1)
-               FROM harvests
-              WHERE harvests.crop_id = crops.id
-              )
+    execute <<~SQL.squish
+      UPDATE crops
+         SET harvests_count = (
+           SELECT count(1)
+             FROM harvests
+            WHERE harvests.crop_id = crops.id
+            )
    SQL
  end
 end
--- a/db/migrate/20191226024957_crop_photo_counter_cache.rb
+++ b/db/migrate/20191226024957_crop_photo_counter_cache.rb
@@ -11,13 +11,13 @@ class CropPhotoCounterCache < ActiveRecord::Migration[5.2]
  end

  def set_counter_value
-    execute <<-SQL.squish
-        UPDATE crops
-           SET photo_associations_count = (
-             SELECT count(1)
-               FROM photo_associations
-              WHERE photo_associations.crop_id = crops.id
-              )
+    execute <<~SQL.squish
+      UPDATE crops
+         SET photo_associations_count = (
+           SELECT count(1)
+             FROM photo_associations
+            WHERE photo_associations.crop_id = crops.id
+            )
    SQL
  end
 end
--- a/db/migrate/20191226025124_plant_part_harvest_counter_cache.rb
+++ b/db/migrate/20191226025124_plant_part_harvest_counter_cache.rb
@@ -11,13 +11,13 @@ class PlantPartHarvestCounterCache < ActiveRecord::Migration[5.2]
  end

  def set_counter_value
-    execute <<-SQL.squish
-        UPDATE plant_parts
-           SET harvests_count = (
-             SELECT count(1)
-               FROM harvests
-              WHERE harvests.plant_part_id = plant_parts.id
-              )
+    execute <<~SQL.squish
+      UPDATE plant_parts
+         SET harvests_count = (
+           SELECT count(1)
+             FROM harvests
+            WHERE harvests.plant_part_id = plant_parts.id
+            )
    SQL
  end
 end
--- a/db/migrate/20191226025225_post_comment_counter_cache.rb
+++ b/db/migrate/20191226025225_post_comment_counter_cache.rb
@@ -11,7 +11,7 @@ class PostCommentCounterCache < ActiveRecord::Migration[5.2]
  end

  def set_counter_value
-    execute <<-SQL.squish
+    execute <<~SQL.squish
      UPDATE posts
         SET comments_count = (
           SELECT count(1)
--- a/db/migrate/20250824085224_add_photos_comment_count.rb
+++ b/db/migrate/20250824085224_add_photos_comment_count.rb
@@ -11,7 +11,7 @@ class AddPhotosCommentCount < ActiveRecord::Migration[7.2]
  end

  def set_counter_value
-    execute <<-SQL.squish
+    execute <<~SQL.squish
      UPDATE photos
         SET comments_count = (
           SELECT count(1)
--- a/db/migrate/20251130035700_create_versions.rb
+++ b/db/migrate/20251130035700_create_versions.rb
@@ -1,7 +1,6 @@
 # This migration creates the `versions` table for the Version class.
 # All other migrations PT provides are optional.
 class CreateVersions < ActiveRecord::Migration[7.2]
-
  # The largest text column available in all supported RDBMS is
  # 1024^3 - 1 bytes, roughly one gibibyte.  We specify a size
  # so that MySQL will use `longtext` instead of `text`.  Otherwise,
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -4,299 +4,299 @@ namespace :import do
  desc "Import Australian Food Classification Data from a CSV file"
  task australian_food_classification_data: :environment do
    HEADER_MAP = {
-      "Public Food Key" => :public_food_key,
-      "Classification" => :classification,
-      "Food Name" => :food_name,
-      "Energy with dietary fibre, equated \n(kJ)" => :energy_with_dietary_fibre_equated_kj,
-      "Energy, without dietary fibre, equated \n(kJ)" => :energy_without_dietary_fibre_equated_kj,
-      "Moisture (water) \n(g)" => :moisture_water_g,
-      "Protein \n(g)" => :protein_g,
-      "Nitrogen \n(g)" => :nitrogen_g,
-      "Fat, total \n(g)" => :fat_total_g,
-      "Ash \n(g)" => :ash_g,
-      "Total dietary fibre \n(g)" => :total_dietary_fibre_g,
-      "Alcohol \n(g)" => :alcohol_g,
-      "Fructose \n(g)" => :fructose_g,
-      "Glucose \n(g)" => :glucose_g,
-      "Sucrose\n(g)" => :sucrose_g,
-      "Maltose \n(g)" => :maltose_g,
-      "Lactose \n(g)" => :lactose_g,
-      "Galactose \n(g)" => :galactose_g,
-      "Maltotrios \n(g)" => :maltotrios_g,
-      "Total sugars (g)" => :total_sugars_g,
-      "Added sugars (g)" => :added_sugars_g,
-      "Free sugars \n(g)" => :free_sugars_g,
-      "Starch \n(g)" => :starch_g,
-      "Dextrin \n(g)" => :dextrin_g,
-      "Glycerol \n(g)" => :glycerol_g,
-      "Glycogen \n(g)" => :glycogen_g,
-      "Inulin \n(g)" => :inulin_g,
-      "Erythritol \n(g)" => :erythritol_g,
-      "Maltitol \n(g)" => :maltitol_g,
-      "Mannitol \n(g)" => :mannitol_g,
-      "Xylitol \n(g)" => :xylitol_g,
-      "Maltodextrin (g)" => :maltodextrin_g,
-      "Oligosaccharides  \n(g)" => :oligosaccharides_g,
-      "Polydextrose \n(g)" => :polydextrose_g,
-      "Raffinose \n(g)" => :raffinose_g,
-      "Stachyose \n(g)" => :stachyose_g,
-      "Sorbitol \n(g)" => :sorbitol_g,
-      "Resistant starch \n(g)" => :resistant_starch_g,
-      "Available carbohydrate, without sugar alcohols \n(g)" => :available_carbohydrate_without_sugar_alcohols_g,
-      "Available carbohydrate, with sugar alcohols \n(g)" => :available_carbohydrate_with_sugar_alcohols_g,
-      "Acetic acid \n(g)" => :acetic_acid_g,
-      "Citric acid \n(g)" => :citric_acid_g,
-      "Fumaric acid \n(g)" => :fumaric_acid_g,
-      "Lactic acid \n(g)" => :lactic_acid_g,
-      "Malic acid\n (g)" => :malic_acid_g,
-      "Oxalic acid \n(g)" => :oxalic_acid_g,
-      "Propionic acid \n(g)" => :propionic_acid_g,
-      "Quinic acid \n(g)" => :quinic_acid_g,
-      "Shikimic acid \n(g)" => :shikimic_acid_g,
-      "Succinic acid \n(g)" => :succinic_acid_g,
-      "Tartaric acid \n(g)" => :tartaric_acid_g,
-      "Aluminium (Al) \n(ug)" => :aluminium_al_ug,
-      "Antimony (Sb) \n(ug)" => :antimony_sb_ug,
-      "Arsenic (As) \n(ug)" => :arsenic_as_ug,
-      "Cadmium (Cd) \n(ug)" => :cadmium_cd_ug,
-      "Calcium (Ca) \n(mg)" => :calcium_ca_mg,
-      "Chromium (Cr) \n(ug)" => :chromium_cr_ug,
-      "Chloride (Cl) \n(mg)" => :chloride_cl_mg,
-      "Cobalt (Co) \n(ug)" => :cobalt_co_ug,
-      "Copper (Cu) \n(mg)" => :copper_cu_mg,
-      "Fluoride (F) \n(ug)" => :fluoride_f_ug,
-      "Iodine (I) \n(ug)" => :iodine_i_ug,
-      "Iron (Fe) \n(mg)" => :iron_fe_mg,
-      "Lead (Pb) \n(ug)" => :lead_pb_ug,
-      "Magnesium (Mg) \n(mg)" => :magnesium_mg_mg,
-      "Manganese (Mn) \n(mg)" => :manganese_mn_mg,
-      "Mercury (Hg) \n(ug)" => :mercury_hg_ug,
-      "Molybdenum (Mo) \n(ug)" => :molybdenum_mo_ug,
-      "Nickel (Ni) \n(ug)" => :nickel_ni_ug,
-      "Phosphorus (P) \n(mg)" => :phosphorus_p_mg,
-      "Potassium (K) \n(mg)" => :potassium_k_mg,
-      "Selenium (Se) \n(ug)" => :selenium_se_ug,
-      "Sodium (Na) \n(mg)" => :sodium_na_mg,
-      "Sulphur (S) \n(mg)" => :sulphur_s_mg,
-      "Tin (Sn) \n(ug)" => :tin_sn_ug,
-      "Zinc (Zn) \n(mg)" => :zinc_zn_mg,
-      "Retinol (preformed vitamin A) \n(ug)" => :retinol_preformed_vitamin_a_ug,
-      "Alpha-carotene \n(ug)" => :alpha_carotene_ug,
-      "Beta-carotene \n(ug)" => :beta_carotene_ug,
-      "Cryptoxanthin \n(ug)" => :cryptoxanthin_ug,
-      "Beta-carotene equivalents (provitamin A) \n(ug)" => :beta_carotene_equivalents_provitamin_a_ug,
-      "Vitamin A retinol equivalents \n(ug)" => :vitamin_a_retinol_equivalents_ug,
-      "Lutein \n(ug)" => :lutein_ug,
-      "Lycopene \n(ug)" => :lycopene_ug,
-      "Xanthophyl \n(ug)" => :xanthophyl_ug,
-      "Thiamin (B1) \n(mg)" => :thiamin_b1_mg,
-      "Riboflavin (B2) \n(mg)" => :riboflavin_b2_mg,
-      "Niacin (B3) \n(mg)" => :niacin_b3_mg,
-      "Niacin derived from tryptophan \n(mg)" => :niacin_derived_from_tryptophan_mg,
-      "Niacin derived equivalents \n(mg)" => :niacin_derived_equivalents_mg,
-      "Pantothenic acid (B5) \n(mg)" => :pantothenic_acid_b5_mg,
-      "Pyridoxine (B6) \n(mg)" => :pyridoxine_b6_mg,
-      "Biotin (B7) \n(ug)" => :biotin_b7_ug,
-      "Cobalamin (B12) \n(ug)" => :cobalamin_b12_ug,
-      "Folate, natural \n(ug)" => :folate_natural_ug,
-      "Folic acid \n(ug)" => :folic_acid_ug,
-      "Total folates \n(ug)" => :total_folates_ug,
-      "Dietary folate equivalents \n(ug)" => :dietary_folate_equivalents_ug,
-      "Vitamin C \n(mg)" => :vitamin_c_mg,
-      "Cholecalciferol (D3) \n(ug)" => :cholecalciferol_d3_ug,
-      "Ergocalciferol (D2) \n(ug)" => :ergocalciferol_d2_ug,
-      "25-hydroxy cholecalciferol (25-OH D3) \n(ug)" => :c25_hydroxy_cholecalciferol_25_oh_d3_ug,
-      "25-hydroxy ergocalciferol (25-OH D2) \n(ug)" => :c25_hydroxy_ergocalciferol_25_oh_d2_ug,
-      "Vitamin D3 equivalents \n(ug)" => :vitamin_d3_equivalents_ug,
-      "Alpha tocopherol \n(mg)" => :alpha_tocopherol_mg,
-      "Alpha tocotrienol \n(mg)" => :alpha_tocotrienol_mg,
-      "Beta tocopherol \n(mg)" => :beta_tocopherol_mg,
-      "Beta tocotrienol \n(mg)" => :beta_tocotrienol_mg,
-      "Delta tocopherol \n(mg)" => :delta_tocopherol_mg,
-      "Delta tocotrienol \n(mg)" => :delta_tocotrienol_mg,
-      "Gamma tocopherol \n(mg)" => :gamma_tocopherol_mg,
-      "Gamma tocotrienol \n(mg)" => :gamma_tocotrienol_mg,
-      "Vitamin E \n(mg)" => :vitamin_e_mg,
-      "C4 (%T)" => :c4_t,
-      "C6 (%T)" => :c6_t,
-      "C8 (%T)" => :c8_t,
-      "C10 (%T)" => :c10_t,
-      "C11 (%T)" => :c11_t,
-      "C12 (%T)" => :c12_t,
-      "C13 (%T)" => :c13_t,
-      "C14 (%T)" => :c14_t,
-      "C15 (%T)" => :c15_t,
-      "C16 (%T)" => :c16_t,
-      "C17 (%T)" => :c17_t,
-      "C18 (%T)" => :c18_t,
-      "C19 (%T)" => :c19_t,
-      "C20 (%T)" => :c20_t,
-      "C21 (%T)" => :c21_t,
-      "C22 (%T)" => :c22_t,
-      "C23 (%T)" => :c23_t,
-      "C24 (%T)" => :c24_t,
-      "Total saturated fatty acids, equated (%T)" => :total_saturated_fatty_acids_equated_t,
-      "C10:1 (%T)" => :c10_1_t,
-      "C12:1 (%T)" => :c12_1_t,
-      "C14:1 (%T)" => :c14_1_t,
-      "C15:1 (%T)" => :c15_1_t,
-      "C16:1 (%T)" => :c16_1_t,
-      "C17:1 (%T)" => :c17_1_t,
-      "C18:1 (%T)" => :c18_1_t,
-      "C18:1w5 (%T)" => :c18_1w5_t,
-      "C18:1w6 (%T)" => :c18_1w6_t,
-      "C18:1w7 (%T)" => :c18_1w7_t,
-      "C18:1w9 (%T)" => :c18_1w9_t,
-      "C20:1 (%T)" => :c20_1_t,
-      "C20:1w9 (%T)" => :c20_1w9_t,
-      "C20:1w13 (%T)" => :c20_1w13_t,
-      "C20:1w11 (%T)" => :c20_1w11_t,
-      "C22:1 (%T)" => :c22_1_t,
-      "C22:1w9 (%T)" => :c22_1w9_t,
-      "C22:1w11 (%T)" => :c22_1w11_t,
-      "C24:1 (%T)" => :c24_1_t,
-      "C24:1w9 (%T)" => :c24_1w9_t,
-      "C24:1w11 (%T)" => :c24_1w11_t,
-      "C24:1w13 (%T)" => :c24_1w13_t,
-      "Total monounsaturated fatty acids, equated (%T)" => :total_monounsaturated_fatty_acids_equated_t,
-      "C12:2 (%T)" => :c12_2_t,
-      "C16:2w4 (%T)" => :c16_2w4_t,
-      "C16:3 (%T)" => :c16_3_t,
-      "C18:2w6 (%T)" => :c18_2w6_t,
-      "C18:3w3 (%T)" => :c18_3w3_t,
-      "C18:3w4 (%T)" => :c18_3w4_t,
-      "C18:3w6 (%T)" => :c18_3w6_t,
-      "C18:4w1 (%T)" => :c18_4w1_t,
-      "C18:4w3 (%T)" => :c18_4w3_t,
-      "C20:2 (%T)" => :c20_2_t,
-      "C20:2w6 (%T)" => :c20_2w6_t,
-      "C20:3 (%T)" => :c20_3_t,
-      "C20:4 (%T)" => :c20_4_t,
-      "C20:3w3 (%T)" => :c20_3w3_t,
-      "C20:3w6 (%T)" => :c20_3w6_t,
-      "C20:4w3 (%T)" => :c20_4w3_t,
-      "C20:4w6 (%T)" => :c20_4w6_t,
-      "C20:5w3 (%T)" => :c20_5w3_t,
-      "C21:5w3 (%T)" => :c21_5w3_t,
-      "C22:2 (%T)" => :c22_2_t,
-      "C22:2w6 (%T)" => :c22_2w6_t,
-      "C22:4w6 (%T)" => :c22_4w6_t,
-      "C22:5w3 (%T)" => :c22_5w3_t,
-      "C22:5w6 (%T)" => :c22_5w6_t,
-      "C22:6w3 (%T)" => :c22_6w3_t,
-      "Total polyunsaturated fatty acids, equated (%T)" => :total_polyunsaturated_fatty_acids_equated_t,
-      "Total long chain omega 3 fatty acids, equated \n(%T)" => :total_long_chain_omega_3_fatty_acids_equated_t,
-      "Total undifferentiated fatty acids \n(%T)" => :total_undifferentiated_fatty_acids_t,
-      "Total trans fatty acids, imputed \n(%T)" => :total_trans_fatty_acids_imputed_t,
-      "C4 (g)" => :c4_g,
-      "C6 (g)" => :c6_g,
-      "C8 (g)" => :c8_g,
-      "C10 (g)" => :c10_g,
-      "C11 (g)" => :c11_g,
-      "C12 (g)" => :c12_g,
-      "C13 (g)" => :c13_g,
-      "C14 (g)" => :c14_g,
-      "C15 (g)" => :c15_g,
-      "C16 (g)" => :c16_g,
-      "C17 (g)" => :c17_g,
-      "C18 (g)" => :c18_g,
-      "C19 (g)" => :c19_g,
-      "C20 (g)" => :c20_g,
-      "C21 (g)" => :c21_g,
-      "C22 (g)" => :c22_g,
-      "C23 (g)" => :c23_g,
-      "C24 (g)" => :c24_g,
-      "Total saturated fatty acids, equated \n(g)" => :total_saturated_fatty_acids_equated_g,
-      "C10:1 (g)" => :c10_1_g,
-      "C12:1 (g)" => :c12_1_g,
-      "C14:1 (g)" => :c14_1_g,
-      "C15:1 (g)" => :c15_1_g,
-      "C16:1 (g)" => :c16_1_g,
-      "C17:1 (g)" => :c17_1_g,
-      "C18:1 (g)" => :c18_1_g,
-      "C18:1w5 (mg)" => :c18_1w5_mg,
-      "C18:1w6 (mg)" => :c18_1w6_mg,
-      "C18:1w7 (g)" => :c18_1w7_g,
-      "C18:1w9 (mg)" => :c18_1w9_mg,
-      "C20:1 (g)" => :c20_1_g,
-      "C20:1w9 (mg)" => :c20_1w9_mg,
-      "C20:1w13 (mg)" => :c20_1w13_mg,
-      "C20:1w11 (mg)" => :c20_1w11_mg,
-      "C22:1 (g)" => :c22_1_g,
-      "C22:1w9 (mg)" => :c22_1w9_mg,
-      "C22:1w11 (mg)" => :c22_1w11_mg,
-      "C24:1 (g)" => :c24_1_g,
-      "C24:1w9 (mg)" => :c24_1w9_mg,
-      "C24:1w11 (mg)" => :c24_1w11_mg,
-      "C24:1w13 (mg)" => :c24_1w13_mg,
-      "Total monounsaturated fatty acids, equated \n(g)" => :total_monounsaturated_fatty_acids_equated_g,
-      "C12:2 (g)" => :c12_2_g,
-      "C16:2w4 (mg)" => :c16_2w4_mg,
-      "C16:3 (g)" => :c16_3_g,
-      "C18:2w6 (g)" => :c18_2w6_g,
-      "C18:3w3 (g)" => :c18_3w3_g,
-      "C18:3w4 (g)" => :c18_3w4_g,
-      "C18:3w6 (mg)" => :c18_3w6_mg,
-      "C18:4w1 (g)" => :c18_4w1_g,
-      "C18:4w3 (mg)" => :c18_4w3_mg,
-      "C20:2 (mg)" => :c20_2_mg,
-      "C20:2w6 (mg)" => :c20_2w6_mg,
-      "C20:3 (mg)" => :c20_3_mg,
-      "C20:3w3 (mg)" => :c20_3w3_mg,
-      "C20:3w6 (mg)" => :c20_3w6_mg,
-      "C20:4 (g)" => :c20_4_g,
-      "C20:4w3 (mg)" => :c20_4w3_mg,
-      "C20:4w6 (mg)" => :c20_4w6_mg,
-      "C20:5w3 (mg)" => :c20_5w3_mg,
-      "C21:5w3 (g)" => :c21_5w3_g,
-      "C22:5w3 (mg)" => :c22_5w3_mg,
-      "C22:4w6 (mg)" => :c22_4w6_mg,
-      "C22:2 (g)" => :c22_2_g,
-      "C22:2w6 (mg)" => :c22_2w6_mg,
-      "C22:5w6 (g)" => :c22_5w6_g,
-      "C22:6w3 (mg)" => :c22_6w3_mg,
-      "Total polyunsaturated fatty acids, equated \n(g)" => :total_polyunsaturated_fatty_acids_equated_g,
-      "Total long chain omega 3 fatty acids, equated \n(mg)" => :total_long_chain_omega_3_fatty_acids_equated_mg,
+      "Public Food Key"                                             => :public_food_key,
+      "Classification"                                              => :classification,
+      "Food Name"                                                   => :food_name,
+      "Energy with dietary fibre, equated \n(kJ)"                   => :energy_with_dietary_fibre_equated_kj,
+      "Energy, without dietary fibre, equated \n(kJ)"               => :energy_without_dietary_fibre_equated_kj,
+      "Moisture (water) \n(g)"                                      => :moisture_water_g,
+      "Protein \n(g)"                                               => :protein_g,
+      "Nitrogen \n(g)"                                              => :nitrogen_g,
+      "Fat, total \n(g)"                                            => :fat_total_g,
+      "Ash \n(g)"                                                   => :ash_g,
+      "Total dietary fibre \n(g)"                                   => :total_dietary_fibre_g,
+      "Alcohol \n(g)"                                               => :alcohol_g,
+      "Fructose \n(g)"                                              => :fructose_g,
+      "Glucose \n(g)"                                               => :glucose_g,
+      "Sucrose\n(g)"                                                => :sucrose_g,
+      "Maltose \n(g)"                                               => :maltose_g,
+      "Lactose \n(g)"                                               => :lactose_g,
+      "Galactose \n(g)"                                             => :galactose_g,
+      "Maltotrios \n(g)"                                            => :maltotrios_g,
+      "Total sugars (g)"                                            => :total_sugars_g,
+      "Added sugars (g)"                                            => :added_sugars_g,
+      "Free sugars \n(g)"                                           => :free_sugars_g,
+      "Starch \n(g)"                                                => :starch_g,
+      "Dextrin \n(g)"                                               => :dextrin_g,
+      "Glycerol \n(g)"                                              => :glycerol_g,
+      "Glycogen \n(g)"                                              => :glycogen_g,
+      "Inulin \n(g)"                                                => :inulin_g,
+      "Erythritol \n(g)"                                            => :erythritol_g,
+      "Maltitol \n(g)"                                              => :maltitol_g,
+      "Mannitol \n(g)"                                              => :mannitol_g,
+      "Xylitol \n(g)"                                               => :xylitol_g,
+      "Maltodextrin (g)"                                            => :maltodextrin_g,
+      "Oligosaccharides  \n(g)"                                     => :oligosaccharides_g,
+      "Polydextrose \n(g)"                                          => :polydextrose_g,
+      "Raffinose \n(g)"                                             => :raffinose_g,
+      "Stachyose \n(g)"                                             => :stachyose_g,
+      "Sorbitol \n(g)"                                              => :sorbitol_g,
+      "Resistant starch \n(g)"                                      => :resistant_starch_g,
+      "Available carbohydrate, without sugar alcohols \n(g)"        => :available_carbohydrate_without_sugar_alcohols_g,
+      "Available carbohydrate, with sugar alcohols \n(g)"           => :available_carbohydrate_with_sugar_alcohols_g,
+      "Acetic acid \n(g)"                                           => :acetic_acid_g,
+      "Citric acid \n(g)"                                           => :citric_acid_g,
+      "Fumaric acid \n(g)"                                          => :fumaric_acid_g,
+      "Lactic acid \n(g)"                                           => :lactic_acid_g,
+      "Malic acid\n (g)"                                            => :malic_acid_g,
+      "Oxalic acid \n(g)"                                           => :oxalic_acid_g,
+      "Propionic acid \n(g)"                                        => :propionic_acid_g,
+      "Quinic acid \n(g)"                                           => :quinic_acid_g,
+      "Shikimic acid \n(g)"                                         => :shikimic_acid_g,
+      "Succinic acid \n(g)"                                         => :succinic_acid_g,
+      "Tartaric acid \n(g)"                                         => :tartaric_acid_g,
+      "Aluminium (Al) \n(ug)"                                       => :aluminium_al_ug,
+      "Antimony (Sb) \n(ug)"                                        => :antimony_sb_ug,
+      "Arsenic (As) \n(ug)"                                         => :arsenic_as_ug,
+      "Cadmium (Cd) \n(ug)"                                         => :cadmium_cd_ug,
+      "Calcium (Ca) \n(mg)"                                         => :calcium_ca_mg,
+      "Chromium (Cr) \n(ug)"                                        => :chromium_cr_ug,
+      "Chloride (Cl) \n(mg)"                                        => :chloride_cl_mg,
+      "Cobalt (Co) \n(ug)"                                          => :cobalt_co_ug,
+      "Copper (Cu) \n(mg)"                                          => :copper_cu_mg,
+      "Fluoride (F) \n(ug)"                                         => :fluoride_f_ug,
+      "Iodine (I) \n(ug)"                                           => :iodine_i_ug,
+      "Iron (Fe) \n(mg)"                                            => :iron_fe_mg,
+      "Lead (Pb) \n(ug)"                                            => :lead_pb_ug,
+      "Magnesium (Mg) \n(mg)"                                       => :magnesium_mg_mg,
+      "Manganese (Mn) \n(mg)"                                       => :manganese_mn_mg,
+      "Mercury (Hg) \n(ug)"                                         => :mercury_hg_ug,
+      "Molybdenum (Mo) \n(ug)"                                      => :molybdenum_mo_ug,
+      "Nickel (Ni) \n(ug)"                                          => :nickel_ni_ug,
+      "Phosphorus (P) \n(mg)"                                       => :phosphorus_p_mg,
+      "Potassium (K) \n(mg)"                                        => :potassium_k_mg,
+      "Selenium (Se) \n(ug)"                                        => :selenium_se_ug,
+      "Sodium (Na) \n(mg)"                                          => :sodium_na_mg,
+      "Sulphur (S) \n(mg)"                                          => :sulphur_s_mg,
+      "Tin (Sn) \n(ug)"                                             => :tin_sn_ug,
+      "Zinc (Zn) \n(mg)"                                            => :zinc_zn_mg,
+      "Retinol (preformed vitamin A) \n(ug)"                        => :retinol_preformed_vitamin_a_ug,
+      "Alpha-carotene \n(ug)"                                       => :alpha_carotene_ug,
+      "Beta-carotene \n(ug)"                                        => :beta_carotene_ug,
+      "Cryptoxanthin \n(ug)"                                        => :cryptoxanthin_ug,
+      "Beta-carotene equivalents (provitamin A) \n(ug)"             => :beta_carotene_equivalents_provitamin_a_ug,
+      "Vitamin A retinol equivalents \n(ug)"                        => :vitamin_a_retinol_equivalents_ug,
+      "Lutein \n(ug)"                                               => :lutein_ug,
+      "Lycopene \n(ug)"                                             => :lycopene_ug,
+      "Xanthophyl \n(ug)"                                           => :xanthophyl_ug,
+      "Thiamin (B1) \n(mg)"                                         => :thiamin_b1_mg,
+      "Riboflavin (B2) \n(mg)"                                      => :riboflavin_b2_mg,
+      "Niacin (B3) \n(mg)"                                          => :niacin_b3_mg,
+      "Niacin derived from tryptophan \n(mg)"                       => :niacin_derived_from_tryptophan_mg,
+      "Niacin derived equivalents \n(mg)"                           => :niacin_derived_equivalents_mg,
+      "Pantothenic acid (B5) \n(mg)"                                => :pantothenic_acid_b5_mg,
+      "Pyridoxine (B6) \n(mg)"                                      => :pyridoxine_b6_mg,
+      "Biotin (B7) \n(ug)"                                          => :biotin_b7_ug,
+      "Cobalamin (B12) \n(ug)"                                      => :cobalamin_b12_ug,
+      "Folate, natural \n(ug)"                                      => :folate_natural_ug,
+      "Folic acid \n(ug)"                                           => :folic_acid_ug,
+      "Total folates \n(ug)"                                        => :total_folates_ug,
+      "Dietary folate equivalents \n(ug)"                           => :dietary_folate_equivalents_ug,
+      "Vitamin C \n(mg)"                                            => :vitamin_c_mg,
+      "Cholecalciferol (D3) \n(ug)"                                 => :cholecalciferol_d3_ug,
+      "Ergocalciferol (D2) \n(ug)"                                  => :ergocalciferol_d2_ug,
+      "25-hydroxy cholecalciferol (25-OH D3) \n(ug)"                => :c25_hydroxy_cholecalciferol_25_oh_d3_ug,
+      "25-hydroxy ergocalciferol (25-OH D2) \n(ug)"                 => :c25_hydroxy_ergocalciferol_25_oh_d2_ug,
+      "Vitamin D3 equivalents \n(ug)"                               => :vitamin_d3_equivalents_ug,
+      "Alpha tocopherol \n(mg)"                                     => :alpha_tocopherol_mg,
+      "Alpha tocotrienol \n(mg)"                                    => :alpha_tocotrienol_mg,
+      "Beta tocopherol \n(mg)"                                      => :beta_tocopherol_mg,
+      "Beta tocotrienol \n(mg)"                                     => :beta_tocotrienol_mg,
+      "Delta tocopherol \n(mg)"                                     => :delta_tocopherol_mg,
+      "Delta tocotrienol \n(mg)"                                    => :delta_tocotrienol_mg,
+      "Gamma tocopherol \n(mg)"                                     => :gamma_tocopherol_mg,
+      "Gamma tocotrienol \n(mg)"                                    => :gamma_tocotrienol_mg,
+      "Vitamin E \n(mg)"                                            => :vitamin_e_mg,
+      "C4 (%T)"                                                     => :c4_t,
+      "C6 (%T)"                                                     => :c6_t,
+      "C8 (%T)"                                                     => :c8_t,
+      "C10 (%T)"                                                    => :c10_t,
+      "C11 (%T)"                                                    => :c11_t,
+      "C12 (%T)"                                                    => :c12_t,
+      "C13 (%T)"                                                    => :c13_t,
+      "C14 (%T)"                                                    => :c14_t,
+      "C15 (%T)"                                                    => :c15_t,
+      "C16 (%T)"                                                    => :c16_t,
+      "C17 (%T)"                                                    => :c17_t,
+      "C18 (%T)"                                                    => :c18_t,
+      "C19 (%T)"                                                    => :c19_t,
+      "C20 (%T)"                                                    => :c20_t,
+      "C21 (%T)"                                                    => :c21_t,
+      "C22 (%T)"                                                    => :c22_t,
+      "C23 (%T)"                                                    => :c23_t,
+      "C24 (%T)"                                                    => :c24_t,
+      "Total saturated fatty acids, equated (%T)"                   => :total_saturated_fatty_acids_equated_t,
+      "C10:1 (%T)"                                                  => :c10_1_t,
+      "C12:1 (%T)"                                                  => :c12_1_t,
+      "C14:1 (%T)"                                                  => :c14_1_t,
+      "C15:1 (%T)"                                                  => :c15_1_t,
+      "C16:1 (%T)"                                                  => :c16_1_t,
+      "C17:1 (%T)"                                                  => :c17_1_t,
+      "C18:1 (%T)"                                                  => :c18_1_t,
+      "C18:1w5 (%T)"                                                => :c18_1w5_t,
+      "C18:1w6 (%T)"                                                => :c18_1w6_t,
+      "C18:1w7 (%T)"                                                => :c18_1w7_t,
+      "C18:1w9 (%T)"                                                => :c18_1w9_t,
+      "C20:1 (%T)"                                                  => :c20_1_t,
+      "C20:1w9 (%T)"                                                => :c20_1w9_t,
+      "C20:1w13 (%T)"                                               => :c20_1w13_t,
+      "C20:1w11 (%T)"                                               => :c20_1w11_t,
+      "C22:1 (%T)"                                                  => :c22_1_t,
+      "C22:1w9 (%T)"                                                => :c22_1w9_t,
+      "C22:1w11 (%T)"                                               => :c22_1w11_t,
+      "C24:1 (%T)"                                                  => :c24_1_t,
+      "C24:1w9 (%T)"                                                => :c24_1w9_t,
+      "C24:1w11 (%T)"                                               => :c24_1w11_t,
+      "C24:1w13 (%T)"                                               => :c24_1w13_t,
+      "Total monounsaturated fatty acids, equated (%T)"             => :total_monounsaturated_fatty_acids_equated_t,
+      "C12:2 (%T)"                                                  => :c12_2_t,
+      "C16:2w4 (%T)"                                                => :c16_2w4_t,
+      "C16:3 (%T)"                                                  => :c16_3_t,
+      "C18:2w6 (%T)"                                                => :c18_2w6_t,
+      "C18:3w3 (%T)"                                                => :c18_3w3_t,
+      "C18:3w4 (%T)"                                                => :c18_3w4_t,
+      "C18:3w6 (%T)"                                                => :c18_3w6_t,
+      "C18:4w1 (%T)"                                                => :c18_4w1_t,
+      "C18:4w3 (%T)"                                                => :c18_4w3_t,
+      "C20:2 (%T)"                                                  => :c20_2_t,
+      "C20:2w6 (%T)"                                                => :c20_2w6_t,
+      "C20:3 (%T)"                                                  => :c20_3_t,
+      "C20:4 (%T)"                                                  => :c20_4_t,
+      "C20:3w3 (%T)"                                                => :c20_3w3_t,
+      "C20:3w6 (%T)"                                                => :c20_3w6_t,
+      "C20:4w3 (%T)"                                                => :c20_4w3_t,
+      "C20:4w6 (%T)"                                                => :c20_4w6_t,
+      "C20:5w3 (%T)"                                                => :c20_5w3_t,
+      "C21:5w3 (%T)"                                                => :c21_5w3_t,
+      "C22:2 (%T)"                                                  => :c22_2_t,
+      "C22:2w6 (%T)"                                                => :c22_2w6_t,
+      "C22:4w6 (%T)"                                                => :c22_4w6_t,
+      "C22:5w3 (%T)"                                                => :c22_5w3_t,
+      "C22:5w6 (%T)"                                                => :c22_5w6_t,
+      "C22:6w3 (%T)"                                                => :c22_6w3_t,
+      "Total polyunsaturated fatty acids, equated (%T)"             => :total_polyunsaturated_fatty_acids_equated_t,
+      "Total long chain omega 3 fatty acids, equated \n(%T)"        => :total_long_chain_omega_3_fatty_acids_equated_t,
+      "Total undifferentiated fatty acids \n(%T)"                   => :total_undifferentiated_fatty_acids_t,
+      "Total trans fatty acids, imputed \n(%T)"                     => :total_trans_fatty_acids_imputed_t,
+      "C4 (g)"                                                      => :c4_g,
+      "C6 (g)"                                                      => :c6_g,
+      "C8 (g)"                                                      => :c8_g,
+      "C10 (g)"                                                     => :c10_g,
+      "C11 (g)"                                                     => :c11_g,
+      "C12 (g)"                                                     => :c12_g,
+      "C13 (g)"                                                     => :c13_g,
+      "C14 (g)"                                                     => :c14_g,
+      "C15 (g)"                                                     => :c15_g,
+      "C16 (g)"                                                     => :c16_g,
+      "C17 (g)"                                                     => :c17_g,
+      "C18 (g)"                                                     => :c18_g,
+      "C19 (g)"                                                     => :c19_g,
+      "C20 (g)"                                                     => :c20_g,
+      "C21 (g)"                                                     => :c21_g,
+      "C22 (g)"                                                     => :c22_g,
+      "C23 (g)"                                                     => :c23_g,
+      "C24 (g)"                                                     => :c24_g,
+      "Total saturated fatty acids, equated \n(g)"                  => :total_saturated_fatty_acids_equated_g,
+      "C10:1 (g)"                                                   => :c10_1_g,
+      "C12:1 (g)"                                                   => :c12_1_g,
+      "C14:1 (g)"                                                   => :c14_1_g,
+      "C15:1 (g)"                                                   => :c15_1_g,
+      "C16:1 (g)"                                                   => :c16_1_g,
+      "C17:1 (g)"                                                   => :c17_1_g,
+      "C18:1 (g)"                                                   => :c18_1_g,
+      "C18:1w5 (mg)"                                                => :c18_1w5_mg,
+      "C18:1w6 (mg)"                                                => :c18_1w6_mg,
+      "C18:1w7 (g)"                                                 => :c18_1w7_g,
+      "C18:1w9 (mg)"                                                => :c18_1w9_mg,
+      "C20:1 (g)"                                                   => :c20_1_g,
+      "C20:1w9 (mg)"                                                => :c20_1w9_mg,
+      "C20:1w13 (mg)"                                               => :c20_1w13_mg,
+      "C20:1w11 (mg)"                                               => :c20_1w11_mg,
+      "C22:1 (g)"                                                   => :c22_1_g,
+      "C22:1w9 (mg)"                                                => :c22_1w9_mg,
+      "C22:1w11 (mg)"                                               => :c22_1w11_mg,
+      "C24:1 (g)"                                                   => :c24_1_g,
+      "C24:1w9 (mg)"                                                => :c24_1w9_mg,
+      "C24:1w11 (mg)"                                               => :c24_1w11_mg,
+      "C24:1w13 (mg)"                                               => :c24_1w13_mg,
+      "Total monounsaturated fatty acids, equated \n(g)"            => :total_monounsaturated_fatty_acids_equated_g,
+      "C12:2 (g)"                                                   => :c12_2_g,
+      "C16:2w4 (mg)"                                                => :c16_2w4_mg,
+      "C16:3 (g)"                                                   => :c16_3_g,
+      "C18:2w6 (g)"                                                 => :c18_2w6_g,
+      "C18:3w3 (g)"                                                 => :c18_3w3_g,
+      "C18:3w4 (g)"                                                 => :c18_3w4_g,
+      "C18:3w6 (mg)"                                                => :c18_3w6_mg,
+      "C18:4w1 (g)"                                                 => :c18_4w1_g,
+      "C18:4w3 (mg)"                                                => :c18_4w3_mg,
+      "C20:2 (mg)"                                                  => :c20_2_mg,
+      "C20:2w6 (mg)"                                                => :c20_2w6_mg,
+      "C20:3 (mg)"                                                  => :c20_3_mg,
+      "C20:3w3 (mg)"                                                => :c20_3w3_mg,
+      "C20:3w6 (mg)"                                                => :c20_3w6_mg,
+      "C20:4 (g)"                                                   => :c20_4_g,
+      "C20:4w3 (mg)"                                                => :c20_4w3_mg,
+      "C20:4w6 (mg)"                                                => :c20_4w6_mg,
+      "C20:5w3 (mg)"                                                => :c20_5w3_mg,
+      "C21:5w3 (g)"                                                 => :c21_5w3_g,
+      "C22:5w3 (mg)"                                                => :c22_5w3_mg,
+      "C22:4w6 (mg)"                                                => :c22_4w6_mg,
+      "C22:2 (g)"                                                   => :c22_2_g,
+      "C22:2w6 (mg)"                                                => :c22_2w6_mg,
+      "C22:5w6 (g)"                                                 => :c22_5w6_g,
+      "C22:6w3 (mg)"                                                => :c22_6w3_mg,
+      "Total polyunsaturated fatty acids, equated \n(g)"            => :total_polyunsaturated_fatty_acids_equated_g,
+      "Total long chain omega 3 fatty acids, equated \n(mg)"        => :total_long_chain_omega_3_fatty_acids_equated_mg,
      "Total undifferentiated fatty acids, mass basis basis \n(mg)" => :total_undifferentiated_fatty_acids_mass_basis_basis_mg,
-      "Total trans fatty acids, imputed \n(mg)" => :total_trans_fatty_acids_imputed_mg,
-      "Caffeine \n(mg)" => :caffeine_mg,
-      "Cholesterol \n(mg)" => :cholesterol_mg,
-      "Alanine \n(mg/gN)" => :alanine_mg_gn,
-      "Arginine \n(mg/gN)" => :arginine_mg_gn,
-      "Aspartic acid \n(mg/gN)" => :aspartic_acid_mg_gn,
-      "Cystine plus cysteine \n(mg/gN)" => :cystine_plus_cysteine_mg_gn,
-      "Glutamic acid \n(mg/gN)" => :glutamic_acid_mg_gn,
-      "Glycine \n(mg/gN)" => :glycine_mg_gn,
-      "Histidine \n(mg/gN)" => :histidine_mg_gn,
-      "Isoleucine \n(mg/gN)" => :isoleucine_mg_gn,
-      "Leucine \n(mg/gN)" => :leucine_mg_gn,
-      "Lysine \n(mg/gN)" => :lysine_mg_gn,
-      "Methionine \n(mg/gN)" => :methionine_mg_gn,
-      "Phenylalanine \n(mg/gN)" => :phenylalanine_mg_gn,
-      "Proline \n(mg/gN)" => :proline_mg_gn,
-      "Serine \n(mg/gN)" => :serine_mg_gn,
-      "Threonine \n(mg/gN)" => :threonine_mg_gn,
-      "Tyrosine \n(mg/gN)" => :tyrosine_mg_gn,
-      "Tryptophan \n(mg/gN)" => :tryptophan_mg_gn,
-      "Valine \n(mg/gN)" => :valine_mg_gn,
-      "Alanine \n(mg)" => :alanine_mg,
-      "Arginine \n(mg)" => :arginine_mg,
-      "Aspartic acid \n(mg)" => :aspartic_acid_mg,
-      "Cystine plus cysteine \n(mg)" => :cystine_plus_cysteine_mg,
-      "Glutamic acid \n(mg)" => :glutamic_acid_mg,
-      "Glycine \n(mg)" => :glycine_mg,
-      "Histidine \n(mg)" => :histidine_mg,
-      "Isoleucine \n(mg)" => :isoleucine_mg,
-      "Leucine \n(mg)" => :leucine_mg,
-      "Lysine \n(mg)" => :lysine_mg,
-      "Methionine \n(mg)" => :methionine_mg,
-      "Phenylalanine \n(mg)" => :phenylalanine_mg,
-      "Proline \n(mg)" => :proline_mg,
-      "Serine \n(mg)" => :serine_mg,
-      "Threonine \n(mg)" => :threonine_mg,
-      "Tyrosine \n(mg)" => :tyrosine_mg,
-      "Tryptophan \n(mg)" => :tryptophan_mg,
-      "Valine \n(mg)" => :valine_mg
+      "Total trans fatty acids, imputed \n(mg)"                     => :total_trans_fatty_acids_imputed_mg,
+      "Caffeine \n(mg)"                                             => :caffeine_mg,
+      "Cholesterol \n(mg)"                                          => :cholesterol_mg,
+      "Alanine \n(mg/gN)"                                           => :alanine_mg_gn,
+      "Arginine \n(mg/gN)"                                          => :arginine_mg_gn,
+      "Aspartic acid \n(mg/gN)"                                     => :aspartic_acid_mg_gn,
+      "Cystine plus cysteine \n(mg/gN)"                             => :cystine_plus_cysteine_mg_gn,
+      "Glutamic acid \n(mg/gN)"                                     => :glutamic_acid_mg_gn,
+      "Glycine \n(mg/gN)"                                           => :glycine_mg_gn,
+      "Histidine \n(mg/gN)"                                         => :histidine_mg_gn,
+      "Isoleucine \n(mg/gN)"                                        => :isoleucine_mg_gn,
+      "Leucine \n(mg/gN)"                                           => :leucine_mg_gn,
+      "Lysine \n(mg/gN)"                                            => :lysine_mg_gn,
+      "Methionine \n(mg/gN)"                                        => :methionine_mg_gn,
+      "Phenylalanine \n(mg/gN)"                                     => :phenylalanine_mg_gn,
+      "Proline \n(mg/gN)"                                           => :proline_mg_gn,
+      "Serine \n(mg/gN)"                                            => :serine_mg_gn,
+      "Threonine \n(mg/gN)"                                         => :threonine_mg_gn,
+      "Tyrosine \n(mg/gN)"                                          => :tyrosine_mg_gn,
+      "Tryptophan \n(mg/gN)"                                        => :tryptophan_mg_gn,
+      "Valine \n(mg/gN)"                                            => :valine_mg_gn,
+      "Alanine \n(mg)"                                              => :alanine_mg,
+      "Arginine \n(mg)"                                             => :arginine_mg,
+      "Aspartic acid \n(mg)"                                        => :aspartic_acid_mg,
+      "Cystine plus cysteine \n(mg)"                                => :cystine_plus_cysteine_mg,
+      "Glutamic acid \n(mg)"                                        => :glutamic_acid_mg,
+      "Glycine \n(mg)"                                              => :glycine_mg,
+      "Histidine \n(mg)"                                            => :histidine_mg,
+      "Isoleucine \n(mg)"                                           => :isoleucine_mg,
+      "Leucine \n(mg)"                                              => :leucine_mg,
+      "Lysine \n(mg)"                                               => :lysine_mg,
+      "Methionine \n(mg)"                                           => :methionine_mg,
+      "Phenylalanine \n(mg)"                                        => :phenylalanine_mg,
+      "Proline \n(mg)"                                              => :proline_mg,
+      "Serine \n(mg)"                                               => :serine_mg,
+      "Threonine \n(mg)"                                            => :threonine_mg,
+      "Tyrosine \n(mg)"                                             => :tyrosine_mg,
+      "Tryptophan \n(mg)"                                           => :tryptophan_mg,
+      "Valine \n(mg)"                                               => :valine_mg
    }.freeze

    csv_file = File.read(Rails.root.join('lib', 'tasks', 'australian_food_classification_data.csv'))
--- a/package.json
+++ b/package.json
@@ -14,9 +14,8 @@
    "@coffeelint/cli": "^3.0.0",
    "@percy/cli": "^1.0.0-beta.76",
    "csslint": "^1.0.5",
-    "eslint": "^5.0.0",
-    "eslint-config-google": "^0.9.1",
-    "jshint": "^2.9.4"
+    "eslint": "^10.0.0",
+    "eslint-config-google": "^0.9.1"
  },
  "repository": {
    "type": "git",
--- a/spec/features/admin/forums_spec.rb
+++ b/spec/features/admin/forums_spec.rb
@@ -29,8 +29,10 @@ describe "forums", :js do
      click_button 'Save'
    end

-    it { expect(page).to have_current_path forum_path(Forum.last), ignore_query: true }
-    it { expect(page).to have_content 'Forum was successfully created' }
+    it 'saves' do
+      expect(page).to have_content 'Forum was successfully created'
+      expect(page).to have_current_path forum_path(Forum.last), ignore_query: true
+    end
  end

  describe 'editing forum' do
--- a/spec/features/admin/plant_parts_spec.rb
+++ b/spec/features/admin/plant_parts_spec.rb
@@ -28,8 +28,10 @@ describe "plant parts", :js do
      click_button 'Save'
    end

-    it { expect(page).to have_current_path plant_part_path(PlantPart.last), ignore_query: true }
-    it { expect(page).to have_content 'Plant part was successfully created' }
+    it 'saves' do
+      expect(page).to have_content 'Plant part was successfully created'
+      expect(page).to have_current_path plant_part_path(PlantPart.last), ignore_query: true
+    end
  end

  describe 'editing plant part' do
--- a/spec/features/admin/reverting_crops_spec.rb
+++ b/spec/features/admin/reverting_crops_spec.rb
@@ -32,7 +32,7 @@ RSpec.feature 'Reverting crops' do

    scenario 'Member cannot revert a crop' do
      visit admin_crops_path
-      expect(page).not_to have_link('Revert')
+      expect(page).to have_no_link('Revert')
    end
  end
 end
--- a/spec/features/signup_spec.rb
+++ b/spec/features/signup_spec.rb
@@ -16,22 +16,15 @@ describe "signup" do
  end

  it "sign up for new account with existing username" do
-    visit crops_path # something other than front page, which has multiple signup links
-    click_link 'Sign up'
+    create(:member, login_name: 'person123')
+    visit new_member_registration_path
    fill_in 'Login name', with: 'person123'
-    fill_in 'Email', with: 'gardener@example.com'
-    fill_in 'Password', with: 'abc123'
-    fill_in 'Password confirmation', with: 'abc123'
-    check 'member_tos_agreement'
-    click_button 'Sign up'
-    expect(page).to have_current_path root_path, ignore_query: true
-    first('.signup a').click # click the 'Sign up' button in the middle of the page
-    fill_in 'Login name', with: 'person123'
-    fill_in 'Email', with: 'gardener@example.com'
+    fill_in 'Email', with: 'gardener2@example.com'
    fill_in 'Password', with: 'abc123'
    fill_in 'Password confirmation', with: 'abc123'
    check 'member_tos_agreement'
    click_button 'Sign up'
+    expect(page).to have_content 'has already been taken'
  end

  it "sign up for new account without accepting TOS" do
--- a/spec/requests/api/v1/activities_request_spec.rb
+++ b/spec/requests/api/v1/activities_request_spec.rb
@@ -7,8 +7,8 @@ RSpec.describe 'Activities', type: :request do

  let(:member) { create(:member) }
  let(:token) do
-      member.regenerate_api_token
-      member.api_token.token
+    member.regenerate_api_token
+    member.api_token.token
  end
  let(:headers) { { 'Accept' => 'application/vnd.api+json', 'Content-Type' => 'application/vnd.api+json' } }
  let(:auth_headers) { headers.merge('Authorization' => "Bearer #{token}") }
--- a/yarn.lock
+++ b/yarn.lock