Merge branch 'dev' into rubocop-cleanup

Rubocop: RSpec/ExpectChange

.devcontainer/Dockerfile

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye
+FROM mcr.microsoft.com/devcontainers/ruby:3.4-trixie
 
 # Install Rails
 RUN gem install rails:7.0.8

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.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

.rubocop.yml

@@ -24,6 +24,7 @@ Naming/FileName:
 
 RSpec/DescribeClass:
   Exclude:
+   - 'spec/tasks/import_spec.rb'
    - 'spec/views/**/*.rb'
    - 'spec/features/**/*.rb'
 
@@ -71,4 +72,7 @@ Layout/LineLength:
 Rails/SkipsModelValidations:
   Exclude:
     - 'db/migrate/20190317023129_finished_boolean.rb'
+    - 'db/migrate/20251128200506_add_description_to_crops.rb'
+    - 'db/migrate/20240810160538_set_default_language_for_existing_alternate_names.rb'
+    - 'db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb'
     - 'db/seeds.rb'

.rubocop_todo.yml

@@ -1,33 +1,22 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-07-13 05:47:38 UTC using RuboCop version 1.65.0.
+# on 2026-03-01 05:32:16 UTC using RuboCop version 1.85.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 231
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: link_or_button, strict
-Capybara/ClickLinkOrButtonStyle:
-  Enabled: false
-
-# Offense count: 39
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: DefaultSelector.
-Capybara/RSpec/HaveSelector:
+# Offense count: 19
+Capybara/NegationMatcherAfterVisit:
   Exclude:
-    - 'spec/features/conversations/index_spec.rb'
-    - 'spec/features/footer_spec.rb'
-    - 'spec/features/gardens/adding_gardens_spec.rb'
-    - 'spec/features/harvests/harvesting_a_crop_spec.rb'
-    - 'spec/features/members/list_spec.rb'
+    - 'spec/features/admin/reverting_crops_spec.rb'
+    - 'spec/features/crops/crop_detail_page_spec.rb'
+    - 'spec/features/crops/crop_wranglers_spec.rb'
+    - 'spec/features/gardens/gardens_spec.rb'
+    - 'spec/features/members/deletion_spec.rb'
+    - 'spec/features/members/following_spec.rb'
+    - 'spec/features/members/profile_spec.rb'
     - 'spec/features/plantings/planting_a_crop_spec.rb'
-    - 'spec/features/seeds/adding_seeds_spec.rb'
-    - 'spec/features/shared_examples/crop_suggest.rb'
-    - 'spec/helpers/application_helper_spec.rb'
-    - 'spec/support/feature_helpers.rb'
-    - 'spec/views/posts/show.html.haml_spec.rb'
 
 # Offense count: 14
 Capybara/SpecificMatcher:
@@ -43,21 +32,22 @@ Capybara/VisibilityMatcher:
   Exclude:
     - 'spec/features/shared_examples/crop_suggest.rb'
 
-# Offense count: 6
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, NonImplicitAssociationMethodNames.
 # SupportedStyles: explicit, implicit
 FactoryBot/AssociationStyle:
   Exclude:
     - 'spec/factories/alternate_names.rb'
+    - 'spec/factories/comments.rb'
     - 'spec/factories/crop.rb'
     - 'spec/factories/like.rb'
+    - 'spec/factories/notifications.rb'
     - 'spec/factories/scientific_name.rb'
 
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect, Include, EnforcedStyle, ExplicitOnly.
-# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
+# Configuration parameters: EnforcedStyle, ExplicitOnly.
 # SupportedStyles: create_list, n_times
 FactoryBot/CreateList:
   Exclude:
@@ -66,31 +56,37 @@ FactoryBot/CreateList:
     - 'spec/views/posts/index.html.haml_spec.rb'
 
 # Offense count: 4
-# Configuration parameters: Include, MaxAmount.
-# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
+# Configuration parameters: MaxAmount.
 FactoryBot/ExcessiveCreateList:
   Exclude:
     - 'spec/controllers/posts_controller_spec.rb'
     - 'spec/features/crops/show_spec.rb'
     - 'spec/features/percy/percy_spec.rb'
 
-# Offense count: 1127
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: **/*_spec.rb, **/spec/**/*, **/test/**/*, **/features/support/factories/**/*.rb
-FactoryBot/SyntaxMethods:
-  Enabled: false
-
-# Offense count: 2
+# Offense count: 312
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
+# SupportedHashRocketStyles: key, separator, table
+# SupportedColonStyles: key, separator, table
+# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
+Layout/HashAlignment:
+  Exclude:
+    - 'app/models/crop.rb'
+
+# Offense count: 6
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
 Layout/LineLength:
   Exclude:
-    - 'app/helpers/crops_helper.rb'
+    - 'Gemfile'
+    - 'app/controllers/admin/versions_controller.rb'
+    - 'app/models/concerns/predict_planting.rb'
+    - 'app/models/crop.rb'
     - 'db/seeds.rb'
+    - 'spec/requests/api/v1/activities_request_spec.rb'
 
-# Offense count: 3
+# Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: RequireParenthesesForMethodChains.
 Lint/AmbiguousRange:
@@ -98,25 +94,33 @@ Lint/AmbiguousRange:
     - 'app/models/concerns/search_activities.rb'
     - 'app/models/concerns/search_harvests.rb'
     - 'app/models/concerns/search_plantings.rb'
+    - 'db/seeds.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: AllowSafeAssignment.
+Lint/AssignmentInCondition:
+  Exclude:
+    - 'app/helpers/crops_helper.rb'
+
+# Offense count: 1
+# Configuration parameters: AllowedMethods.
+# AllowedMethods: enums
+Lint/ConstantDefinitionInBlock:
+  Exclude:
+    - 'lib/tasks/import.rake'
 
 # Offense count: 2
-# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches.
+# Configuration parameters: IgnoreLiteralBranches, IgnoreConstantBranches, IgnoreDuplicateElseBranch.
 Lint/DuplicateBranch:
   Exclude:
     - 'app/models/harvest.rb'
     - 'lib/actions/oauth_signup_action.rb'
 
-# Offense count: 8
-# Configuration parameters: AllowComments, AllowEmptyLambdas.
-Lint/EmptyBlock:
+# Offense count: 1
+Lint/DuplicateMethods:
   Exclude:
-    - 'db/migrate/20171022032108_all_the_predictions.rb'
-    - 'spec/controllers/home_controller_spec.rb'
-    - 'spec/controllers/likes_controller_spec.rb'
-    - 'spec/controllers/plant_parts_controller_spec.rb'
-    - 'spec/factories/crop_companions.rb'
-    - 'spec/features/crops/crop_detail_page_spec.rb'
-    - 'spec/requests/authentications_spec.rb'
+    - 'app/models/planting.rb'
 
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -136,57 +140,101 @@ Lint/SuppressedException:
   Exclude:
     - 'lib/tasks/testing.rake'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, consistent
+Lint/SymbolConversion:
+  Exclude:
+    - 'app/helpers/crops_helper.rb'
+
 # Offense count: 7
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect.
+# This cop supports safe autocorrection (--autocorrect).
 Lint/UselessAssignment:
   Exclude:
     - 'config.rb'
     - 'config/compass.rb'
 
-# Offense count: 52
+# Offense count: 1
+Lint/UselessConstantScoping:
+  Exclude:
+    - 'app/controllers/members_controller.rb'
+
+# Offense count: 61
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes.
 Metrics/AbcSize:
-  Max: 151
+  Max: 295
 
 # Offense count: 14
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns, inherit_mode.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 115
+  Max: 294
 
-# Offense count: 7
+# Offense count: 10
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 188
+  Max: 298
 
-# Offense count: 6
+# Offense count: 1
+# Configuration parameters: LengthThreshold.
+Metrics/CollectionLiteralLength:
+  Exclude:
+    - 'lib/tasks/import.rake'
+
+# Offense count: 10
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/CyclomaticComplexity:
   Max: 32
 
-# Offense count: 71
+# Offense count: 82
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 127
+  Max: 296
 
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ModuleLength:
-  Max: 125
+  Max: 144
 
-# Offense count: 5
+# Offense count: 8
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 Metrics/PerceivedComplexity:
   Max: 32
 
+# Offense count: 2
+# Configuration parameters: Mode, AllowedMethods, AllowedPatterns, AllowBangMethods, WaywardPredicates.
+# AllowedMethods: call
+# WaywardPredicates: infinite?, nonzero?
+Naming/PredicateMethod:
+  Exclude:
+    - 'app/models/concerns/finishable.rb'
+    - 'app/models/seed.rb'
+
 # Offense count: 3
 RSpec/AnyInstance:
   Exclude:
     - 'spec/controllers/harvests_controller_spec.rb'
     - 'spec/controllers/photos_controller_spec.rb'
 
-# Offense count: 292
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/BeEq:
+  Exclude:
+    - 'spec/requests/api/v1/activities_request_spec.rb'
+
+# Offense count: 1
+RSpec/BeforeAfterAll:
+  Exclude:
+    - 'spec/tasks/import_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/ContextMethod:
+  Exclude:
+    - 'spec/requests/api/v1/activities_request_spec.rb'
+
+# Offense count: 299
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
@@ -204,7 +252,6 @@ RSpec/DescribedClass:
 
 # Offense count: 13
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AutoCorrect.
 RSpec/EmptyExampleGroup:
   Exclude:
     - 'spec/controllers/authentications_controller_spec.rb'
@@ -220,17 +267,10 @@ RSpec/EmptyExampleGroup:
     - 'spec/views/photos/edit.html.haml_spec.rb'
     - 'spec/views/posts/_single.html.haml_spec.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowConsecutiveOneLiners.
-RSpec/EmptyLineAfterExample:
-  Exclude:
-    - 'spec/models/ability_spec.rb'
-
-# Offense count: 140
+# Offense count: 146
 # Configuration parameters: CountAsOne.
 RSpec/ExampleLength:
-  Max: 25
+  Max: 27
 
 # Offense count: 32
 RSpec/ExpectInHook:
@@ -245,20 +285,25 @@ RSpec/ExpectInHook:
     - 'spec/features/plantings/planting_a_crop_spec.rb'
     - 'spec/features/shared_examples/append_date.rb'
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: implicit, each, example
-RSpec/HookArgument:
-  Exclude:
-    - 'spec/requests/api/v1/plantings_request_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect.
-RSpec/HooksBeforeExamples:
+# Offense count: 53
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/IncludeExamples:
   Exclude:
+    - 'spec/features/conversations/index_spec.rb'
+    - 'spec/features/crops/alternate_name_spec.rb'
+    - 'spec/features/crops/browse_crops_spec.rb'
     - 'spec/features/crops/creating_a_crop_spec.rb'
+    - 'spec/features/crops/crop_photos_spec.rb'
+    - 'spec/features/crops/delete_crop_spec.rb'
+    - 'spec/features/gardens/actions_spec.rb'
+    - 'spec/features/gardens/adding_gardens_spec.rb'
+    - 'spec/features/gardens/index_spec.rb'
+    - 'spec/features/likeable_spec.rb'
+    - 'spec/features/signout_spec.rb'
+    - 'spec/models/crop_spec.rb'
+    - 'spec/support/feature_helpers.rb'
+    - 'spec/views/photos/show.html.haml_spec.rb'
+    - 'spec/views/seeds/index.rss.haml_spec.rb'
 
 # Offense count: 37
 # Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
@@ -276,21 +321,15 @@ RSpec/IndexedLet:
     - 'spec/models/member_spec.rb'
     - 'spec/views/forums/index.html.haml_spec.rb'
 
-# Offense count: 720
+# Offense count: 719
 # Configuration parameters: AssignmentOnly.
 RSpec/InstanceVariable:
   Enabled: false
 
-# Offense count: 40
+# Offense count: 41
 RSpec/LetSetup:
   Enabled: false
 
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-RSpec/MatchArray:
-  Exclude:
-    - 'spec/models/post_spec.rb'
-
 # Offense count: 2
 RSpec/MessageChain:
   Exclude:
@@ -307,16 +346,16 @@ RSpec/MultipleDescribes:
   Exclude:
     - 'spec/features/crops/crop_wranglers_spec.rb'
 
-# Offense count: 152
+# Offense count: 189
 RSpec/MultipleExpectations:
   Max: 19
 
-# Offense count: 138
+# Offense count: 166
 # Configuration parameters: AllowSubject.
 RSpec/MultipleMemoizedHelpers:
-  Max: 20
+  Max: 16
 
-# Offense count: 133
+# Offense count: 183
 # Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
 # SupportedStyles: always, named_only
 RSpec/NamedSubject:
@@ -327,17 +366,18 @@ RSpec/NamedSubject:
 RSpec/NestedGroups:
   Max: 6
 
-# Offense count: 403
+# Offense count: 407
 # Configuration parameters: AllowedPatterns.
 # AllowedPatterns: ^expect_, ^assert_
 RSpec/NoExpectationExample:
   Enabled: false
 
-# Offense count: 3
+# Offense count: 4
 RSpec/PendingWithoutReason:
   Exclude:
     - 'spec/features/seeds/misc_seeds_spec.rb'
     - 'spec/features/unsubscribing_spec.rb'
+    - 'spec/requests/api/v1/gardens_request_spec.rb'
 
 # Offense count: 2
 RSpec/RepeatedDescription:
@@ -358,15 +398,14 @@ RSpec/RepeatedExampleGroupBody:
 
 # Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AutoCorrect.
 RSpec/ScatteredSetup:
   Exclude:
     - 'spec/features/percy/percy_spec.rb'
     - 'spec/features/plantings/prediction_spec.rb'
 
 # Offense count: 1
-# Configuration parameters: Include, CustomTransform, IgnoreMethods, IgnoreMetadata.
-# Include: **/*_spec.rb
+# Configuration parameters: CustomTransform, IgnoreMethods, IgnoreMetadata, InflectorPath, EnforcedInflector.
+# SupportedInflectors: default, active_support
 RSpec/SpecFilePathFormat:
   Exclude:
     - 'spec/controllers/member_controller_spec.rb'
@@ -380,8 +419,6 @@ RSpec/StubbedMock:
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: constant, string
 RSpec/VerifiedDoubleReference:
   Exclude:
     - 'spec/models/member_spec.rb'
@@ -405,36 +442,44 @@ RSpecRails/HaveHttpStatus:
     - 'spec/controllers/likes_controller_spec.rb'
     - 'spec/requests/harvests_spec.rb'
 
-# Offense count: 16
+# Offense count: 17
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Inferences.
 RSpecRails/InferredSpecType:
   Enabled: false
 
-# Offense count: 28
-# Configuration parameters: Database, Include.
+# Offense count: 30
+# Configuration parameters: Database.
 # SupportedDatabases: mysql, postgresql
-# Include: db/**/*.rb
 Rails/BulkChangeTable:
   Enabled: false
 
 # Offense count: 4
-# Configuration parameters: Include.
-# Include: db/**/*.rb
 Rails/CreateTableWithTimestamps:
   Exclude:
     - 'db/migrate/20150201052245_create_cms.rb'
     - 'db/migrate/20171022032108_all_the_predictions.rb'
 
-# Offense count: 1
+# Offense count: 8
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowToTime.
 # SupportedStyles: strict, flexible
 Rails/Date:
   Exclude:
+    - 'app/controllers/activities_controller.rb'
     - 'app/mailers/notifier_mailer.rb'
+    - 'app/models/concerns/search_seeds.rb'
+    - 'spec/features/activities/creating_a_recurring_activity_spec.rb'
 
-# Offense count: 11
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: slashes, arguments
+Rails/FilePath:
+  Exclude:
+    - 'lib/tasks/import.rake'
+
+# Offense count: 12
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods, AllowedPatterns.
 # AllowedMethods: order, limit, select, lock
@@ -445,38 +490,39 @@ Rails/FindEach:
     - 'db/migrate/20171129041341_create_photographings.rb'
     - 'db/migrate/20190130090437_add_crop_to_photographings.rb'
     - 'db/migrate/20191119030244_cms_tags.rb'
+    - 'lib/tasks/wikidata.rake'
 
 # Offense count: 2
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
 Rails/HasAndBelongsToMany:
   Exclude:
     - 'app/models/member.rb'
     - 'app/models/role.rb'
 
-# Offense count: 5
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
+# Offense count: 6
 Rails/HasManyOrHasOneDependent:
   Exclude:
+    - 'app/models/crop.rb'
     - 'app/models/member.rb'
 
 # Offense count: 1
-# Configuration parameters: Include.
-# Include: spec/**/*.rb, test/**/*.rb
 Rails/I18nLocaleAssignment:
   Exclude:
     - 'spec/features/locale_spec.rb'
 
-# Offense count: 33
+# Offense count: 40
 Rails/I18nLocaleTexts:
   Enabled: false
 
-# Offense count: 3
-# Configuration parameters: Include.
-# Include: app/controllers/**/*.rb, app/mailers/**/*.rb
+# Offense count: 1
+# Configuration parameters: IgnoreScopes.
+Rails/InverseOf:
+  Exclude:
+    - 'app/models/member.rb'
+
+# Offense count: 4
 Rails/LexicallyScopedActionFilter:
   Exclude:
+    - 'app/controllers/api/v1/base_controller.rb'
     - 'app/controllers/data_controller.rb'
     - 'app/controllers/registrations_controller.rb'
 
@@ -492,10 +538,16 @@ Rails/PluralizationGrammar:
   Exclude:
     - 'spec/requests/plantings_spec.rb'
 
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+Rails/Presence:
+  Exclude:
+    - 'app/controllers/photos_controller.rb'
+    - 'app/controllers/plantings_controller.rb'
+    - 'app/models/concerns/open_farm_data.rb'
+
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: **/Rakefile, **/*.rake
 Rails/RakeEnvironment:
   Exclude:
     - 'lib/tasks/hooks.rake'
@@ -513,7 +565,7 @@ Rails/RedundantActiveRecordAllMethod:
     - 'app/controllers/forums_controller.rb'
     - 'app/controllers/plant_parts_controller.rb'
     - 'app/controllers/scientific_names_controller.rb'
-    - 'app/services/openfarm_service.rb'
+    - 'spec/features/members/deletion_spec.rb'
     - 'spec/features/percy/percy_spec.rb'
     - 'spec/models/harvest_spec.rb'
 
@@ -526,14 +578,13 @@ Rails/RedundantPresenceValidationOnBelongsTo:
     - 'app/models/planting.rb'
     - 'app/models/scientific_name.rb'
 
-# Offense count: 15
+# Offense count: 16
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Include.
-# Include: spec/controllers/**/*.rb, spec/requests/**/*.rb, test/controllers/**/*.rb, test/integration/**/*.rb
 Rails/ResponseParsedBody:
   Exclude:
     - 'spec/controllers/api/v1/plantings_controller_spec.rb'
     - 'spec/controllers/likes_controller_spec.rb'
+    - 'spec/requests/api/v1/activities_request_spec.rb'
     - 'spec/requests/api/v1/crop_request_spec.rb'
     - 'spec/requests/api/v1/gardens_request_spec.rb'
     - 'spec/requests/api/v1/harvests_request_spec.rb'
@@ -543,29 +594,35 @@ Rails/ResponseParsedBody:
     - 'spec/requests/api/v1/seeds_request_spec.rb'
 
 # Offense count: 9
-# Configuration parameters: Include.
-# Include: db/**/*.rb
 Rails/ReversibleMigration:
   Exclude:
     - 'db/migrate/20130326092227_change_planted_at_to_date.rb'
     - 'db/migrate/20191119020643_upgrade_cms.rb'
 
-# Offense count: 2
+# Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/RootPathnameMethods:
   Exclude:
     - 'app/controllers/crops_controller.rb'
     - 'app/helpers/icons_helper.rb'
+    - 'config/application.rb'
+    - 'lib/tasks/import.rake'
+    - 'spec/rails_helper.rb'
 
 # Offense count: 21
-# Configuration parameters: Include.
-# Include: db/**/*.rb
 Rails/ThreeStateBooleanColumn:
   Enabled: false
 
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, flexible
+Rails/TimeZone:
+  Exclude:
+    - 'app/controllers/activities_controller.rb'
+    - 'spec/features/harvests/harvesting_a_crop_spec.rb'
+
 # Offense count: 6
-# Configuration parameters: Include.
-# Include: app/models/**/*.rb
 Rails/UniqueValidationWithoutIndex:
   Exclude:
     - 'app/models/follow.rb'
@@ -583,24 +640,34 @@ Rails/WhereEquals:
     - 'app/models/harvest.rb'
     - 'app/models/planting.rb'
 
-# Offense count: 2
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Rails/WhereMissing:
+  Exclude:
+    - 'app/controllers/crops_controller.rb'
+
+# Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Rails/WhereRange:
   Exclude:
     - 'app/models/concerns/predict_planting.rb'
     - 'app/models/garden.rb'
+    - 'app/models/seed.rb'
 
 # Offense count: 1
 Rake/MethodDefinitionInTask:
   Exclude:
     - 'lib/tasks/growstuff.rake'
 
-# Offense count: 3
+# Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
+# Configuration parameters: EnforcedStyle, EnforcedStyleForClasses, EnforcedStyleForModules.
 # SupportedStyles: nested, compact
+# SupportedStylesForClasses: ~, nested, compact
+# SupportedStylesForModules: ~, nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
+    - 'app/controllers/admin/crops_controller.rb'
     - 'lib/actions/oauth_signup_action.rb'
     - 'lib/haml/filters/escaped_markdown.rb'
     - 'lib/haml/filters/growstuff_markdown.rb'
@@ -615,30 +682,51 @@ Style/CommentedKeyword:
     - 'spec/models/planting_spec.rb'
 
 # Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowedVars, DefaultToNil.
+Style/FetchEnvVar:
+  Exclude:
+    - 'config/sitemap.rb'
+
+# Offense count: 2
+Style/FileOpen:
+  Exclude:
+    - 'app/helpers/application_helper.rb'
+    - 'db/seeds.rb'
+
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: left_coerce, right_coerce, single_coerce, fdiv
+Style/FloatDivision:
+  Exclude:
+    - 'app/models/concerns/predict_planting.rb'
+
+# Offense count: 22
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
-  Exclude:
-    - 'config/initializers/new_framework_defaults_6_0.rb'
-    - 'db/migrate/20200801084007_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb'
-    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
+  Enabled: false
 
-# Offense count: 3
+# Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:
   Exclude:
     - 'config/environments/production.rb'
     - 'lib/tasks/gbif.rake'
-    - 'lib/tasks/openfarm.rake'
+
+# Offense count: 2
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/IdenticalConditionalBranches:
+  Exclude:
+    - 'lib/actions/oauth_signup_action.rb'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: AllowedMethods.
-# AllowedMethods: nonzero?
-Style/IfWithBooleanLiteralBranches:
+Style/MapIntoArray:
   Exclude:
-    - 'app/controllers/gardens_controller.rb'
+    - 'app/helpers/crops_helper.rb'
 
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -660,12 +748,13 @@ Style/MutableConstant:
   Exclude:
     - 'app/models/activity.rb'
 
-# Offense count: 5
+# Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
   Exclude:
+    - 'app/controllers/activities_controller.rb'
     - 'app/helpers/crops_helper.rb'
     - 'app/helpers/harvests_helper.rb'
     - 'app/helpers/plantings_helper.rb'
@@ -676,13 +765,21 @@ Style/OpenStructUse:
   Exclude:
     - 'spec/helpers/event_helper_spec.rb'
 
-# Offense count: 2
+# Offense count: 3
 # Configuration parameters: AllowedMethods.
 # AllowedMethods: respond_to_missing?
 Style/OptionalBooleanParameter:
   Exclude:
+    - 'app/helpers/application_helper.rb'
     - 'app/models/concerns/member_newsletter.rb'
 
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'db/migrate/20251130035700_create_versions.rb'
+
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Methods.
@@ -697,20 +794,34 @@ Style/RedundantFetchBlock:
   Exclude:
     - 'config/puma.rb'
 
-# Offense count: 2
+# Offense count: 1
+# This cop supports unsafe autocorrection (--autocorrect-all).
+Style/RedundantInterpolation:
+  Exclude:
+    - 'app/helpers/buttons_helper.rb'
+
+# Offense count: 4
+# Configuration parameters: Max.
+Style/SafeNavigationChainLength:
+  Exclude:
+    - 'app/models/ability.rb'
+
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowModifier.
 Style/SoleNestedConditional:
   Exclude:
+    - 'app/controllers/activities_controller.rb'
     - 'app/controllers/application_controller.rb'
     - 'app/controllers/messages_controller.rb'
 
-# Offense count: 24
+# Offense count: 27
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
     - 'app/controllers/messages_controller.rb'
+    - 'app/controllers/registrations_controller.rb'
     - 'app/helpers/buttons_helper.rb'
     - 'config/initializers/rswag_api.rb'
     - 'spec/helpers/gardens_helper_spec.rb'

.ruby-version

@@ -1 +1 @@
-3.3.8
+3.4.8

.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

Gemfile

@@ -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,13 +200,9 @@ group :test do
   gem 'vcr'
 end
 
-group :travis do
-  gem 'platform-api'
-end
-
 gem "i18n_data", "~> 1.1"
 
 gem "paper_trail", "~> 17.0"
 
-gem 'sitemap_generator'
 gem 'aws-sdk-s3', '~> 1', '>= 1.114.0'
+gem 'sitemap_generator'

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.7)
-      public_suffix (>= 2.0.2, < 7.0)
+    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.1189.0)
-    aws-sdk-core (3.239.2)
+    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.118.0)
-      aws-sdk-core (~> 3, >= 3.239.1)
+    aws-sdk-kms (1.123.0)
+      aws-sdk-core (~> 3, >= 3.244.0)
       aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.205.0)
-      aws-sdk-core (~> 3, >= 3.234.0)
+    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.0)
+    axe-core-api (4.11.2)
       dumb_delegator
       ostruct
       virtus
-    axe-core-capybara (4.11.0)
-      axe-core-api (= 4.11.0)
+    axe-core-capybara (4.11.2)
+      axe-core-api (= 4.11.2)
       dumb_delegator
-    axe-core-rspec (4.11.0)
-      axe-core-api (= 4.11.0)
+    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.20)
+    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
@@ -194,7 +195,7 @@ GEM
     capybara-email (3.0.2)
       capybara (>= 2.4, < 4.0)
       mail
-    capybara-screenshot (1.0.26)
+    capybara-screenshot (1.0.27)
       capybara (>= 1.0, < 4)
       launchy
     carrierwave (3.0.7)
@@ -204,9 +205,10 @@ GEM
       image_processing (~> 1.1)
       marcel (~> 1.0.0)
       ssrf_filter (~> 1.0)
-    cgi (0.5.0)
+    cgi (0.5.1)
     chartkick (5.2.1)
-    childprocess (5.0.0)
+    childprocess (5.1.0)
+      logger (~> 1.5)
     coderay (1.1.3)
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
@@ -219,7 +221,7 @@ GEM
     coffee-script-source (1.12.2)
     comfy_bootstrap_form (4.0.9)
       rails (>= 5.0.0)
-    concurrent-ruby (1.3.5)
+    concurrent-ruby (1.3.6)
     connection_pool (2.5.5)
     crass (1.0.6)
     crowdin-api (1.12.0)
@@ -234,20 +236,21 @@ GEM
     csv_shaper (1.4.0)
       activesupport (>= 3.0.0)
       csv
-    dalli (3.2.8)
+    dalli (5.0.2)
+      logger
     database_cleaner (2.1.0)
       database_cleaner-active_record (>= 2, < 3)
     database_cleaner-active_record (2.2.0)
       activerecord (>= 5.a)
       database_cleaner-core (~> 2.0.0)
     database_cleaner-core (2.0.1)
-    date (3.5.0)
+    date (3.5.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    devise (4.9.4)
+    devise (5.0.3)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
-      railties (>= 4.1.0)
+      railties (>= 7.0)
       responders
       warden (~> 1.2.3)
     diff-lcs (1.6.2)
@@ -273,26 +276,24 @@ GEM
     elasticsearch-transport (7.0.0)
       faraday
       multi_json
-    erb (6.0.0)
+    erb (6.0.2)
     erubi (1.13.1)
-    erubis (2.7.0)
-    excon (1.2.5)
-      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.0)
+    faraday (2.14.1)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.1)
-      net-http (>= 0.5.0)
-    ffi (1.16.3)
+    faraday-net_http (3.4.2)
+      net-http (~> 0.5)
+    ffi (1.17.3)
+    ffi (1.17.3-x86_64-linux-gnu)
     flickraw (0.9.10)
     font-awesome-sass (5.15.1)
       sassc (>= 1.11)
@@ -312,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
@@ -321,30 +322,24 @@ GEM
       activesupport (>= 5.1)
       haml (>= 4.0.6)
       railties (>= 5.1)
-    haml_lint (0.67.0)
+    haml_lint (0.73.0)
       haml (>= 5.0)
-      parallel (~> 1.10)
+      parallel (>= 1.10)
       rainbow
       rubocop (>= 1.0)
       sysexits (~> 1.1)
-    hashie (5.0.0)
-    heroics (0.1.3)
-      base64
-      erubis (~> 2.0)
-      excon
-      moneta
-      multi_json (>= 1.9.2)
-      webrick
+    hashie (5.1.0)
+      logger
     highline (3.1.2)
       reline
     http-accept (1.7.0)
     http-cookie (1.0.8)
       domain_name (~> 0.5)
-    httparty (0.22.0)
+    httparty (0.24.0)
       csv
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    i18n (1.14.7)
+    i18n (1.14.8)
       concurrent-ruby (~> 1.0)
     i18n-tasks (1.1.2)
       activesupport (>= 4.0.2)
@@ -360,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
@@ -370,9 +365,10 @@ GEM
     image_processing (1.12.2)
       mini_magick (>= 4.9.5, < 5)
       ruby-vips (>= 2.0.17, < 3)
-    io-console (0.8.1)
-    irb (1.15.3)
+    io-console (0.8.2)
+    irb (1.17.0)
       pp (>= 0.6.0)
+      prism (>= 1.3.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
@@ -380,10 +376,10 @@ GEM
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
-    json (2.16.0)
-    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
@@ -393,20 +389,22 @@ GEM
     kramdown (2.4.0)
       rexml
     language_server-protocol (3.17.0.5)
-    launchy (3.0.1)
+    launchy (3.1.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
+      logger (~> 1.6)
     leaflet-rails (1.9.5)
       actionpack (>= 4.2.0)
       railties (>= 4.2.0)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     lint_roller (1.1.0)
-    listen (3.9.0)
+    listen (3.10.0)
+      logger
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     logger (1.7.0)
-    loofah (2.24.1)
+    loofah (2.25.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     mail (2.9.0)
@@ -424,7 +422,7 @@ GEM
       sass (>= 3.5.2)
     material_icons (4.0.0)
       railties (>= 3.2)
-    matrix (0.4.2)
+    matrix (0.4.3)
     memcachier (0.0.2)
     method_source (1.1.0)
     mime-types (3.7.0)
@@ -437,14 +435,13 @@ GEM
     mini_magick (4.12.0)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    minitest (5.26.2)
-    moneta (1.0.0)
+    minitest (5.27.0)
     msgpack (1.8.0)
-    multi_json (1.15.0)
-    multi_xml (0.7.1)
-      bigdecimal (~> 3.1)
-    net-http (0.6.0)
-      uri
+    multi_json (1.19.1)
+    multi_xml (0.8.1)
+      bigdecimal (>= 3.1, < 5)
+    net-http (0.9.1)
+      uri (>= 0.11.1)
     net-imap (0.5.12)
       date
       net-protocol
@@ -456,13 +453,13 @@ GEM
       net-protocol
     netrc (0.11.0)
     nio4r (2.7.5)
-    nokogiri (1.18.10)
+    nokogiri (1.19.2)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.10-x86_64-linux-gnu)
+    nokogiri (1.19.2-x86_64-linux-gnu)
       racc (~> 1.4)
     oauth (0.5.6)
-    oj (3.16.13)
+    oj (3.17.0)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
     omniauth (1.9.2)
@@ -480,35 +477,32 @@ GEM
     paper_trail (17.0.0)
       activerecord (>= 7.1)
       request_store (~> 1.4)
-    parallel (1.27.0)
-    parser (3.3.10.0)
+    parallel (2.0.1)
+    parser (3.3.11.1)
       ast (~> 2.4.1)
       racc
     percy-capybara (5.0.0)
       capybara (>= 3)
-    pg (1.6.2)
-    pg (1.6.2-x86_64-linux)
-    platform-api (3.8.0)
-      heroics (~> 0.1.1)
-      moneta (~> 1.0.0)
-      rate_throttle_client (~> 0.1.0)
+    pg (1.6.3)
+    pg (1.6.3-x86_64-linux)
     popper_js (2.11.8)
     pp (0.6.3)
       prettyprint
     prettyprint (0.2.0)
-    prism (1.6.0)
-    pry (0.15.2)
+    prism (1.9.0)
+    pry (0.16.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    psych (5.2.6)
+      reline (>= 0.6.0)
+    psych (5.3.1)
       date
       stringio
-    public_suffix (6.0.2)
-    puma (7.1.0)
+    public_suffix (7.0.5)
+    puma (8.0.0)
       nio4r (~> 2.0)
     query_diet (0.7.3)
     racc (1.8.1)
-    rack (2.2.21)
+    rack (2.2.23)
     rack-cors (2.0.2)
       rack (>= 2.0.0)
     rack-protection (3.2.0)
@@ -521,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)
@@ -543,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)
@@ -554,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)
@@ -566,19 +560,18 @@ 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.10.1)
+    rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rdoc (6.17.0)
+    rdoc (7.2.0)
       erb
       psych (>= 4.0.0)
       tsort
-    recaptcha (5.21.1)
-    redis-client (0.23.2)
+    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)
@@ -606,20 +599,20 @@ GEM
     rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-mocks (3.13.5)
+    rspec-mocks (3.13.8)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
-    rspec-rails (8.0.2)
+    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.6)
+    rspec-support (3.13.7)
     rspectre (0.2.0)
       parser (>= 3.3.7.1)
       prism (~> 1.3)
@@ -635,27 +628,27 @@ GEM
     rswag-ui (2.17.0)
       actionpack (>= 5.2, < 8.2)
       railties (>= 5.2, < 8.2)
-    rubocop (1.81.7)
+    rubocop (1.86.1)
       json (~> 2.3)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.1.0)
-      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.47.1, < 2.0)
+      rubocop-ast (>= 1.49.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.48.0)
+    rubocop-ast (1.49.1)
       parser (>= 3.3.7.2)
-      prism (~> 1.4)
+      prism (~> 1.7)
     rubocop-capybara (2.22.1)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
     rubocop-factory_bot (2.28.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.72, >= 1.72.1)
-    rubocop-rails (2.34.2)
+    rubocop-rails (2.34.3)
       activesupport (>= 4.2.0)
       lint_roller (~> 1.1)
       rack (>= 1.1)
@@ -664,7 +657,7 @@ GEM
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
       rubocop (>= 1.72.1)
-    rubocop-rspec (3.8.0)
+    rubocop-rspec (3.9.0)
       lint_roller (~> 1.1)
       rubocop (~> 1.81)
     rubocop-rspec_rails (2.32.0)
@@ -689,24 +682,24 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    scout_apm (6.0.0)
+    scout_apm (6.2.0)
       parser
     searchkick (5.3.1)
       activemodel (>= 6.1)
       hashie
     securerandom (0.4.1)
-    selenium-webdriver (4.39.0)
+    selenium-webdriver (4.43.0)
       base64 (~> 0.2)
       logger (~> 1.4)
       rexml (~> 3.2, >= 3.2.5)
       rubyzip (>= 1.2.2, < 4.0)
       websocket (~> 1.0)
-    sidekiq (7.3.9)
+    sidekiq (7.3.10)
       base64
-      connection_pool (>= 2.3.0)
+      connection_pool (>= 2.3.0, < 3)
       logger
-      rack (>= 2.2.4)
-      redis-client (>= 0.22.2)
+      rack (>= 2.2.4, < 3.3)
+      redis-client (>= 0.23.0, < 1)
     simple_po_parser (1.1.6)
     sitemap_generator (6.3.0)
       builder (~> 3.0)
@@ -719,35 +712,34 @@ GEM
       activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     ssrf_filter (1.1.2)
-    stringio (3.1.9)
+    stringio (3.2.0)
     sysexits (1.2.0)
     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.4.0)
+    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)
       concurrent-ruby (~> 1.0)
     unicode-display_width (3.2.0)
       unicode-emoji (~> 4.1)
-    unicode-emoji (4.1.0)
+    unicode-emoji (4.2.0)
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
     uniform_notifier (1.18.0)
-    uri (1.0.3)
+    uri (1.1.1)
     useragent (0.16.11)
     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)
@@ -767,11 +759,12 @@ 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)
-    zeitwerk (2.7.3)
+    zeitwerk (2.7.5)
 
 PLATFORMS
   ruby
@@ -845,7 +838,6 @@ DEPENDENCIES
   paper_trail (~> 17.0)
   percy-capybara (~> 5.0.0)
   pg
-  platform-api
   pry
   puma
   query_diet
@@ -891,7 +883,7 @@ DEPENDENCIES
   xmlrpc
 
 RUBY VERSION
-   ruby 3.3.8p144
+   ruby 3.4.8p72
 
 BUNDLED WITH
    2.4.22

app/controllers/activities_controller.rb

@@ -82,7 +82,7 @@ class ActivitiesController < DataController
 
         repeat_times.times do |i|
           new_activity = @activity.dup
-          new_activity.due_date = @activity.due_date + (i + 1) * repeat_weeks.weeks
+          new_activity.due_date = @activity.due_date + ((i + 1) * repeat_weeks.weeks)
           new_activity.save
         end
       end

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

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

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
 

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,

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,

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"

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}"

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

db/migrate/20171022032108_all_the_predictions.rb

@@ -18,7 +18,6 @@ class AllThePredictions < ActiveRecord::Migration[4.2]
 
     remove_column :plantings, :days_before_maturity, :integer
 
-    create_table :median_functions do |t|
-    end
+    create_table :median_functions
   end
 end

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

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

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

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

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)

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)

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,

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'))

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",

spec/controllers/admin_controller_spec.rb

@@ -14,7 +14,7 @@ describe AdminController do
     end
 
     describe 'assigns @members' do
-      let!(:m) { FactoryBot.create(:newsletter_recipient_member) }
+      let!(:m) { create(:newsletter_recipient_member) }
 
       it { expect(assigns(:members)).to eq [m] }
     end

spec/controllers/api/v1/plantings_controller_spec.rb

@@ -5,14 +5,14 @@ require 'rails_helper'
 RSpec.describe Api::V1::PlantingsController, type: :controller do
   subject { JSON.parse response.body }
 
-  let!(:member) { FactoryBot.create(:member) }
+  let!(:member) { create(:member) }
 
   describe '#index' do
     let(:matching_planting) { subject['data'].select { |planting| planting['id'] == my_planting.id.to_s }.first }
 
     describe 'GET #index' do
       context 'basic planting' do
-        let!(:my_planting) { FactoryBot.create(:planting, owner: member, planted_at: '2000-01-01') }
+        let!(:my_planting) { create(:planting, owner: member, planted_at: '2000-01-01') }
         let(:expected_attributes) do
           {
             'crop-name'           => my_planting.crop.name,
@@ -46,7 +46,7 @@ RSpec.describe Api::V1::PlantingsController, type: :controller do
       end
 
       context 'with photo' do
-        let!(:my_planting) { FactoryBot.create(:planting, owner: member, planted_at: '2000-01-01') }
+        let!(:my_planting) { create(:planting, owner: member, planted_at: '2000-01-01') }
 
         let(:expected_attributes) do
           {
@@ -72,7 +72,7 @@ RSpec.describe Api::V1::PlantingsController, type: :controller do
             'thumbnail'           => photo.thumbnail_url
           }
         end
-        let(:photo) { FactoryBot.create(:photo, owner: my_planting.owner) }
+        let(:photo) { create(:photo, owner: my_planting.owner) }
 
         before do
           my_planting.photos << photo

spec/controllers/authentications_controller_spec.rb

@@ -4,10 +4,10 @@ require 'rails_helper'
 
 describe AuthenticationsController do
   before do
-    @member = FactoryBot.create(:member)
+    @member = create(:member)
     sign_in @member
     controller.stub(:current_member) { @member }
-    @auth = FactoryBot.create(:authentication, member: @member)
+    @auth = create(:authentication, member: @member)
     request.env['omniauth.auth'] = {
       'provider'    => 'foo',
       'uid'         => 'bar',

spec/controllers/charts/crops_controller_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe Charts::CropsController do
   describe 'GET charts' do
-    let(:crop) { FactoryBot.create(:crop) }
+    let(:crop) { create(:crop) }
 
     describe 'sunniness' do
       before { get :sunniness, params: { crop_slug: crop.to_param } }

spec/controllers/charts/gardens_controller_spec.rb

@@ -5,7 +5,7 @@ require 'rails_helper'
 describe Charts::GardensController do
   include Devise::Test::ControllerHelpers
 
-  let(:garden) { FactoryBot.create(:garden) }
+  let(:garden) { create(:garden) }
 
   context "when not signed in" do
     describe 'GET timeline' do
@@ -18,7 +18,7 @@ describe Charts::GardensController do
   context "when signed in" do
     before { sign_in member }
 
-    let!(:member) { FactoryBot.create(:member) }
+    let!(:member) { create(:member) }
 
     describe 'GET timeline' do
       before { get :timeline, params: { garden_slug: garden.to_param } }

spec/controllers/comments_controller_spec.rb

@@ -5,7 +5,7 @@ require 'rails_helper'
 describe CommentsController do
   subject { response }
 
-  let(:member) { FactoryBot.create(:member) }
+  let(:member) { create(:member) }
 
   before do
     sign_in member
@@ -13,13 +13,13 @@ describe CommentsController do
   end
 
   def valid_attributes
-    @post = FactoryBot.create(:post)
+    @post = create(:post)
     { post_id: @post.id, body: "some text" }
   end
 
   describe "GET RSS feed" do
-    let!(:first_comment) { FactoryBot.create(:comment, created_at: 10.days.ago) }
-    let!(:last_comment) { FactoryBot.create(:comment, created_at: 4.minutes.ago) }
+    let!(:first_comment) { create(:comment, created_at: 10.days.ago) }
+    let!(:last_comment) { create(:comment, created_at: 4.minutes.ago) }
 
     describe "returns an RSS feed" do
       before { get :index, format: "rss" }
@@ -32,7 +32,7 @@ describe CommentsController do
   end
 
   describe "GET new" do
-    let(:post) { FactoryBot.create(:post) }
+    let(:post) { create(:post) }
 
     describe "with valid params" do
       before do
@@ -41,7 +41,7 @@ describe CommentsController do
         }
       end
 
-      let(:old_comment) { FactoryBot.create(:comment, commentable: post) }
+      let(:old_comment) { create(:comment, commentable: post) }
 
       it "picks up post from params" do
         expect(assigns(:commentable)).to eq(post)
@@ -59,13 +59,13 @@ describe CommentsController do
   end
 
   describe "GET edit" do
-    let(:post) { FactoryBot.create(:post) }
+    let(:post) { create(:post) }
 
     before { get :edit, params: { id: comment.to_param } }
 
     describe "my comment" do
-      let!(:comment)     { FactoryBot.create(:comment, author: member, commentable: post) }
-      let!(:old_comment) { FactoryBot.create(:comment, commentable: post, created_at: Time.zone.yesterday) }
+      let!(:comment)     { create(:comment, author: member, commentable: post) }
+      let!(:old_comment) { create(:comment, commentable: post, created_at: Time.zone.yesterday) }
 
       it "assigns previous comments as @comments" do
         expect(assigns(:comments)).to eq([comment, old_comment])
@@ -73,7 +73,7 @@ describe CommentsController do
     end
 
     describe "not my comment" do
-      let(:comment) { FactoryBot.create(:comment, commentable: post) }
+      let(:comment) { create(:comment, commentable: post) }
 
       it { expect(response).not_to be_successful }
     end
@@ -83,7 +83,7 @@ describe CommentsController do
     before { put :update, params: { id: comment.to_param, comment: valid_attributes } }
 
     describe "my comment" do
-      let(:comment) { FactoryBot.create(:comment, author: member) }
+      let(:comment) { create(:comment, author: member) }
 
       it "redirects to the comment's post" do
         expect(response).to redirect_to(comment.commentable)
@@ -91,16 +91,16 @@ describe CommentsController do
     end
 
     describe "not my comment" do
-      let(:comment) { FactoryBot.create(:comment) }
+      let(:comment) { create(:comment) }
 
       it { expect(response).not_to be_successful }
     end
 
     describe "attempting to change post_id" do
-      let(:post)             { FactoryBot.create(:post, subject: 'our post')           }
-      let(:other_post)       { FactoryBot.create(:post, subject: 'the other post')     }
+      let(:post)             { create(:post, subject: 'our post')           }
+      let(:other_post)       { create(:post, subject: 'the other post')     }
       let(:valid_attributes) { { commentable_type: "Post", commentable_id: other_post.id, body: "kōrero" } }
-      let(:comment)          { FactoryBot.create(:comment, author: member, commentable: post) }
+      let(:comment)          { create(:comment, author: member, commentable: post) }
 
       it "does not change post_id" do
         comment.reload
@@ -113,7 +113,7 @@ describe CommentsController do
     before { delete :destroy, params: { id: comment.to_param } }
 
     describe "my comment" do
-      let(:comment) { FactoryBot.create(:comment, author: member) }
+      let(:comment) { create(:comment, author: member) }
 
       it "redirects to the post the comment was on" do
         expect(response).to redirect_to(comment.commentable)
@@ -121,7 +121,7 @@ describe CommentsController do
     end
 
     describe "not my comment" do
-      let(:comment) { FactoryBot.create(:comment) }
+      let(:comment) { create(:comment) }
 
       it { expect(response).not_to be_successful }
     end

spec/controllers/crops_controller_spec.rb

@@ -42,8 +42,8 @@ describe CropsController do
 
   describe "GET crop search" do
     describe 'fetches the crop search page' do
-      let!(:tomato) { FactoryBot.create(:tomato) }
-      let!(:maize)  { FactoryBot.create(:maize) }
+      let!(:tomato) { create(:tomato) }
+      let!(:maize)  { create(:maize) }
 
       before { Crop.reindex }
 
@@ -140,7 +140,7 @@ describe CropsController do
   describe 'DELETE destroy' do
     subject { delete :destroy, params: { slug: crop.to_param } }
 
-    let!(:crop) { FactoryBot.create(:crop) }
+    let!(:crop) { create(:crop) }
 
     context 'not logged in' do
       it { expect { subject }.not_to change(Crop, :count) }

spec/controllers/garden_types_controller_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe GardenTypesController, type: :controller do
   include Devise::Test::ControllerHelpers
 
   let(:valid_params) { { name: 'My second GardenType' } }
-  let(:garden_type)  { FactoryBot.create(:garden_type) }
+  let(:garden_type)  { create(:garden_type) }
 
   context "when not signed in" do
     describe 'GET new' do
@@ -54,7 +54,7 @@ RSpec.describe GardenTypesController, type: :controller do
   context "when signed in as a member" do
     before { sign_in member }
 
-    let!(:member) { FactoryBot.create(:member) }
+    let!(:member) { create(:member) }
 
     describe "for any garden_type" do
       let(:any_garden_type) { double('garden_type') }

spec/controllers/gardens_controller_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe GardensController, type: :controller do
 
   let(:valid_params) { { name: 'My second Garden' } }
 
-  let(:garden) { FactoryBot.create(:garden) }
+  let(:garden) { create(:garden) }
 
   context "when not signed in" do
     describe 'GET new' do
@@ -55,7 +55,7 @@ RSpec.describe GardensController, type: :controller do
   context "when signed in" do
     before { sign_in member }
 
-    let!(:member) { FactoryBot.create(:member) }
+    let!(:member) { create(:member) }
 
     describe "for another member's garden" do
       let(:not_my_garden) { double('garden') }

spec/controllers/harvests_controller_spec.rb

@@ -8,19 +8,19 @@ describe HarvestsController, :search do
   def valid_attributes
     {
       owner_id:      subject.current_member.id,
-      crop_id:       FactoryBot.create(:crop).id,
-      plant_part_id: FactoryBot.create(:plant_part).id,
+      crop_id:       create(:crop).id,
+      plant_part_id: create(:plant_part).id,
       harvested_at:  '2017-01-01'
     }
   end
 
   describe "GET index" do
-    let!(:member1)  { FactoryBot.create(:member)                                            }
-    let(:member2)   { FactoryBot.create(:member)                                            }
-    let(:tomato)    { FactoryBot.create(:tomato)                                            }
-    let(:maize)     { FactoryBot.create(:maize)                                             }
-    let!(:harvest1) { FactoryBot.create(:harvest, owner_id: member1.id, crop_id: tomato.id) }
-    let!(:harvest2) { FactoryBot.create(:harvest, owner_id: member2.id, crop_id: maize.id)  }
+    let!(:member1)  { create(:member)                                            }
+    let(:member2)   { create(:member)                                            }
+    let(:tomato)    { create(:tomato)                                            }
+    let(:maize)     { create(:maize)                                             }
+    let!(:harvest1) { create(:harvest, owner_id: member1.id, crop_id: tomato.id) }
+    let!(:harvest2) { create(:harvest, owner_id: member2.id, crop_id: maize.id)  }
 
     before { Harvest.reindex }
 
@@ -109,7 +109,7 @@ describe HarvestsController, :search do
       end
 
       describe "links to planting" do
-        let(:planting) { FactoryBot.create(:planting, owner_id: member.id, garden: member.gardens.first) }
+        let(:planting) { create(:planting, owner_id: member.id, garden: member.gardens.first) }
 
         before { post :create, params: { harvest: valid_attributes.merge(planting_id: planting.id) } }
 
@@ -134,8 +134,8 @@ describe HarvestsController, :search do
     end
 
     describe "not my planting" do
-      let(:not_my_planting) { FactoryBot.create(:planting) }
-      let(:harvest)         { FactoryBot.create(:harvest)  }
+      let(:not_my_planting) { create(:planting) }
+      let(:harvest)         { create(:harvest)  }
 
       describe "does not save planting_id" do
         before do
@@ -153,7 +153,7 @@ describe HarvestsController, :search do
       let(:harvest) { Harvest.create! valid_attributes }
 
       it "updates the requested harvest" do
-        new_crop = FactoryBot.create(:crop)
+        new_crop = create(:crop)
         expect do
           put :update, params: { slug: harvest.to_param, harvest: { crop_id: new_crop.id } }
           harvest.reload
@@ -190,8 +190,8 @@ describe HarvestsController, :search do
     end
 
     describe "not my planting" do
-      let(:not_my_planting) { FactoryBot.create(:planting) }
-      let(:harvest)         { FactoryBot.create(:harvest)  }
+      let(:not_my_planting) { create(:planting) }
+      let(:harvest)         { create(:harvest)  }
 
       describe "does not save planting_id" do
         before do

spec/controllers/home_controller_spec.rb

@@ -1,8 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe HomeController do
-  describe "GET index" do
-  end
-end

spec/controllers/likes_controller_spec.rb

@@ -3,9 +3,9 @@
 require 'rails_helper'
 
 describe LikesController do
-  let(:like)     { FactoryBot.create(:like, member:) }
-  let(:member)   { FactoryBot.create(:member)               }
-  let(:blogpost) { FactoryBot.create(:post)                 }
+  let(:like)     { create(:like, member:) }
+  let(:member)   { create(:member)               }
+  let(:blogpost) { create(:post)                 }
 
   before { sign_in member }
 
@@ -21,9 +21,6 @@ describe LikesController do
     describe "Liking someone else's post" do
       it { expect(response.code).to eq('201') }
     end
-
-    describe "Liking your own post" do
-    end
   end
 
   describe "DELETE destroy" do
@@ -37,7 +34,7 @@ describe LikesController do
     end
 
     describe "Deleting someone else's like" do
-      let(:like) { FactoryBot.create(:like) }
+      let(:like) { create(:like) }
 
       it { expect(response.code).to eq('403') }
       it { JSON.parse(response.body)["error"] == "Unable to like" }

spec/controllers/member_controller_spec.rb

@@ -4,8 +4,8 @@ require 'rails_helper'
 
 describe MembersController do
   before do
-    @member = FactoryBot.create(:member)
-    @flickr_auth = FactoryBot.create(:flickr_authentication, member: @member)
+    @member = create(:member)
+    @flickr_auth = create(:flickr_authentication, member: @member)
   end
 
   describe "GET index" do
@@ -39,7 +39,7 @@ describe MembersController do
     end
 
     it "doesn't show unconfirmed members" do
-      @member2 = FactoryBot.create(:unconfirmed_member)
+      @member2 = create(:unconfirmed_member)
       get :show, params: { slug: @member2.id }
       expect(response).to have_http_status(:not_found)
     end

spec/controllers/photo_associations_controller_spec.rb

@@ -17,8 +17,8 @@ describe PhotoAssociationsController do
     before { photo.harvests << harvest }
 
     describe "my harvest my photo" do
-      let(:harvest) { FactoryBot.create(:harvest, owner: member) }
-      let(:photo)   { FactoryBot.create(:photo, owner: member)   }
+      let(:harvest) { create(:harvest, owner: member) }
+      let(:photo)   { create(:photo, owner: member)   }
 
       it "removes link" do
         expect { delete :destroy, params: valid_params }.to change { photo.harvests.count }.by(-1)
@@ -26,8 +26,8 @@ describe PhotoAssociationsController do
     end
 
     describe "another member's harvest from another member's photo" do
-      let(:harvest) { FactoryBot.create(:harvest, owner: photo.owner) }
-      let(:photo) { FactoryBot.create(:photo) }
+      let(:harvest) { create(:harvest, owner: photo.owner) }
+      let(:photo) { create(:photo) }
 
       it do
         expect do

spec/controllers/photos_controller_spec.rb

@@ -7,7 +7,7 @@ describe PhotosController, :search do
 
   describe 'GET index' do
     describe 'all photos' do
-      let!(:photo) { FactoryBot.create(:photo, :reindex) }
+      let!(:photo) { create(:photo, :reindex) }
 
       before do
         Photo.reindex
@@ -21,10 +21,10 @@ describe PhotosController, :search do
     end
 
     describe '#index crop photos' do
-      let!(:photo)      { FactoryBot.create(:photo, :reindex, owner: member, title: 'no assocations photo') }
-      let!(:crop_photo) { FactoryBot.create(:photo, :reindex, owner: member, title: 'photos of planting')   }
-      let!(:planting)   { FactoryBot.create(:planting, :reindex, crop:, owner: member) }
-      let!(:crop)       { FactoryBot.create(:crop, :reindex) }
+      let!(:photo)      { create(:photo, :reindex, owner: member, title: 'no assocations photo') }
+      let!(:crop_photo) { create(:photo, :reindex, owner: member, title: 'photos of planting')   }
+      let!(:planting)   { create(:planting, :reindex, crop:, owner: member) }
+      let!(:crop)       { create(:crop, :reindex) }
 
       before do
         planting.photos << crop_photo
@@ -49,12 +49,12 @@ describe PhotosController, :search do
   end
 
   describe "GET new" do
-    let(:tomato)   { FactoryBot.create(:tomato)                                }
-    let(:planting) { FactoryBot.create(:planting, crop: tomato, owner: member) }
-    let(:garden)   { FactoryBot.create(:garden, owner: member)                 }
-    let(:harvest)  { FactoryBot.create(:harvest, owner: member)                }
-    let(:member)   { FactoryBot.create(:member)                                }
-    let!(:auth)    { FactoryBot.create(:flickr_authentication, member:) }
+    let(:tomato)   { create(:tomato)                                }
+    let(:planting) { create(:planting, crop: tomato, owner: member) }
+    let(:garden)   { create(:garden, owner: member)                 }
+    let(:harvest)  { create(:harvest, owner: member)                }
+    let(:member)   { create(:member)                                }
+    let!(:auth)    { create(:flickr_authentication, member:) }
 
     before do
       sign_in member
@@ -97,11 +97,11 @@ describe PhotosController, :search do
                                                            link_url:      "http://example.com")
     end
 
-    let(:member)   { FactoryBot.create(:member)                                  }
-    let(:garden)   { FactoryBot.create(:garden, owner: member)                   }
-    let(:planting) { FactoryBot.create(:planting, garden:, owner: member) }
-    let(:harvest)  { FactoryBot.create(:harvest, owner: member)                  }
-    let(:photo)    { FactoryBot.create(:photo, owner: member)                    }
+    let(:member)   { create(:member)                                  }
+    let(:garden)   { create(:garden, owner: member)                   }
+    let(:planting) { create(:planting, garden:, owner: member) }
+    let(:harvest)  { create(:harvest, owner: member)                  }
+    let(:photo)    { create(:photo, owner: member)                    }
 
     describe "with valid params" do
       before { controller.stub(:current_member) { member } }
@@ -153,7 +153,7 @@ describe PhotosController, :search do
       end
 
       it "doesn't attach photo to a comment" do
-        comment = FactoryBot.create(:comment)
+        comment = create(:comment)
         expect do
           post :create, params: {
             photo: { source_id: photo.source_id, source: 'flickr' }, type: "comment", id: comment.id
@@ -163,7 +163,7 @@ describe PhotosController, :search do
     end
 
     describe "for the second time" do
-      let(:planting) { FactoryBot.create(:planting, owner: member) }
+      let(:planting) { create(:planting, owner: member) }
       let(:valid_params) { { photo: { source_id: 1 }, id: planting.id, type: 'planting' } }
 
       it "does not add a photo twice" do
@@ -176,8 +176,8 @@ describe PhotosController, :search do
       before { controller.stub(:current_member) { member } }
 
       describe "creates the planting/photo link" do
-        let(:planting) { FactoryBot.create(:planting, garden:, owner: member) }
-        let(:photo) { FactoryBot.create(:photo, owner: member) }
+        let(:planting) { create(:planting, garden:, owner: member) }
+        let(:photo) { create(:photo, owner: member) }
 
         before { post :create, params: { photo: { source_id: photo.source_id, source: 'flickr' }, type: "planting", id: planting.id } }
 
@@ -196,11 +196,11 @@ describe PhotosController, :search do
     end
 
     describe "with mismatched owners" do
-      let(:photo) { FactoryBot.create(:photo) }
+      let(:photo) { create(:photo) }
 
       it "does not create the planting/photo link" do
         # members will be auto-created, and different
-        another_planting = FactoryBot.create(:planting)
+        another_planting = create(:planting)
         expect do
           post :create, params: {
             photo: { source_id: photo.source_id, source: 'flickr' },
@@ -212,7 +212,7 @@ describe PhotosController, :search do
 
       it "does not create the harvest/photo link" do
         # members will be auto-created, and different
-        another_harvest = FactoryBot.create(:harvest)
+        another_harvest = create(:harvest)
         expect do
           post :create, params: {
             photo: { source_id: photo.source_id, source: 'flickr' }, type: "harvest", id: another_harvest.id

spec/controllers/places_controller_spec.rb

@@ -9,8 +9,8 @@ describe PlacesController do
 
   describe "GET show" do
     before do
-      @member_london = FactoryBot.create(:london_member)
-      @member_south_pole = FactoryBot.create(:south_pole_member)
+      @member_london = create(:london_member)
+      @member_south_pole = create(:south_pole_member)
     end
 
     it "assigns place name" do

spec/controllers/plant_parts_controller_spec.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe PlantPartsController do
-end

spec/controllers/plantings_controller_spec.rb

@@ -7,18 +7,18 @@ describe PlantingsController, :search do
 
   def valid_attributes
     {
-      garden_id: FactoryBot.create(:garden, owner: subject.current_member).id,
-      crop_id:   FactoryBot.create(:crop).id
+      garden_id: create(:garden, owner: subject.current_member).id,
+      crop_id:   create(:crop).id
     }
   end
 
   describe "GET index", :search do
-    let!(:member1)   { FactoryBot.create(:member)                                                       }
-    let!(:member2)   { FactoryBot.create(:member)                                                       }
-    let!(:tomato)    { FactoryBot.create(:tomato)                                                       }
-    let!(:maize)     { FactoryBot.create(:maize)                                                        }
-    let!(:planting1) { FactoryBot.create(:planting, crop: tomato, owner: member1, created_at: 1.day.ago) }
-    let!(:planting2) { FactoryBot.create(:planting, crop: maize, owner: member2, created_at: 5.days.ago) }
+    let!(:member1)   { create(:member)                                                       }
+    let!(:member2)   { create(:member)                                                       }
+    let!(:tomato)    { create(:tomato)                                                       }
+    let!(:maize)     { create(:maize)                                                        }
+    let!(:planting1) { create(:planting, crop: tomato, owner: member1, created_at: 1.day.ago) }
+    let!(:planting2) { create(:planting, crop: maize, owner: member2, created_at: 5.days.ago) }
 
     before do
       Planting.reindex
@@ -50,7 +50,7 @@ describe PlantingsController, :search do
 
   describe "GET new" do
     describe "picks up crop from params" do
-      let(:crop) { FactoryBot.create(:crop) }
+      let(:crop) { create(:crop) }
 
       before { get :new, params: { crop_id: crop.id } }
 
@@ -64,7 +64,7 @@ describe PlantingsController, :search do
     end
 
     describe "picks up member's garden from params" do
-      let(:garden) { FactoryBot.create(:garden, owner: member) }
+      let(:garden) { create(:garden, owner: member) }
 
       before { get :new, params: { garden_id: garden.id } }
 
@@ -72,8 +72,8 @@ describe PlantingsController, :search do
     end
 
     describe "Doesn't display another member's garden on planting form" do
-      let(:another_member) { FactoryBot.create(:member) } # over-riding member from login_member()
-      let(:garden) { FactoryBot.create(:garden, owner: another_member) }
+      let(:another_member) { create(:member) } # over-riding member from login_member()
+      let(:garden) { create(:garden, owner: another_member) }
 
       before { get :new, params: { garden_id: garden.id } }
 
@@ -81,8 +81,8 @@ describe PlantingsController, :search do
     end
 
     describe "Doesn't display un-approved crops on planting form" do
-      let(:crop) { FactoryBot.create(:crop, approval_status: 'pending') }
-      let!(:garden) { FactoryBot.create(:garden, owner: member) }
+      let(:crop) { create(:crop, approval_status: 'pending') }
+      let!(:garden) { create(:garden, owner: member) }
 
       before { get :new, params: { crop_id: crop.id } }
 
@@ -90,8 +90,8 @@ describe PlantingsController, :search do
     end
 
     describe "Doesn't display rejected crops on planting form" do
-      let(:crop) { FactoryBot.create(:crop, approval_status: 'rejected', reason_for_rejection: 'nope') }
-      let!(:garden) { FactoryBot.create(:garden, owner: member) }
+      let(:crop) { create(:crop, approval_status: 'rejected', reason_for_rejection: 'nope') }
+      let!(:garden) { create(:garden, owner: member) }
 
       before { get :new, params: { crop_id: crop.id } }
 
@@ -111,7 +111,7 @@ describe PlantingsController, :search do
     end
 
     context 'with parent seed' do
-      let(:seed) { FactoryBot.create(:seed, owner: member) }
+      let(:seed) { create(:seed, owner: member) }
 
       before { get :new, params: { seed_id: seed.to_param } }
 
@@ -128,8 +128,8 @@ describe PlantingsController, :search do
   end
 
   describe 'GET :edit' do
-    let(:my_planting) { FactoryBot.create(:planting, owner: member) }
-    let(:not_my_planting) { FactoryBot.create(:planting) }
+    let(:my_planting) { create(:planting, owner: member) }
+    let(:not_my_planting) { create(:planting) }
 
     context 'my planting' do
       before { get :edit, params: { slug: my_planting } }

spec/controllers/posts_controller_spec.rb

@@ -6,14 +6,14 @@ describe PostsController do
   login_member
 
   def valid_attributes
-    member = FactoryBot.create(:member)
+    member = create(:member)
     { author_id: member.id, subject: "blah", body: "blah blah" }
   end
 
   describe '#index' do
     before do
-      FactoryBot.create_list(:post, 100)
-      FactoryBot.create_list(:post, 5, author: member)
+      create_list(:post, 100)
+      create_list(:post, 5, author: member)
     end
 
     describe "everyone's posts" do

spec/controllers/registrations_controller_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe RegistrationsController do
   before do
-    @member = FactoryBot.create(:member)
+    @member = create(:member)
     sign_in @member
     controller.stub(:current_user) { @member }
     controller.stub(:devise_mapping).and_return(Devise.mappings[:member])
@@ -17,7 +17,7 @@ describe RegistrationsController do
     end
 
     it "picks up the flickr auth" do
-      @auth = FactoryBot.create(:flickr_authentication, member: @member)
+      @auth = create(:flickr_authentication, member: @member)
       get :edit
       assigns(:flickr_auth).should eq @auth
     end

spec/controllers/scientific_names_controller_spec.rb

@@ -5,7 +5,7 @@ require 'rails_helper'
 describe ScientificNamesController do
   login_member(:crop_wrangling_member)
 
-  let!(:crop) { FactoryBot.create(:tomato) }
+  let!(:crop) { create(:tomato) }
 
   def valid_attributes
     { name: 'Solanum lycopersicum', crop_id: crop.id }

spec/controllers/seeds_controller_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe SeedsController, :search do
-  let(:owner) { FactoryBot.create(:member) }
+  let(:owner) { create(:member) }
 
   describe "GET index" do
     describe "picks up owner from params" do
@@ -26,7 +26,7 @@ describe SeedsController, :search do
     end
 
     context 'with parent planting' do
-      let!(:planting) { FactoryBot.create(:planting, owner:) }
+      let!(:planting) { create(:planting, owner:) }
 
       before do
         Seed.reindex

spec/factories/crop_companions.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-FactoryBot.define do
-  factory :crop_companion do
-  end
-end

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

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

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

spec/features/conversations/index_spec.rb

@@ -73,13 +73,13 @@ describe "Conversations", :js do
       click_link recipient.login_name
       click_link 'Inbox'
 
-      expect(page).to have_selector('.sent')
+      expect(page).to have_css('.sent')
       find('.sent').click
 
       all('input[type=checkbox]').each(&:click)
       click_button 'Delete'
 
-      expect(page).to have_selector('.sent')
+      expect(page).to have_css('.sent')
       find('.sent').click
       expect(page).to have_no_content 'this is a message'
       expect(page).to have_no_content 'this is another message'

spec/features/crops/browse_crops_spec.rb

@@ -3,10 +3,10 @@
 require 'rails_helper'
 
 describe "browse crops", :search do
-  let!(:tomato)         { FactoryBot.create(:tomato, :reindex)        }
-  let!(:maize)          { FactoryBot.create(:maize, :reindex)         }
-  let!(:pending_crop)   { FactoryBot.create(:crop_request, :reindex)  }
-  let!(:rejected_crop)  { FactoryBot.create(:rejected_crop, :reindex) }
+  let!(:tomato)         { create(:tomato, :reindex)        }
+  let!(:maize)          { create(:maize, :reindex)         }
+  let!(:pending_crop)   { create(:crop_request, :reindex)  }
+  let!(:rejected_crop)  { create(:rejected_crop, :reindex) }
 
   shared_examples 'shows crops' do
     before do

spec/features/crops/creating_a_crop_spec.rb

@@ -33,7 +33,6 @@ describe "Crop", :js do
 
   shared_examples 'request crop' do
     describe "requesting a crop with multiple scientific and alternate name" do
-      include_examples 'fill in form'
       before do
         within "form#new_crop" do
           fill_in "request_notes", with: "This is the Philippine national flower."
@@ -41,6 +40,8 @@ describe "Crop", :js do
         end
       end
 
+      include_examples 'fill in form'
+
       it { expect(page).to have_content 'crop was successfully created.' }
       it { expect(page).to have_content "This crop is currently pending approval." }
       it { expect(page).to have_content "Jasminum sambac 2" }
@@ -50,11 +51,12 @@ describe "Crop", :js do
 
   shared_examples 'create crop' do
     describe "creating a crop with multiple scientific and alternate name" do
-      include_examples 'fill in form'
       before do
         click_button "Save"
       end
 
+      include_examples 'fill in form'
+
       it { expect(page).to have_content 'crop was successfully created.' }
       it { expect(page).to have_content "Jasminum sambac 2" }
       it { expect(page).to have_content "Matsurika" }

spec/features/crops/crop_detail_page_spec.rb

@@ -14,7 +14,7 @@ describe "crop detail page", :js do
   end
 
   before do
-    FactoryBot.create(:plant_part, name: 'leaf')
+    create(:plant_part, name: 'leaf')
   end
 
   let(:crop) { create(:crop) }
@@ -112,14 +112,14 @@ describe "crop detail page", :js do
     describe 'with harvest history data' do
       before do
         # 50 days to harvest
-        FactoryBot.create(:harvest, harvested_at: 150.days.ago, crop:,
-                                    planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop:))
+        create(:harvest, harvested_at: 150.days.ago, crop:,
+                                    planting: create(:planting, planted_at: 200.days.ago, crop:))
         # 20 days to harvest
-        FactoryBot.create(:harvest, harvested_at: 180.days.ago, crop:,
-                                    planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop:))
+        create(:harvest, harvested_at: 180.days.ago, crop:,
+                                    planting: create(:planting, planted_at: 200.days.ago, crop:))
         # 10 days to harvest
-        FactoryBot.create(:harvest, harvested_at: 190.days.ago, crop:,
-                                    planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop:))
+        create(:harvest, harvested_at: 190.days.ago, crop:,
+                                    planting: create(:planting, planted_at: 200.days.ago, crop:))
         crop.update_medians
       end
 
@@ -131,13 +131,13 @@ describe "crop detail page", :js do
 
   context 'predictions' do
     let!(:planting) do
-      FactoryBot.create(:planting, crop:,
-                                   planted_at:  100.days.ago,
-                                   finished_at: 1.day.ago)
+      create(:planting, crop:,
+                        planted_at:  100.days.ago,
+                        finished_at: 1.day.ago)
     end
 
     context 'crop is an Annual' do
-      let(:crop) { FactoryBot.create(:annual_crop) }
+      let(:crop) { create(:annual_crop) }
 
       describe 'with harvests' do
         it_behaves_like "predicts harvest"
@@ -155,10 +155,7 @@ describe "crop detail page", :js do
     end
 
     context 'crop is Perennial' do
-      let(:crop) { FactoryBot.create(:perennial_crop) }
-
-      describe 'with no harvests' do
-      end
+      let(:crop) { create(:perennial_crop) }
 
       describe 'with harvests' do
         it_behaves_like "predicts harvest"
@@ -171,10 +168,7 @@ describe "crop detail page", :js do
     end
 
     context 'crop Perennial value is null' do
-      let(:crop) { FactoryBot.create(:crop, perennial: nil) }
-
-      describe 'with no harvests' do
-      end
+      let(:crop) { create(:crop, perennial: nil) }
 
       describe 'with harvests' do
         it_behaves_like "predicts harvest"
@@ -186,7 +180,7 @@ describe "crop detail page", :js do
     before { visit crop_path(crop) }
 
     context 'crop is an Annual' do
-      let(:crop) { FactoryBot.create(:annual_crop) }
+      let(:crop) { create(:annual_crop) }
 
       it { expect(page).to have_text 'Annual' }
       it { expect(page).to have_text 'living and reproducing in a single year or less' }
@@ -194,7 +188,7 @@ describe "crop detail page", :js do
     end
 
     context 'crop is Perennial' do
-      let(:crop) { FactoryBot.create(:perennial_crop) }
+      let(:crop) { create(:perennial_crop) }
 
       it { expect(find('.index-cards.facts')).to have_text 'Perennial' }
       it { expect(page).to have_text 'living more than two years' }
@@ -202,7 +196,7 @@ describe "crop detail page", :js do
     end
 
     context 'crop Perennial value is null' do
-      let(:crop) { FactoryBot.create(:crop, perennial: nil) }
+      let(:crop) { create(:crop, perennial: nil) }
 
       it { expect(find('.index-cards.facts')).to have_no_text 'Perennial' }
       it { expect(page).to have_no_text 'Annual' }

spec/features/crops/crop_photos_spec.rb

@@ -5,22 +5,22 @@ require 'rails_helper'
 describe "crop detail page", :js, :search do
   subject { page }
 
-  let!(:owner_member) { FactoryBot.create(:member) }
+  let!(:owner_member) { create(:member) }
 
-  let!(:crop) { FactoryBot.create(:crop, :reindex) }
+  let!(:crop) { create(:crop, :reindex) }
 
-  let(:plant_part) { FactoryBot.create(:plant_part, name: 'fruit') }
+  let(:plant_part) { create(:plant_part, name: 'fruit') }
 
-  let!(:harvest)  { FactoryBot.create(:harvest, crop:, owner: owner_member, plant_part:) }
-  let!(:planting) { FactoryBot.create(:planting, crop:, owner: owner_member) }
-  let!(:seed)     { FactoryBot.create(:seed, crop:, owner: owner_member)     }
+  let!(:harvest)  { create(:harvest, crop:, owner: owner_member, plant_part:) }
+  let!(:planting) { create(:planting, crop:, owner: owner_member) }
+  let!(:seed)     { create(:seed, crop:, owner: owner_member)     }
 
-  let!(:photo1) { FactoryBot.create(:photo, owner: owner_member) }
-  let!(:photo2) { FactoryBot.create(:photo, owner: owner_member) }
-  let!(:photo3) { FactoryBot.create(:photo, owner: owner_member) }
-  let!(:photo4) { FactoryBot.create(:photo, owner: owner_member) }
-  let!(:photo5) { FactoryBot.create(:photo, owner: owner_member) }
-  let!(:photo6) { FactoryBot.create(:photo, owner: owner_member) }
+  let!(:photo1) { create(:photo, owner: owner_member) }
+  let!(:photo2) { create(:photo, owner: owner_member) }
+  let!(:photo3) { create(:photo, owner: owner_member) }
+  let!(:photo4) { create(:photo, owner: owner_member) }
+  let!(:photo5) { create(:photo, owner: owner_member) }
+  let!(:photo6) { create(:photo, owner: owner_member) }
 
   before do
     planting.photos << photo1

spec/features/crops/delete_crop_spec.rb

@@ -4,8 +4,8 @@ require 'rails_helper'
 
 describe "Delete crop spec" do
   shared_examples 'delete crop' do
-    let!(:pending_crop)  { FactoryBot.create(:crop_request)          }
-    let!(:approved_crop) { FactoryBot.create(:crop)                  }
+    let!(:pending_crop)  { create(:crop_request)          }
+    let!(:approved_crop) { create(:crop)                  }
     it "deletes approved crop" do
       visit crop_path(approved_crop)
       click_link 'Actions'

spec/features/crops/show_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe "browse crops" do
-  let(:tomato) { FactoryBot.create(:tomato) }
+  let(:tomato) { create(:tomato) }
 
   it "Show crop info" do
     visit crop_path(tomato)
@@ -11,9 +11,9 @@ describe "browse crops" do
   end
 
   describe "shows varieties" do
-    let!(:cherry) { FactoryBot.create(:crop, name: 'cherry tomato', parent: tomato) }
-    let!(:heirloom) { FactoryBot.create(:crop, name: 'heirloom tomato', parent: tomato) }
-    let!(:striped) { FactoryBot.create(:crop, name: 'striped tomato', parent: heirloom) }
+    let!(:cherry) { create(:crop, name: 'cherry tomato', parent: tomato) }
+    let!(:heirloom) { create(:crop, name: 'heirloom tomato', parent: tomato) }
+    let!(:striped) { create(:crop, name: 'striped tomato', parent: heirloom) }
 
     before { visit crop_path(tomato) }
 
@@ -23,10 +23,10 @@ describe "browse crops" do
   end
 
   context "when the most recently created harvest is not the most recently harvested" do
-    before { FactoryBot.create_list(:harvest, 20, crop: tomato, harvested_at: 1.year.ago, created_at: 1.minute.ago) }
+    before { create_list(:harvest, 20, crop: tomato, harvested_at: 1.year.ago, created_at: 1.minute.ago) }
 
     let!(:most_recent_harvest) do
-      FactoryBot.create(:harvest, crop: tomato, harvested_at: 60.minutes.ago, created_at: 10.minutes.ago)
+      create(:harvest, crop: tomato, harvested_at: 60.minutes.ago, created_at: 10.minutes.ago)
     end
 
     it "Shows most recently harvested harvest" do
@@ -36,10 +36,10 @@ describe "browse crops" do
   end
 
   context "when the most recently created planting is not the most recently planted" do
-    before { FactoryBot.create_list(:planting, 20, crop: tomato, planted_at: 1.year.ago, created_at: 1.minute.ago) }
+    before { create_list(:planting, 20, crop: tomato, planted_at: 1.year.ago, created_at: 1.minute.ago) }
 
     let!(:most_recent_planting) do
-      FactoryBot.create(:planting, crop: tomato, planted_at: 60.minutes.ago, created_at: 10.minutes.ago)
+      create(:planting, crop: tomato, planted_at: 60.minutes.ago, created_at: 10.minutes.ago)
     end
 
     it "Shows most recently planted planting" do

spec/features/footer_spec.rb

@@ -10,7 +10,7 @@ describe "footer" do
   end
 
   it 'has the Open Service link and graphic' do
-    expect(page).to have_selector 'a[href="https://opendefinition.org/ossd/"]'
+    expect(page).to have_css 'a[href="https://opendefinition.org/ossd/"]'
   end
 
   # NB: not testing specific content in the footer since I'm going to put them

spec/features/gardens/actions_spec.rb

@@ -9,7 +9,7 @@ describe "Gardens" do
 
     include_context 'signed in member'
     let(:garden) { member.gardens.first }
-    let(:other_member_garden) { FactoryBot.create(:garden) }
+    let(:other_member_garden) { create(:garden) }
 
     describe '#index' do
       shared_examples "has buttons bar at top" do
@@ -47,7 +47,7 @@ describe "Gardens" do
       end
 
       context "other member's garden" do
-        before { visit gardens_path(member_slug: FactoryBot.create(:member).slug) }
+        before { visit gardens_path(member_slug: create(:member).slug) }
 
         include_examples "has buttons bar at top"
         describe 'does not show actions on other member garden' do

spec/features/gardens/adding_gardens_spec.rb

@@ -11,10 +11,10 @@ describe "Gardens", :js do
     include_examples 'is accessible'
 
     it "displays required and optional fields properly" do
-      expect(page).to have_selector ".required", text: "Name"
-      expect(page).to have_selector 'textarea#garden_description'
-      expect(page).to have_selector 'input#garden_location'
-      expect(page).to have_selector 'input#garden_area'
+      expect(page).to have_css ".required", text: "Name"
+      expect(page).to have_css 'textarea#garden_description'
+      expect(page).to have_css 'input#garden_location'
+      expect(page).to have_css 'input#garden_area'
     end
 
     it "Create new garden" do

spec/features/gardens/index_spec.rb

@@ -6,11 +6,11 @@ require 'custom_matchers'
 describe "Gardens#index", :js do
   context "Logged in as member" do
     include_context 'signed in member'
-    let(:member) { FactoryBot.create(:member, login_name: 'shadow') }
+    let(:member) { create(:member, login_name: 'shadow') }
 
     context "with 10 gardens" do
       before do
-        FactoryBot.create_list(:garden, 10, owner: member)
+        create_list(:garden, 10, owner: member)
         visit member_gardens_path(member_slug: member.slug)
       end
 
@@ -30,8 +30,8 @@ describe "Gardens#index", :js do
     end
 
     context "with inactive gardens" do
-      let!(:active_garden) { FactoryBot.create(:garden, name: "My active garden", owner: member) }
-      let!(:inactive_garden) { FactoryBot.create(:inactive_garden, name: "retired garden", owner: member) }
+      let!(:active_garden) { create(:garden, name: "My active garden", owner: member) }
+      let!(:inactive_garden) { create(:inactive_garden, name: "retired garden", owner: member) }
 
       before { visit member_gardens_path(member_slug: member.slug) }
 
@@ -53,14 +53,14 @@ describe "Gardens#index", :js do
     end
 
     context 'with plantings' do
-      let(:maize) { FactoryBot.create(:maize) }
-      let(:tomato) { FactoryBot.create(:tomato) }
+      let(:maize) { create(:maize) }
+      let(:tomato) { create(:tomato) }
 
       let!(:planting) do
-        FactoryBot.create(:planting, owner: member, crop: maize, garden: member.gardens.first)
+        create(:planting, owner: member, crop: maize, garden: member.gardens.first)
       end
       let!(:finished_planting) do
-        FactoryBot.create(:finished_planting, owner: member, crop: tomato, garden: member.gardens.first)
+        create(:finished_planting, owner: member, crop: tomato, garden: member.gardens.first)
       end
 
       before do
@@ -79,19 +79,19 @@ describe "Gardens#index", :js do
 
   describe 'badges' do
     let(:garden) { member.gardens.first }
-    let(:member) { FactoryBot.create(:member, login_name: 'robbieburns') }
-    let(:crop)   { FactoryBot.create(:crop)                              }
+    let(:member) { create(:member, login_name: 'robbieburns') }
+    let(:crop)   { create(:crop)                              }
 
     before do
       # time to harvest = 50 day
       # time to finished = 90 days
-      FactoryBot.create(:harvest,
-                        harvested_at: 50.days.ago,
-                        crop:,
-                        planting:     FactoryBot.create(:planting,
-                                                        crop:,
-                                                        planted_at:  100.days.ago,
-                                                        finished_at: 10.days.ago))
+      create(:harvest,
+             harvested_at: 50.days.ago,
+             crop:,
+             planting:     create(:planting,
+                                  crop:,
+                                  planted_at:  100.days.ago,
+                                  finished_at: 10.days.ago))
       crop.plantings.each(&:update_harvest_days!)
       crop.update_lifespan_medians
       crop.update_harvest_medians
@@ -103,11 +103,11 @@ describe "Gardens#index", :js do
 
     describe 'harvest still growing' do
       let!(:planting) do
-        FactoryBot.create(:planting,
-                          crop:,
-                          owner:      member,
-                          garden:,
-                          planted_at: Time.zone.today)
+        create(:planting,
+               crop:,
+               owner:      member,
+               garden:,
+               planted_at: Time.zone.today)
       end
 
       it { expect(page).to have_link href: planting_path(planting) }
@@ -118,10 +118,10 @@ describe "Gardens#index", :js do
 
     describe 'harvesting now' do
       let!(:planting) do
-        FactoryBot.create(:planting,
-                          crop:,
-                          owner: member, garden:,
-                          planted_at: 51.days.ago)
+        create(:planting,
+               crop:,
+               owner: member, garden:,
+               planted_at: 51.days.ago)
       end
 
       it { expect(crop.median_days_to_first_harvest).to eq 50 }
@@ -133,9 +133,9 @@ describe "Gardens#index", :js do
 
     describe 'super late' do
       let!(:planting) do
-        FactoryBot.create(:planting,
-                          crop:, owner: member,
-                          garden:, planted_at: 260.days.ago)
+        create(:planting,
+               crop:, owner: member,
+               garden:, planted_at: 260.days.ago)
       end
 
       it { expect(page).to have_text 'super late' }

spec/features/harvests/harvesting_a_crop_spec.rb

@@ -14,10 +14,10 @@ describe "Harvesting a crop", :js, :search do
     it_behaves_like "crop suggest", "harvest", "crop"
 
     describe "displays required and optional fields properly" do
-      it { expect(page).to have_selector ".required", text: "What did you harvest?" }
-      it { expect(page).to have_selector 'input#harvest_quantity' }
-      it { expect(page).to have_selector 'input#harvest_weight_quantity' }
-      it { expect(page).to have_selector 'textarea#harvest_description' }
+      it { expect(page).to have_css ".required", text: "What did you harvest?" }
+      it { expect(page).to have_css 'input#harvest_quantity' }
+      it { expect(page).to have_css 'input#harvest_weight_quantity' }
+      it { expect(page).to have_css 'textarea#harvest_description' }
     end
 
     it "Creating a new harvest", :js do

spec/features/home/home_spec.rb

@@ -5,18 +5,18 @@ require 'rails_helper'
 describe "home page", :search do
   subject { page }
 
-  let(:member) { FactoryBot.create(:member) }
+  let(:member) { create(:member) }
 
-  let(:photo) { FactoryBot.create(:photo, owner: member) }
-  let(:crop) { FactoryBot.create(:crop, created_at: 1.day.ago) }
+  let(:photo) { create(:photo, owner: member) }
+  let(:crop) { create(:crop, created_at: 1.day.ago) }
 
-  let(:planting) { FactoryBot.create(:planting, owner: member, crop:) }
-  let(:seed)    { FactoryBot.create(:tradable_seed, owner: member, crop:) }
-  let(:harvest) { FactoryBot.create(:harvest, owner: member, crop:)       }
+  let(:planting) { create(:planting, owner: member, crop:) }
+  let(:seed)    { create(:tradable_seed, owner: member, crop:) }
+  let(:harvest) { create(:harvest, owner: member, crop:)       }
 
-  let!(:tradable_seed) { FactoryBot.create(:tradable_seed, :reindex, finished: false)  }
-  let!(:finished_seed)   { FactoryBot.create(:tradable_seed, :reindex, finished: true) }
-  let!(:untradable_seed) { FactoryBot.create(:untradable_seed, :reindex)               }
+  let!(:tradable_seed) { create(:tradable_seed, :reindex, finished: false)  }
+  let!(:finished_seed)   { create(:tradable_seed, :reindex, finished: true) }
+  let!(:untradable_seed) { create(:untradable_seed, :reindex)               }
 
   before do
     # Add photos, so they can appear on home page

spec/features/likeable_spec.rb

@@ -3,12 +3,12 @@
 require 'rails_helper'
 
 describe 'Likeable', :js, :search do
-  let(:another_member) { FactoryBot.create(:london_member) }
-  let!(:post)           { FactoryBot.create(:post, :reindex, author: member) }
-  let!(:activity)       { FactoryBot.create(:activity, :reindex, owner: member) }
-  let!(:photo)          { FactoryBot.create(:photo, :reindex, owner: member) }
-  let!(:harvest)        { FactoryBot.create(:harvest, :reindex, owner: member) }
-  let!(:planting)       { FactoryBot.create(:planting, :reindex, owner: member) }
+  let(:another_member) { create(:london_member) }
+  let!(:post)           { create(:post, :reindex, author: member) }
+  let!(:activity)       { create(:activity, :reindex, owner: member) }
+  let!(:photo)          { create(:photo, :reindex, owner: member) }
+  let!(:harvest)        { create(:harvest, :reindex, owner: member) }
+  let!(:planting)       { create(:planting, :reindex, owner: member) }
 
   before do
     Photo.reindex
@@ -68,8 +68,8 @@ describe 'Likeable', :js, :search do
     end
 
     describe 'crops#show' do
-      let(:crop) { FactoryBot.create(:crop) }
-      let(:planting) { FactoryBot.create(:planting, owner: member, crop:) }
+      let(:crop) { create(:crop) }
+      let(:planting) { create(:planting, owner: member, crop:) }
       let(:path) { crop_path(crop) }
 
       before { planting.photos << photo }

spec/features/locale_spec.rb

@@ -5,7 +5,7 @@ require 'rails_helper'
 describe "Changing locales", :js do
   after { I18n.locale = :en }
 
-  let(:member) { FactoryBot.create(:member) }
+  let(:member) { create(:member) }
 
   it "Locale can be set with a query param" do
     # Login then log out, to ensure we're now logged out

spec/features/members/ban_spec.rb

@@ -3,8 +3,8 @@
 require 'rails_helper'
 
 describe "members list" do
-  let!(:spammer) { FactoryBot.create(:member) }
-  let!(:admin) { FactoryBot.create(:admin_member) }
+  let!(:spammer) { create(:member) }
+  let!(:admin) { create(:admin_member) }
 
   context 'logged in as admin' do
     include_context 'signed in admin'

spec/features/members/deletion_spec.rb

@@ -4,26 +4,26 @@ require 'rails_helper'
 
 describe "member deletion", :flaky do
   context "with activity and followers" do
-    let(:member)          { FactoryBot.create(:member)                     }
-    let(:other_member)    { FactoryBot.create(:member)                     }
-    let(:memberpost)      { FactoryBot.create(:post, author: member)       }
-    let(:othermemberpost) { FactoryBot.create(:post, author: other_member) }
-    let!(:planting)       { FactoryBot.create(:planting, owner: member)    }
-    let!(:harvest)        { FactoryBot.create(:harvest, owner: member)     }
-    let!(:seed)           { FactoryBot.create(:seed, owner: member)        }
-    let!(:secondgarden)   { FactoryBot.create(:garden, owner: member)      }
+    let(:member)          { create(:member)                     }
+    let(:other_member)    { create(:member)                     }
+    let(:memberpost)      { create(:post, author: member)       }
+    let(:othermemberpost) { create(:post, author: other_member) }
+    let!(:planting)       { create(:planting, owner: member)    }
+    let!(:harvest)        { create(:harvest, owner: member)     }
+    let!(:seed)           { create(:seed, owner: member)        }
+    let!(:secondgarden)   { create(:garden, owner: member)      }
 
     before do
       member.follows.create!(followed: other_member)
       other_member.follows.create!(followed: member)
 
       login_as(member)
-      FactoryBot.create(:comment, author: member, post: othermemberpost)
-      FactoryBot.create(:comment, author: other_member, post: memberpost, body: "Fun comment-y thing")
+      create(:comment, author: member, post: othermemberpost)
+      create(:comment, author: other_member, post: memberpost, body: "Fun comment-y thing")
       # deletion breaks if no wranglers exist
-      FactoryBot.create(:cropbot)
+      create(:cropbot)
       # deletion breaks if ex_member doesn't exist
-      FactoryBot.create(:member, login_name: "ex_member")
+      create(:member, login_name: "ex_member")
     end
 
     it "has option to delete on member profile page" do
@@ -136,7 +136,7 @@ describe "member deletion", :flaky do
       end
 
       it "replaces comments on others' posts with deletion note, leaving post intact" do
-        FactoryBot.create(:comment, post: othermemberpost, author: member, body: 'i am deleting my account')
+        create(:comment, post: othermemberpost, author: member, body: 'i am deleting my account')
 
         visit post_path(othermemberpost)
         expect(page).to have_no_content member.login_name
@@ -163,12 +163,12 @@ describe "member deletion", :flaky do
   end
 
   context "for a crop wrangler" do
-    let(:member) { FactoryBot.create(:crop_wrangling_member) }
-    let!(:ex_wrangler) { FactoryBot.create(:crop_wrangling_member, login_name: "ex_wrangler") }
-    let(:otherwrangler) { FactoryBot.create(:crop_wrangling_member) }
-    let(:crop)          { FactoryBot.create(:crop, creator: member) }
+    let(:member) { create(:crop_wrangling_member) }
+    let!(:ex_wrangler) { create(:crop_wrangling_member, login_name: "ex_wrangler") }
+    let(:otherwrangler) { create(:crop_wrangling_member) }
+    let(:crop)          { create(:crop, creator: member) }
 
-    before { FactoryBot.create(:cropbot) }
+    before { create(:cropbot) }
 
     it "leaves crops behind" do
       login_as(otherwrangler)

spec/features/members/list_spec.rb

@@ -13,7 +13,7 @@ describe "members list" do
     before do
       visit members_path
       expect(page).to have_css "#sort"
-      expect(page).to have_selector "form"
+      expect(page).to have_css "form"
     end
 
     it "default alphabetical sort" do

spec/features/members/profile_spec.rb

@@ -62,10 +62,10 @@ describe "member profile", :js do
       end
 
       context "with some activity" do
-        let!(:planting) { FactoryBot.create(:planting, owner: member) }
-        let!(:harvest) { FactoryBot.create(:harvest, owner: member) }
-        let!(:seed) { FactoryBot.create(:seed, owner: member) }
-        let!(:post) { FactoryBot.create(:post, author: member) }
+        let!(:planting) { create(:planting, owner: member) }
+        let!(:harvest) { create(:harvest, owner: member) }
+        let!(:seed) { create(:seed, owner: member) }
+        let!(:post) { create(:post, author: member) }
 
         before { visit member_path(member) }
 
@@ -104,10 +104,10 @@ describe "member profile", :js do
 
   shared_examples 'member activity' do
     context 'member has plantings' do
-      let!(:new_planting) { FactoryBot.create(:planting, owner: member, planted_at: Time.zone.now) }
-      let!(:old_planting) { FactoryBot.create(:planting, owner: member, planted_at: 3.years.ago) }
-      let!(:finished_planting) { FactoryBot.create(:finished_planting, owner: member) }
-      let!(:no_planted_at_planting) { FactoryBot.create(:planting, owner: member, planted_at: nil) }
+      let!(:new_planting) { create(:planting, owner: member, planted_at: Time.zone.now) }
+      let!(:old_planting) { create(:planting, owner: member, planted_at: 3.years.ago) }
+      let!(:finished_planting) { create(:finished_planting, owner: member) }
+      let!(:no_planted_at_planting) { create(:planting, owner: member, planted_at: nil) }
 
       before { visit member_path(member) }
 
@@ -118,9 +118,9 @@ describe "member profile", :js do
     end
 
     context 'member has activities' do
-      let!(:activity) { FactoryBot.create(:activity, owner: member, due_date: 3.days.ago) }
-      let!(:activity2) { FactoryBot.create(:activity, :planting, owner: member) }
-      let!(:activity3) { FactoryBot.create(:activity, :garden, owner: member) }
+      let!(:activity) { create(:activity, owner: member, due_date: 3.days.ago) }
+      let!(:activity2) { create(:activity, :planting, owner: member) }
+      let!(:activity3) { create(:activity, :garden, owner: member) }
 
       before { visit member_path(member) }
 
@@ -130,7 +130,7 @@ describe "member profile", :js do
     end
 
     context 'member has seeds' do
-      let!(:seed) { FactoryBot.create(:seed, owner: member) }
+      let!(:seed) { create(:seed, owner: member) }
 
       before { visit member_path(member) }
 
@@ -138,7 +138,7 @@ describe "member profile", :js do
     end
 
     context 'member has harvests' do
-      let!(:harvest) { FactoryBot.create(:harvest, owner: member) }
+      let!(:harvest) { create(:harvest, owner: member) }
 
       before { visit member_path(member) }
 
@@ -146,7 +146,7 @@ describe "member profile", :js do
     end
 
     context 'member has posts' do
-      let!(:post) { FactoryBot.create(:post, author: member) }
+      let!(:post) { create(:post, author: member) }
 
       before { visit member_path(member) }
 
@@ -154,8 +154,8 @@ describe "member profile", :js do
     end
 
     context 'member has comments' do
-      let(:post) { FactoryBot.create(:post) }
-      let!(:comment) { FactoryBot.create(:comment, commentable: post, author: member) }
+      let(:post) { create(:post) }
+      let!(:comment) { create(:comment, commentable: post, author: member) }
 
       before { visit member_path(member) }
 
@@ -164,8 +164,8 @@ describe "member profile", :js do
     end
 
     context 'photos' do
-      let(:planting) { FactoryBot.create(:planting, owner: member) }
-      let!(:photo) { FactoryBot.create(:photo, owner: member, plantings: [planting]) }
+      let(:planting) { create(:planting, owner: member) }
+      let!(:photo) { create(:photo, owner: member, plantings: [planting]) }
 
       before { visit member_path(member) }
 
@@ -174,35 +174,35 @@ describe "member profile", :js do
     end
 
     context 'plantings' do
-      let(:crop) { FactoryBot.create(:crop) }
+      let(:crop) { create(:crop) }
       let(:growing_planting) do
-        FactoryBot.create(:planting,
-                          crop:,
-                          owner:      member,
-                          planted_at: Time.zone.today)
+        create(:planting,
+               crop:,
+               owner:      member,
+               planted_at: Time.zone.today)
       end
       let(:harvesting_planting) do
-        FactoryBot.create(:planting,
-                          crop:,
-                          owner:      member,
-                          planted_at: 51.days.ago)
+        create(:planting,
+               crop:,
+               owner:      member,
+               planted_at: 51.days.ago)
       end
       let(:super_late_planting) do
-        FactoryBot.create(:planting,
-                          crop:, owner: member,
-                          planted_at: 260.days.ago)
+        create(:planting,
+               crop:, owner: member,
+               planted_at: 260.days.ago)
       end
 
       before do
         # time to harvest = 50 day
         # time to finished = 90 days
-        FactoryBot.create(:harvest,
-                          harvested_at: 50.days.ago,
-                          crop:,
-                          planting:     FactoryBot.create(:planting,
-                                                          crop:,
-                                                          planted_at:  100.days.ago,
-                                                          finished_at: 10.days.ago))
+        create(:harvest,
+               harvested_at: 50.days.ago,
+               crop:,
+               planting:     create(:planting,
+                                    crop:,
+                                    planted_at:  100.days.ago,
+                                    finished_at: 10.days.ago))
         crop.plantings.each(&:update_harvest_days!)
         crop.update_lifespan_medians
         crop.update_harvest_medians

spec/features/percy/percy_spec.rb

@@ -7,25 +7,25 @@ describe 'Test with visual testing', :js, type: :feature do
   # on every run, so doesn't trigger percy to see changes
   before { Faker::Config.random = Random.new(42) }
 
-  let!(:member)        { FactoryBot.create(:member, login_name: 'percy', preferred_avatar_uri: gravatar) }
-  let!(:crop_wrangler) { FactoryBot.create(:crop_wrangling_member, login_name: 'croppy', preferred_avatar_uri: gravatar2) }
-  let!(:admin_user) { FactoryBot.create(:admin_member, login_name: 'janitor', preferred_avatar_uri: gravatar3) }
-  let!(:someone_else) { FactoryBot.create(:edinburgh_member, login_name: 'ruby', preferred_avatar_uri: gravatar4) }
+  let!(:member)        { create(:member, login_name: 'percy', preferred_avatar_uri: gravatar) }
+  let!(:crop_wrangler) { create(:crop_wrangling_member, login_name: 'croppy', preferred_avatar_uri: gravatar2) }
+  let!(:admin_user) { create(:admin_member, login_name: 'janitor', preferred_avatar_uri: gravatar3) }
+  let!(:someone_else) { create(:edinburgh_member, login_name: 'ruby', preferred_avatar_uri: gravatar4) }
 
   let(:gravatar) { 'https://secure.gravatar.com/avatar/d021434aac03a7f7c7c0de60d07dad1c?size=150&default=identicon' }
   let(:gravatar2) { 'https://secure.gravatar.com/avatar/353d83d3677b142520987e1936fd093c?size=150&default=identicon' }
   let(:gravatar3) { 'https://secure.gravatar.com/avatar/622db62c7beab8d5d8b7a80aa6385b2f?size=150&default=identicon' }
   let(:gravatar4) { 'https://secure.gravatar.com/avatar/7fd767571ff5ceefc7a687a543b2c402?size=150&default=identicon' }
 
-  let!(:tomato)   { FactoryBot.create(:tomato, creator: someone_else) }
-  let(:plant_part) { FactoryBot.create(:plant_part, name: 'fruit') }
+  let!(:tomato)   { create(:tomato, creator: someone_else) }
+  let(:plant_part) { create(:plant_part, name: 'fruit') }
 
   let(:tomato_photo) do
-    FactoryBot.create(:photo,
-                      title:         'look at my tomatoes',
-                      owner:         member,
-                      fullsize_url:  'https://farm1.staticflickr.com/177/432250619_2fe19d067d_z.jpg',
-                      thumbnail_url: 'https://farm1.staticflickr.com/177/432250619_2fe19d067d_q.jpg')
+    create(:photo,
+           title:         'look at my tomatoes',
+           owner:         member,
+           fullsize_url:  'https://farm1.staticflickr.com/177/432250619_2fe19d067d_z.jpg',
+           thumbnail_url: 'https://farm1.staticflickr.com/177/432250619_2fe19d067d_q.jpg')
   end
   let(:post_body) do
     "So, um, watering's important. Yep. Very important.
@@ -66,7 +66,7 @@ rest of the garden.
 [apple](crop)
     "
   end
-  let(:post) { FactoryBot.create(:post, author: member, subject: "Watering", body: post_body) }
+  let(:post) { create(:post, author: member, subject: "Watering", body: post_body) }
 
   before do
     # Freeze time, so we don't have variations in timestamps on the page
@@ -80,23 +80,23 @@ rest of the garden.
       eggplant: 'https://farm8.staticflickr.com/7856/47068736892_1af9b8a4ba_q.jpg',
       maize:    'https://farm66.staticflickr.com/65535/46739264475_7cb55b2cbb_q.jpg'
     }.each do |crop_type, photo_url|
-      crop = FactoryBot.create(crop_type, creator: someone_else)
+      crop = create(crop_type, creator: someone_else)
       crop.reindex
-      owner = FactoryBot.create(:interesting_member, login_name: crop_type.to_s.reverse, email: "#{crop.name}@example.com")
-      planting = FactoryBot.create(:planting, crop:, owner:, garden: owner.gardens.first)
-      photo = FactoryBot.create(:photo, owner:,
+      owner = create(:interesting_member, login_name: crop_type.to_s.reverse, email: "#{crop.name}@example.com")
+      planting = create(:planting, crop:, owner:, garden: owner.gardens.first)
+      photo = create(:photo, owner:,
                                         thumbnail_url: "#{photo_url}_q.jpg", fullsize_url: "#{photo_url}_z.jpg")
       planting.photos << photo
 
-      harvest = FactoryBot.create(:harvest, crop:, owner:, plant_part:)
+      harvest = create(:harvest, crop:, owner:, plant_part:)
       harvest.photos << photo
-      FactoryBot.create(:planting, crop: tomato,
+      create(:planting, crop: tomato,
                                    planted_at: 1.year.ago, finished_at: 2.months.ago,
                                    sunniness: 'sun', planted_from: 'seed')
     end
 
-    FactoryBot.create(:seed, owner: member, tradable_to: 'nationally')
-    FactoryBot.create(:seed, owner: someone_else, tradable_to: 'nationally')
+    create(:seed, owner: member, tradable_to: 'nationally')
+    create(:seed, owner: someone_else, tradable_to: 'nationally')
   end
 
   after { Timecop.return }
@@ -111,16 +111,16 @@ rest of the garden.
 
     describe 'crops' do
       it 'loads crops#show' do
-        FactoryBot.create(:planting, planted_at: 2.months.ago, sunniness: 'shade', planted_from: 'seedling')
+        create(:planting, planted_at: 2.months.ago, sunniness: 'shade', planted_from: 'seedling')
 
-        planting = FactoryBot.create(:planting, planted_at: 1.year.ago, sunniness: 'sun', planted_from: 'seed', crop: tomato)
-        FactoryBot.create(:harvest,
-                          crop:         tomato,
-                          plant_part:   FactoryBot.create(:plant_part, name: 'berry'),
-                          planting:,
-                          harvested_at: 1.day.ago)
+        planting = create(:planting, planted_at: 1.year.ago, sunniness: 'sun', planted_from: 'seed', crop: tomato)
+        create(:harvest,
+               crop:         tomato,
+               plant_part:   create(:plant_part, name: 'berry'),
+               planting:,
+               harvested_at: 1.day.ago)
 
-        post = FactoryBot.create(:post, subject: 'tomatoes are delicious')
+        post = create(:post, subject: 'tomatoes are delicious')
         tomato.posts << post
 
         visit crop_path(tomato)
@@ -141,7 +141,7 @@ rest of the garden.
       end
 
       it 'load another member plantings#show' do
-        planting = FactoryBot.create(:planting, crop: tomato, owner: someone_else, garden: someone_else.gardens.first)
+        planting = create(:planting, crop: tomato, owner: someone_else, garden: someone_else.gardens.first)
         visit planting_path(planting)
         page.percy_snapshot(page, name: "#{prefix}/plantings#show")
       end
@@ -155,14 +155,14 @@ rest of the garden.
 
       it 'gardens#show' do
         # a garden
-        garden = FactoryBot.create(:garden, name: 'paradise', owner: member)
+        garden = create(:garden, name: 'paradise', owner: member)
         # with some lettuce (finished)
-        FactoryBot.create(
-          :planting, crop: FactoryBot.create(:crop, name: 'lettuce'),
+        create(
+          :planting, crop: create(:crop, name: 'lettuce'),
                      garden:, owner: member, finished_at: 2.weeks.ago
         )
         # tomato still growing
-        tomato_planting = FactoryBot.create(:planting, garden:, owner: member, crop: tomato)
+        tomato_planting = create(:planting, garden:, owner: member, crop: tomato)
         tomato_photo.plantings << tomato_planting
         visit garden_path(garden)
         page.percy_snapshot(page, name: "#{prefix}/gardens#show")
@@ -176,10 +176,10 @@ rest of the garden.
       end
 
       it 'loads another members#show' do
-        FactoryBot.create(:planting, owner: someone_else, created_at: 30.days.ago, crop: tomato)
-        FactoryBot.create(:planting, owner: someone_else, created_at: 24.days.ago, crop: tomato)
-        FactoryBot.create(:post, author: someone_else, created_at: 4.days.ago, subject: 'waiting for my tomatoes')
-        FactoryBot.create(:harvest, owner: someone_else, created_at: 1.day.ago, crop: tomato)
+        create(:planting, owner: someone_else, created_at: 30.days.ago, crop: tomato)
+        create(:planting, owner: someone_else, created_at: 24.days.ago, crop: tomato)
+        create(:post, author: someone_else, created_at: 4.days.ago, subject: 'waiting for my tomatoes')
+        create(:harvest, owner: someone_else, created_at: 1.day.ago, crop: tomato)
 
         visit member_path(someone_else)
         page.percy_snapshot(page, name: "#{prefix}/members#show")
@@ -188,18 +188,18 @@ rest of the garden.
 
     describe 'posts' do
       it 'loads posts#show' do
-        FactoryBot.create(:comment, commentable: post)
-        FactoryBot.create(:comment, commentable: post)
+        create(:comment, commentable: post)
+        create(:comment, commentable: post)
         visit post_path(post)
         page.percy_snapshot(page, name: "#{prefix}/posts#show")
       end
 
       it 'loads posts#index' do
         Member.all.limit(5).each do |member|
-          FactoryBot.create_list(:post, 12, author: member)
+          create_list(:post, 12, author: member)
         end
         Post.all.order(id: :desc).limit(4) do |post|
-          FactoryBot.create_list(:comment, rand(1..5), commentable: post)
+          create_list(:comment, rand(1..5), commentable: post)
         end
         visit posts_path
         page.percy_snapshot(page, name: "#{prefix}/posts#index")
@@ -208,7 +208,7 @@ rest of the garden.
 
     describe 'photos' do
       it 'loads photos#show' do
-        tomato_photo.plantings << FactoryBot.create(:planting, owner: member, crop: tomato)
+        tomato_photo.plantings << create(:planting, owner: member, crop: tomato)
         visit photo_path(tomato_photo)
         page.percy_snapshot(page, name: "#{prefix}/photos#show")
       end
@@ -250,7 +250,7 @@ rest of the garden.
     it_behaves_like 'visit pages'
 
     it 'load my plantings#show' do
-      planting = FactoryBot.create(:planting, crop: tomato, owner: member, garden: member.gardens.first)
+      planting = create(:planting, crop: tomato, owner: member, garden: member.gardens.first)
       visit planting_path(planting)
       page.percy_snapshot(page, name: "#{prefix}/self/plantings#show")
     end
@@ -261,7 +261,7 @@ rest of the garden.
     end
 
     it 'load my gardens#show' do
-      garden = FactoryBot.create(:garden, name: 'paradise', owner: member)
+      garden = create(:garden, name: 'paradise', owner: member)
       visit garden_path(garden)
       page.percy_snapshot(page, name: "#{prefix}/self/gardens#show")
     end
@@ -306,19 +306,19 @@ rest of the garden.
 
     describe '#edit' do
       it 'loads gardens#edit' do
-        garden = FactoryBot.create(:garden, owner: member)
+        garden = create(:garden, owner: member)
         visit edit_garden_path(garden)
         page.percy_snapshot(page, name: "#{prefix}/gardens#edit")
       end
 
       it 'loads harvests#edit' do
-        harvest = FactoryBot.create(:harvest, owner: member)
+        harvest = create(:harvest, owner: member)
         visit edit_harvest_path(harvest)
         page.percy_snapshot(page, name: "#{prefix}/harvests#edit")
       end
 
       it 'loads planting#edit' do
-        planting = FactoryBot.create(:planting, owner: member)
+        planting = create(:planting, owner: member)
         visit edit_planting_path(planting)
         page.percy_snapshot(page, name: "#{prefix}/plantings#edit")
       end
@@ -350,7 +350,7 @@ rest of the garden.
 
   context 'wrangling crops' do
     include_context 'signed in crop wrangler'
-    let!(:candy) { FactoryBot.create(:crop_request, name: 'candy') }
+    let!(:candy) { create(:crop_request, name: 'candy') }
 
     it 'crop wrangling page' do
       visit wrangle_crops_path

spec/features/photos/new_photo_spec.rb

@@ -6,7 +6,7 @@ describe "new photo page" do
   context "signed in member" do
     include_context 'signed in member'
     context "viewing a planting" do
-      let(:planting) { FactoryBot.create(:planting, owner: member) }
+      let(:planting) { create(:planting, owner: member) }
 
       it "add photo" do
         visit planting_path(planting)
@@ -20,7 +20,7 @@ describe "new photo page" do
     end
 
     context "viewing a harvest" do
-      let(:harvest) { FactoryBot.create(:harvest, owner: member) }
+      let(:harvest) { create(:harvest, owner: member) }
 
       it "add photo" do
         visit harvest_path(harvest)
@@ -33,7 +33,7 @@ describe "new photo page" do
     end
 
     context "viewing a garden" do
-      let(:garden) { FactoryBot.create(:garden, owner: member) }
+      let(:garden) { create(:garden, owner: member) }
 
       it "add photo" do
         visit garden_path(garden)
@@ -46,7 +46,7 @@ describe "new photo page" do
     end
 
     describe "viewing a seed" do
-      let(:seed) { FactoryBot.create(:seed, owner: member) }
+      let(:seed) { create(:seed, owner: member) }
 
       it "add photo" do
         visit seed_path(seed)

spec/features/planting_reminder_spec.rb

@@ -30,8 +30,8 @@ describe "Planting reminder email", :js do
   context "when member has some plantings" do
     # Bangs are used on the following 2 let blocks in order to ensure that the plantings are present
     # in the database before the email is generated: otherwise, they won't be present in the email.
-    let!(:p1) { FactoryBot.create(:predictable_planting, planted_at: 10.days.ago, garden: member.gardens.first, owner: member) }
-    let!(:p2) { FactoryBot.create(:predictable_planting, planted_at: 30.days.ago, garden: member.gardens.first, owner: member) }
+    let!(:p1) { create(:predictable_planting, planted_at: 10.days.ago, garden: member.gardens.first, owner: member) }
+    let!(:p2) { create(:predictable_planting, planted_at: 30.days.ago, garden: member.gardens.first, owner: member) }
 
     describe "lists plantings" do
       it { expect(mail).to have_content "Progress report" }
@@ -50,10 +50,10 @@ describe "Planting reminder email", :js do
   context "when member has some harvests" do
     # Bangs are used on the following 2 let blocks in order to ensure that the plantings are present
     # in the database before the spec is run.
-    let!(:p1) { FactoryBot.create(:predictable_planting, garden: member.gardens.first, owner: member, planted_at: 20.days.ago) }
-    let!(:p2) { FactoryBot.create(:predictable_planting, garden: member.gardens.first, owner: member) }
-    let!(:h1) { FactoryBot.create(:harvest, owner: member, planting: p1, harvested_at: 1.day.ago) }
-    let!(:h2) { FactoryBot.create(:harvest, owner: member, planting: p2, harvested_at: 3.days.ago) }
+    let!(:p1) { create(:predictable_planting, garden: member.gardens.first, owner: member, planted_at: 20.days.ago) }
+    let!(:p2) { create(:predictable_planting, garden: member.gardens.first, owner: member) }
+    let!(:h1) { create(:harvest, owner: member, planting: p1, harvested_at: 1.day.ago) }
+    let!(:h2) { create(:harvest, owner: member, planting: p2, harvested_at: 3.days.ago) }
 
     describe "lists planting that are ready for harvest" do
       it { expect(mail).to have_content "Ready to harvest" }

spec/features/plantings/planting_a_crop_spec.rb

@@ -4,10 +4,10 @@ require "rails_helper"
 require 'custom_matchers'
 
 describe "Planting a crop", :js, :search do
-  let!(:maize) { FactoryBot.create(:maize) }
-  let(:garden) { FactoryBot.create(:garden, owner: member, name: 'Orchard') }
+  let!(:maize) { create(:maize) }
+  let(:garden) { create(:garden, owner: member, name: 'Orchard') }
   let!(:planting) do
-    FactoryBot.create(:planting, garden:, owner: member, planted_at: Date.parse("2013-03-10"))
+    create(:planting, garden:, owner: member, planted_at: Date.parse("2013-03-10"))
   end
 
   before { Planting.reindex }
@@ -19,14 +19,14 @@ describe "Planting a crop", :js, :search do
     it_behaves_like "crop suggest", "planting"
 
     describe "displays required and optional fields properly" do
-      it { expect(page).to have_selector ".required", text: "What did you plant?" }
-      it { expect(page).to have_selector ".required", text: "Where did you plant it?" }
-      it { expect(page).to have_selector 'input#planting_planted_at' }
-      it { expect(page).to have_selector 'input#planting_quantity' }
-      it { expect(page).to have_selector 'select#planting_planted_from' }
-      it { expect(page).to have_selector 'select#planting_sunniness' }
-      it { expect(page).to have_selector 'textarea#planting_description' }
-      it { expect(page).to have_selector 'input#planting_finished_at' }
+      it { expect(page).to have_css ".required", text: "What did you plant?" }
+      it { expect(page).to have_css ".required", text: "Where did you plant it?" }
+      it { expect(page).to have_css 'input#planting_planted_at' }
+      it { expect(page).to have_css 'input#planting_quantity' }
+      it { expect(page).to have_css 'select#planting_planted_from' }
+      it { expect(page).to have_css 'select#planting_sunniness' }
+      it { expect(page).to have_css 'textarea#planting_description' }
+      it { expect(page).to have_css 'input#planting_finished_at' }
     end
 
     describe "Creating a new planting" do
@@ -237,7 +237,7 @@ describe "Planting a crop", :js, :search do
 
     describe "Transplanting a planting" do
       it "allows transplanting to another garden" do
-        other_garden = FactoryBot.create(:garden, owner: member, name: 'Backyard')
+        other_garden = create(:garden, owner: member, name: 'Backyard')
         visit planting_path(planting)
         click_link 'Actions'
         select other_garden.name, from: 'Transplant to:'

spec/features/plantings/prediction_spec.rb

@@ -4,9 +4,9 @@ require "rails_helper"
 require 'custom_matchers'
 describe "Display a planting", :js do
   describe 'planting perennial' do
-    let(:garden) { FactoryBot.create(:garden, location: 'Edinburgh') }
-    let(:crop) { FactoryBot.create(:crop, name: 'feijoa', perennial: true) }
-    let(:planting) { FactoryBot.create(:planting, crop:, garden:, owner: garden.owner) }
+    let(:garden) { create(:garden, location: 'Edinburgh') }
+    let(:crop) { create(:crop, name: 'feijoa', perennial: true) }
+    let(:planting) { create(:planting, crop:, garden:, owner: garden.owner) }
 
     describe 'no harvest to predict from' do
       before { visit planting_path(planting) }
@@ -17,9 +17,9 @@ describe "Display a planting", :js do
 
     describe 'harvests used to predict' do
       before do
-        FactoryBot.create(:harvest, planting:, crop:, harvested_at: '1 May 2019')
-        FactoryBot.create(:harvest, planting:, crop:, harvested_at: '18 June 2019')
-        FactoryBot.create_list(:harvest, 4, planting:, crop:, harvested_at: '18 August 2019')
+        create(:harvest, planting:, crop:, harvested_at: '1 May 2019')
+        create(:harvest, planting:, crop:, harvested_at: '18 June 2019')
+        create_list(:harvest, 4, planting:, crop:, harvested_at: '18 August 2019')
       end
 
       before { visit planting_path(planting) }
@@ -36,22 +36,22 @@ describe "Display a planting", :js do
 
       before do
         # Near by planting with harvests
-        nearby_garden = FactoryBot.create(:garden, location: 'Greenwich, UK')
-        nearby_planting = FactoryBot.create(:planting, crop:,
+        nearby_garden = create(:garden, location: 'Greenwich, UK')
+        nearby_planting = create(:planting, crop:,
                                                        garden: nearby_garden, owner: nearby_garden.owner, planted_at: '1 January 2000')
-        FactoryBot.create(:harvest, planting: nearby_planting, crop:,
+        create(:harvest, planting: nearby_planting, crop:,
                                     harvested_at: '1 May 2019')
-        FactoryBot.create(:harvest, planting: nearby_planting, crop:,
+        create(:harvest, planting: nearby_planting, crop:,
                                     harvested_at: '18 June 2019')
-        FactoryBot.create_list(:harvest, 4, planting: nearby_planting, crop:,
+        create_list(:harvest, 4, planting: nearby_planting, crop:,
                                             harvested_at: '18 August 2008')
 
         # far away planting harvests
-        faraway_garden = FactoryBot.create(:garden, location: 'Amundsen-Scott Base, Antarctica')
-        faraway_planting = FactoryBot.create(:planting, garden: faraway_garden, crop:,
+        faraway_garden = create(:garden, location: 'Amundsen-Scott Base, Antarctica')
+        faraway_planting = create(:planting, garden: faraway_garden, crop:,
                                                         owner: faraway_garden.owner, planted_at: '16 May 2001')
 
-        FactoryBot.create_list(:harvest, 4, planting: faraway_planting, crop:,
+        create_list(:harvest, 4, planting: faraway_planting, crop:,
                                             harvested_at: '18 December 2006')
       end
 

spec/features/plantings/show_spec.rb

@@ -8,25 +8,25 @@ describe "Display a planting", :js do
     before { visit planting_path(planting) }
 
     context 'Perennial planted long ago' do
-      let(:planting) { FactoryBot.create(:perennial_planting) }
+      let(:planting) { create(:perennial_planting) }
 
       it { expect(page).to have_text 'Perennial' }
     end
 
     context 'Perennial finished' do
-      let(:planting) { FactoryBot.create(:perennial_planting, planted_at: 6.years.ago, finished: true, finished_at: 1.year.ago) }
+      let(:planting) { create(:perennial_planting, planted_at: 6.years.ago, finished: true, finished_at: 1.year.ago) }
 
       it { expect(page).to have_text 'Perennial' }
     end
 
     context 'Annual no predictions' do
-      let(:planting) { FactoryBot.create(:annual_planting) }
+      let(:planting) { create(:annual_planting) }
 
       it { expect(page).to have_no_text 'Finish expected' }
     end
 
     context 'Annual with predicted finish' do
-      let(:planting) { FactoryBot.create(:predictable_planting, planted_at: 2.weeks.ago) }
+      let(:planting) { create(:predictable_planting, planted_at: 2.weeks.ago) }
 
       it { expect(page).to have_text '28%' }
       it { expect(page).to have_text '14/50 days' }
@@ -35,39 +35,39 @@ describe "Display a planting", :js do
     end
 
     context 'Annual finished' do
-      let(:planting) { FactoryBot.create(:annual_planting, planted_at: 100.days.ago, finished: true, finished_at: 1.day.ago) }
+      let(:planting) { create(:annual_planting, planted_at: 100.days.ago, finished: true, finished_at: 1.day.ago) }
 
       it { expect(page).to have_text "Planted #{I18n.l(planting.planted_at)}" }
     end
 
     context 'Planting with harvests' do
-      let(:planting) { FactoryBot.create(:harvest_with_planting).planting }
+      let(:planting) { create(:harvest_with_planting).planting }
 
       it { expect(page).to have_text 'Harvest started' }
     end
 
     context 'Planting with harvest predictable' do
       let(:planting) do
-        crop = FactoryBot.create(:annual_crop)
+        crop = create(:annual_crop)
         # 50 days to harvest
-        FactoryBot.create(:harvest, harvested_at: 150.days.ago, crop:,
-                                    planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop:))
+        create(:harvest, harvested_at: 150.days.ago, crop:,
+                                    planting: create(:planting, planted_at: 200.days.ago, crop:))
         # 20 days to harvest
-        FactoryBot.create(:harvest, harvested_at: 180.days.ago, crop:,
-                                    planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop:))
+        create(:harvest, harvested_at: 180.days.ago, crop:,
+                                    planting: create(:planting, planted_at: 200.days.ago, crop:))
         # 10 days to harvest
-        FactoryBot.create(:harvest, harvested_at: 190.days.ago, crop:,
-                                    planting: FactoryBot.create(:planting, planted_at: 200.days.ago, crop:))
+        create(:harvest, harvested_at: 190.days.ago, crop:,
+                                    planting: create(:planting, planted_at: 200.days.ago, crop:))
         crop.update_medians
 
-        FactoryBot.create(:annual_planting, planted_at: 200.days.ago, crop:)
+        create(:annual_planting, planted_at: 200.days.ago, crop:)
       end
 
       it { expect(page).to have_text 'First harvest expected' }
     end
 
     context 'with quantity' do
-      let(:planting) { FactoryBot.create(:planting, quantity: 100) }
+      let(:planting) { create(:planting, quantity: 100) }
 
       it { expect(find('.plantingfact--quantity')).to have_text '100' }
     end
@@ -78,8 +78,8 @@ describe "Display a planting", :js do
     before { visit planting_path(planting) }
 
     context 'with matching seeds' do
-      let(:seed) { FactoryBot.create(:seed, saved_at: 1.month.ago, owner: member) }
-      let(:planting) { FactoryBot.create(:planting, planted_at: 1.day.ago, crop: seed.crop, owner: member) }
+      let(:seed) { create(:seed, saved_at: 1.month.ago, owner: member) }
+      let(:planting) { create(:planting, planted_at: 1.day.ago, crop: seed.crop, owner: member) }
 
       it { expect(page).to have_text 'Is this from one of these plantings? ' }
 

spec/features/seeds/adding_seeds_spec.rb

@@ -15,16 +15,16 @@ describe "Seeds", :js, :search do
     describe "displays required and optional fields properly" do
       # NOTE: The required behaviour is pushed down to the control itself, not the form-group as of rails 7.1.
       # Modern browsers enforce the required behaviour better than us doing it ourselves.
-      it { expect(page).to have_selector "label", text: "Crop" }
-      it { expect(page).to have_selector 'input#seed_quantity' }
-      it { expect(page).to have_selector 'input#seed_plant_before' }
-      it { expect(page).to have_selector 'input#seed_days_until_maturity_min' }
-      it { expect(page).to have_selector 'input#seed_days_until_maturity_max' }
-      it { expect(page).to have_selector 'label', text: 'Organic?' }
-      it { expect(page).to have_selector 'label', text: 'GMO?' }
-      it { expect(page).to have_selector 'label', text: 'Heirloom?' }
-      it { expect(page).to have_selector 'textarea#seed_description' }
-      it { expect(page).to have_selector 'label', text: 'Will trade' }
+      it { expect(page).to have_css "label", text: "Crop" }
+      it { expect(page).to have_css 'input#seed_quantity' }
+      it { expect(page).to have_css 'input#seed_plant_before' }
+      it { expect(page).to have_css 'input#seed_days_until_maturity_min' }
+      it { expect(page).to have_css 'input#seed_days_until_maturity_max' }
+      it { expect(page).to have_css 'label', text: 'Organic?' }
+      it { expect(page).to have_css 'label', text: 'GMO?' }
+      it { expect(page).to have_css 'label', text: 'Heirloom?' }
+      it { expect(page).to have_css 'textarea#seed_description' }
+      it { expect(page).to have_css 'label', text: 'Will trade' }
     end
 
     describe "Adding a new seed", :js do

spec/features/seeds/misc_seeds_spec.rb

@@ -55,7 +55,7 @@ describe "seeds", :js do
     end
 
     describe "delete seeds" do
-      let(:seed) { FactoryBot.create(:seed, owner: member) }
+      let(:seed) { create(:seed, owner: member) }
 
       before do
         visit seed_path(seed)
@@ -72,25 +72,25 @@ describe "seeds", :js do
       before { visit seed_path(seed) }
 
       describe "view seeds with max and min days until maturity" do
-        let(:seed) { FactoryBot.create(:seed, days_until_maturity_min: 5, days_until_maturity_max: 7) }
+        let(:seed) { create(:seed, days_until_maturity_min: 5, days_until_maturity_max: 7) }
 
         it { expect(find('.seedfacts--maturity')).to have_content("5–7") }
       end
 
       describe "view seeds with only max days until maturity" do
-        let(:seed) { FactoryBot.create(:seed, days_until_maturity_max: 7) }
+        let(:seed) { create(:seed, days_until_maturity_max: 7) }
 
         it { expect(find('.seedfacts--maturity')).to have_content("7") }
       end
 
       describe "view seeds with only min days until maturity" do
-        let(:seed) { FactoryBot.create(:seed, days_until_maturity_min: 5) }
+        let(:seed) { create(:seed, days_until_maturity_min: 5) }
 
         it { expect(find('.seedfacts--maturity')).to have_content("5") }
       end
 
       describe "view seeds with neither max nor min days until maturity" do
-        let(:seed) { FactoryBot.create(:seed) }
+        let(:seed) { create(:seed) }
 
         it { expect(find('.seedfacts--maturity')).to have_content "unknown" }
       end

spec/features/seeds/seed_photos_spec.rb

@@ -10,8 +10,8 @@ describe "Seeds", :js do
     include_context 'signed in member'
     before { visit seed_path(seed) }
 
-    let(:member) { FactoryBot.create(:member)              }
-    let!(:seed)  { FactoryBot.create(:seed, owner: member) }
+    let(:member) { create(:member)              }
+    let!(:seed)  { create(:seed, owner: member) }
 
     it {
       click_on "Actions"
@@ -28,7 +28,7 @@ describe "Seeds", :js do
         visit seed_path(seed)
       end
 
-      let!(:photo) { FactoryBot.create(:photo, title: 'hello photo', owner: seed.owner) }
+      let!(:photo) { create(:photo, title: 'hello photo', owner: seed.owner) }
 
       it { is_expected.to have_xpath("//img[contains(@src,'#{photo.thumbnail_url}')]") }
       it { is_expected.to have_xpath("//a[contains(@href,'#{photo_path(photo)}')]") }
@@ -41,7 +41,7 @@ describe "Seeds", :js do
         visit seed_path(seed)
       end
 
-      let!(:photos) { FactoryBot.create_list(:photo, 10 * 5, owner: seed.owner) }
+      let!(:photos) { create_list(:photo, 10 * 5, owner: seed.owner) }
       let(:newest_photo) { seed.photos.order(created_at: :desc, id: :desc).first }
       let(:oldest_photo) { seed.photos.order(created_at: :desc, id: :desc).last }
 

spec/features/shared_examples/crop_suggest.rb

@@ -9,7 +9,7 @@ shared_examples "crop suggest" do |resource|
   let!(:roma)   { create(:roma)              }
 
   it "placeholder text in crop auto suggest field" do
-    expect(page).to have_selector("input[placeholder='e.g. lettuce']")
+    expect(page).to have_css("input[placeholder='e.g. lettuce']")
   end
 
   it "typing in the crop name displays suggestions" do
@@ -41,7 +41,7 @@ shared_examples "crop suggest" do |resource|
 
     select_from_autocomplete("pear")
 
-    expect(page).to have_selector("input##{resource}_crop_id[value='#{pear.id}']", visible: false)
+    expect(page).to have_css("input##{resource}_crop_id[value='#{pear.id}']", visible: false)
   end
 
   it "Typing and pausing does not affect input" do

spec/features/signin_spec.rb

@@ -3,12 +3,12 @@
 require 'rails_helper'
 
 describe "signin" do
-  let(:member)       { FactoryBot.create(:member)                             }
-  let(:recipient)    { FactoryBot.create(:member)                             }
-  let(:wrangler)     { FactoryBot.create(:crop_wrangling_member)              }
+  let(:member)       { create(:member)                             }
+  let(:recipient)    { create(:member)                             }
+  let(:wrangler)     { create(:crop_wrangling_member)              }
 
   before do
-    crop = FactoryBot.create(:tomato)
+    crop = create(:tomato)
     crop.reindex
   end
 

spec/features/signout_spec.rb

@@ -42,7 +42,7 @@ describe "signout" do
   end
 
   it 'photos' do
-    garden = FactoryBot.create(:garden, owner: member)
+    garden = create(:garden, owner: member)
     visit "/photos/new?id=#{garden.id}&type=garden"
     expect(page).to have_current_path new_member_session_path, ignore_query: true
     # expect(page).to have_http_status(200)

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

spec/features/timeline/index_spec.rb

@@ -3,9 +3,9 @@
 require 'rails_helper'
 
 describe "timeline", :js do
-  let(:member) { FactoryBot.create(:member) }
-  let(:friend1) { FactoryBot.create(:member) }
-  let(:friend2) { FactoryBot.create(:member) }
+  let(:member) { create(:member) }
+  let(:friend1) { create(:member) }
+  let(:friend2) { create(:member) }
 
   before do
     member.followed << friend1
@@ -13,14 +13,14 @@ describe "timeline", :js do
   end
 
   describe 'visit timeline' do
-    let!(:friend_planting) { FactoryBot.create(:planting, owner: friend1, planted_at: 1.day.ago) }
-    let!(:friend_harvest) { FactoryBot.create(:planting, owner: friend2, planted_at: 3.years.ago) }
-    let!(:finished_planting) { FactoryBot.create(:finished_planting, owner: friend1) }
-    let!(:no_planted_at_planting) { FactoryBot.create(:planting, owner: friend2, planted_at: nil) }
-    let!(:friend_photo) { FactoryBot.create(:photo, owner: friend1) }
-    let!(:friend_post) { FactoryBot.create(:post, author: friend2) }
-    let!(:liked_post) { FactoryBot.create(:like, likeable: friend_photo, member: friend2) }
-    let!(:liked_photo) { FactoryBot.create(:like, likeable: friend_post, member: friend1) }
+    let!(:friend_planting) { create(:planting, owner: friend1, planted_at: 1.day.ago) }
+    let!(:friend_harvest) { create(:planting, owner: friend2, planted_at: 3.years.ago) }
+    let!(:finished_planting) { create(:finished_planting, owner: friend1) }
+    let!(:no_planted_at_planting) { create(:planting, owner: friend2, planted_at: nil) }
+    let!(:friend_photo) { create(:photo, owner: friend1) }
+    let!(:friend_post) { create(:post, author: friend2) }
+    let!(:liked_post) { create(:like, likeable: friend_photo, member: friend2) }
+    let!(:liked_photo) { create(:like, likeable: friend_post, member: friend1) }
 
     before do
       login_as(member)