Merge branch 'dev' into feature-use-test-queue

Merge pull request #4550 from Growstuff/Style/FrozenStringLiteralComment
Rubocop: Style/FrozenStringLiteralComment
2026-05-25 09:19:15 -04:00 · 2026-04-26 02:03:56 +09:30 · 2026-04-24 08:41:23 +09:30 · 2026-04-24 00:15:18 +09:30 · 2026-04-24 00:13:37 +09:30 · 2026-04-24 00:02:00 +09:30
214 changed files with 2300 additions and 2670 deletions
--- a/.github/workflows/ci-features-admin.yml
+++ b/.github/workflows/ci-features-admin.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

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

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-comments.yml
+++ b/.github/workflows/ci-features-comments.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

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

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-conversations.yml
+++ b/.github/workflows/ci-features-conversations.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

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

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-crops.yml
+++ b/.github/workflows/ci-features-crops.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

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

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-gardens.yml
+++ b/.github/workflows/ci-features-gardens.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

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

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-harvests.yml
+++ b/.github/workflows/ci-features-harvests.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

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

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-home.yml
+++ b/.github/workflows/ci-features-home.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

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

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-members.yml
+++ b/.github/workflows/ci-features-members.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

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

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-places.yml
+++ b/.github/workflows/ci-features-places.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

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

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-plantings.yml
+++ b/.github/workflows/ci-features-plantings.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

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

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-posts.yml
+++ b/.github/workflows/ci-features-posts.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

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

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-seeds.yml
+++ b/.github/workflows/ci-features-seeds.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

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

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features-timeline.yml
+++ b/.github/workflows/ci-features-timeline.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

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

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci-features.yml
+++ b/.github/workflows/ci-features.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '12'
+          node-version: '24'

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

      - name: Upload screenshots
        if: failure()
-        uses: actions/upload-artifact@v5
+        uses: actions/upload-artifact@v7
        with:
          name: screenshots
          path: tmp/screenshots
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -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
@@ -108,23 +108,5 @@ jobs:
        run: bundle exec rails db:prepare


-      - name: Run rspec (lib)
-        run: bundle exec rspec spec/lib/ -fd --fail-fast
-
-      - name: Run rspec (services)
-        run: bundle exec rspec spec/services/ -fd --fail-fast
-
-      - name: Run rspec (models)
-        run: bundle exec rspec spec/models/ -fd --fail-fast
-
-      - name: Run rspec (controllers)
-        run: bundle exec rspec spec/controllers/ -fd --fail-fast
-
-      - name: Run rspec (views)
-        run: bundle exec rspec spec/views/ -fd --fail-fast
-
-      - name: Run rspec (routing)
-        run: bundle exec rspec spec/routing/ -fd --fail-fast
-
-      - name: Run rspec (request)
-        run: bundle exec rspec spec/requests/ -fd --fail-fast
+      - name: Run tests with test-queue
+        run: bundle exec test-queue rspec spec -fd
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -6,21 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: TreatCommentsAsGroupSeparators, ConsiderPunctuation.
-Bundler/OrderedGems:
-  Exclude:
-    - 'Gemfile'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: have_no, not_to
-Capybara/NegationMatcher:
-  Exclude:
-    - 'spec/features/admin/reverting_crops_spec.rb'
-
 # Offense count: 19
 Capybara/NegationMatcherAfterVisit:
  Exclude:
@@ -33,22 +18,6 @@ Capybara/NegationMatcherAfterVisit:
    - 'spec/features/members/profile_spec.rb'
    - 'spec/features/plantings/planting_a_crop_spec.rb'

-# Offense count: 34
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: DefaultSelector.
-Capybara/RSpec/HaveSelector:
-  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/plantings/planting_a_crop_spec.rb'
-    - 'spec/features/seeds/adding_seeds_spec.rb'
-    - 'spec/features/shared_examples/crop_suggest.rb'
-    - 'spec/support/feature_helpers.rb'
-    - 'spec/views/posts/show.html.haml_spec.rb'
-
 # Offense count: 14
 Capybara/SpecificMatcher:
  Exclude:
@@ -94,19 +63,6 @@ FactoryBot/ExcessiveCreateList:
    - 'spec/features/crops/show_spec.rb'
    - 'spec/features/percy/percy_spec.rb'

-# Offense count: 1158
-# This cop supports unsafe autocorrection (--autocorrect-all).
-FactoryBot/SyntaxMethods:
-  Enabled: false
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
-Layout/EmptyLinesAroundClassBody:
-  Exclude:
-    - 'db/migrate/20251130035700_create_versions.rb'
-
 # Offense count: 312
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
@@ -125,25 +81,6 @@ Layout/HashAlignment:
    - 'spec/requests/api/v1/activities_request_spec.rb'
    - 'spec/requests/api/v1/members_request_spec.rb'

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

-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'Gemfile'
-    - 'app/helpers/crops_helper.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Lint/AmbiguousOperatorPrecedence:
@@ -207,18 +136,6 @@ Lint/DuplicateMethods:
  Exclude:
    - 'app/models/planting.rb'

-# Offense count: 8
-# Configuration parameters: AllowComments, AllowEmptyLambdas.
-Lint/EmptyBlock:
-  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'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Lint/RedundantCopDisableDirective:
@@ -325,12 +242,6 @@ 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
@@ -382,14 +293,6 @@ RSpec/EmptyLineAfterExample:
 RSpec/ExampleLength:
  Max: 27

-# Offense count: 1
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: method_call, block
-RSpec/ExpectChange:
-  Exclude:
-    - 'spec/models/crop_spec.rb'
-
 # Offense count: 32
 RSpec/ExpectInHook:
  Exclude:
@@ -569,23 +472,6 @@ RSpec/VerifiedDoubles:
    - 'spec/controllers/gardens_controller_spec.rb'
    - 'spec/views/devise/shared/_links_spec.rb'

-# Offense count: 7
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: ResponseMethods.
-# ResponseMethods: response, last_response
-RSpecRails/HaveHttpStatus:
-  Exclude:
-    - 'spec/controllers/api/v1/plantings_controller_spec.rb'
-    - 'spec/controllers/harvests_controller_spec.rb'
-    - 'spec/controllers/likes_controller_spec.rb'
-    - 'spec/requests/harvests_spec.rb'
-
-# Offense count: 17
-# This cop supports unsafe autocorrection (--autocorrect-all).
-# Configuration parameters: Inferences.
-RSpecRails/InferredSpecType:
-  Enabled: false
-
 # Offense count: 30
 # Configuration parameters: Database.
 # SupportedDatabases: mysql, postgresql
@@ -692,12 +578,6 @@ Rails/RakeEnvironment:
    - 'lib/tasks/i18n.rake'
    - 'lib/tasks/testing.rake'

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Rails/RedirectBackOrTo:
-  Exclude:
-    - 'app/controllers/follows_controller.rb'
-
 # Offense count: 9
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedReceivers.
@@ -711,7 +591,6 @@ Rails/RedundantActiveRecordAllMethod:
    - 'app/controllers/scientific_names_controller.rb'
    - 'spec/features/members/deletion_spec.rb'
    - 'spec/features/percy/percy_spec.rb'
-    - 'spec/models/harvest_spec.rb'

 # Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -793,12 +672,6 @@ Rails/WhereEquals:
    - 'app/models/harvest.rb'
    - 'app/models/planting.rb'

-# 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:
@@ -855,13 +728,6 @@ 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:
-  Enabled: false
-
 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/GlobalStdStream:
--- a/5
+++ b/5
@@ -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
@@ -196,6 +196,7 @@ group :test do
  gem 'rails-controller-testing'
  gem "rspec-rebound"
  gem 'selenium-webdriver'
+  gem 'test-queue'
  gem 'timecop'
  gem 'vcr'
 end
@@ -204,5 +205,5 @@ gem "i18n_data", "~> 1.1"

 gem "paper_trail", "~> 17.0"

-gem 'sitemap_generator'
 gem 'aws-sdk-s3', '~> 1', '>= 1.114.0'
+gem 'sitemap_generator'
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -116,14 +116,14 @@ GEM
      minitest (>= 5.1, < 6)
      securerandom (>= 0.3)
      tzinfo (~> 2.0, >= 2.0.5)
-    addressable (2.8.9)
+    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.1236.0)
-    aws-sdk-core (3.244.0)
+    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)
@@ -134,21 +134,21 @@ GEM
    aws-sdk-kms (1.123.0)
      aws-sdk-core (~> 3, >= 3.244.0)
      aws-sigv4 (~> 1.5)
-    aws-sdk-s3 (1.219.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.1)
+    axe-core-api (4.11.2)
      dumb_delegator
      ostruct
      virtus
-    axe-core-capybara (4.11.1)
-      axe-core-api (= 4.11.1)
+    axe-core-capybara (4.11.2)
+      axe-core-api (= 4.11.2)
      dumb_delegator
-    axe-core-rspec (4.11.1)
-      axe-core-api (= 4.11.1)
+    axe-core-rspec (4.11.2)
+      axe-core-api (= 4.11.2)
      dumb_delegator
      ostruct
      virtus
@@ -163,7 +163,7 @@ GEM
      erubi (>= 1.0.0)
      rack (>= 0.9.0)
      rouge (>= 1.0.0)
-    bigdecimal (4.1.1)
+    bigdecimal (4.1.2)
    bluecloth (2.2.0)
    bonsai-elasticsearch-rails (7.0.1)
      elasticsearch-model (< 8)
@@ -177,7 +177,7 @@ 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 (13.0.0)
@@ -284,7 +284,7 @@ GEM
    factory_bot_rails (6.5.1)
      factory_bot (~> 6.5)
      railties (>= 6.1.0)
-    faker (3.6.1)
+    faker (3.8.0)
      i18n (>= 1.8.11, < 2)
    faraday (2.14.1)
      faraday-net_http (>= 2.0, < 3.5)
@@ -459,7 +459,7 @@ GEM
    nokogiri (1.19.2-x86_64-linux-gnu)
      racc (~> 1.4)
    oauth (0.5.6)
-    oj (3.16.16)
+    oj (3.17.0)
      bigdecimal (>= 3.0)
      ostruct (>= 0.2)
    omniauth (1.9.2)
@@ -498,11 +498,11 @@ GEM
      date
      stringio
    public_suffix (7.0.5)
-    puma (7.2.0)
+    puma (8.0.0)
      nio4r (~> 2.0)
    query_diet (0.7.3)
    racc (1.8.1)
-    rack (2.2.22)
+    rack (2.2.23)
    rack-cors (2.0.2)
      rack (>= 2.0.0)
    rack-protection (3.2.0)
@@ -560,7 +560,7 @@ GEM
      zeitwerk (~> 2.6)
    rainbow (3.1.1)
    raindrops (0.20.1)
-    rake (13.3.1)
+    rake (13.4.2)
    rb-fsevent (0.11.2)
    rb-inotify (0.11.1)
      ffi (~> 1.0)
@@ -682,7 +682,7 @@ GEM
      sprockets (> 3.0)
      sprockets-rails
      tilt
-    scout_apm (6.1.1)
+    scout_apm (6.2.0)
      parser
    searchkick (5.3.1)
      activemodel (>= 6.1)
@@ -719,10 +719,11 @@ GEM
      unicode-display_width (>= 1.1.1, < 4)
    terser (1.2.7)
      execjs (>= 0.3.0, < 3)
+    test-queue (0.11.1)
    thor (1.5.0)
    thread_safe (0.3.6)
    tilt (2.7.0)
-    timecop (0.9.10)
+    timecop (0.9.11)
    timeout (0.5.0)
    tsort (0.2.0)
    tzinfo (2.0.6)
@@ -759,7 +760,8 @@ GEM
    will_paginate (4.0.1)
    will_paginate-bootstrap-style (0.3.0)
      will_paginate (~> 4.0, >= 4.0.0)
-    xmlrpc (0.3.3)
+    xmlrpc (0.3.4)
+      rexml
      webrick
    xpath (3.2.0)
      nokogiri (~> 1.8)
@@ -872,6 +874,7 @@ DEPENDENCIES
  sitemap_generator
  sprockets (< 4)
  terser
+  test-queue
  timecop
  unicorn
  validate_url
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -160,7 +160,7 @@ class CropsController < ApplicationController
             when 'youtube'
               Crop.approved.where(en_youtube_url: [nil, '']).order(plantings_count: :desc)
             when 'alternate_names'
-               Crop.approved.left_joins(:alternate_names).where(alternate_names: { id: nil }).order(plantings_count: :desc)
+               Crop.approved.where.missing(:alternate_names).order(plantings_count: :desc)
             when 'wikidata'
               crops_with_wikidata = Crop.joins(:scientific_names).where.not(scientific_names: { wikidata_id: nil }).distinct
               Crop.approved.where.not(id: crops_with_wikidata).order(plantings_count: :desc)
--- a/app/controllers/follows_controller.rb
+++ b/app/controllers/follows_controller.rb
@@ -17,7 +17,7 @@ class FollowsController < ApplicationController
    else
      flash[:error] = "Already following or error while following."
    end
-    redirect_back fallback_location: root_path
+    redirect_back_or_to(root_path)
  end

  def destroy
--- a/app/helpers/crops_helper.rb
+++ b/app/helpers/crops_helper.rb
@@ -62,7 +62,7 @@ module CropsHelper
            '@type': 'Person',
            name: post.author.login_name
          },
-          'datePublished': post.created_at 
+          'datePublished': post.created_at
        }
      end

--- a/app/views/crops/_nutritional_data.html.haml
+++ b/app/views/crops/_nutritional_data.html.haml
@@ -35,4 +35,4 @@
              %th Sodium
              %td= "#{data.sodium_na_mg.to_f.round(1)} mg"
    .card-footer
-      = link_to "See more", "https://afcd.foodstandards.gov.au/fooddetails.aspx?PFKID=#{data.public_food_key}", target: "_blank", rel: "noopener noreferrer"
+      = link_to "See more", "https://www.foodstandards.gov.au/science-data/food-nutrient-databases/afcd/search/food/#{data.public_food_key}", target: "_blank", rel: "noopener noreferrer"
--- a/app/views/home/_harvests.html.haml
+++ b/app/views/home/_harvests.html.haml
@@ -9,4 +9,5 @@
          %small.text-muted
            harvested by #{harvest.owner_login_name}
        %p.mb-2
-          = image_tag harvest.thumbnail_url, width: 75, class: 'rounded shadow', alt: "Image of #{harvest.crop_name} by #{harvest.owner}"
+          - if harvest.thumbnail_url
+            = image_tag harvest.thumbnail_url, width: 75, class: 'rounded shadow', alt: "Image of #{harvest.crop_name} by #{harvest.owner}"
--- a/config/initializers/new_framework_defaults_6_0.rb
+++ b/config/initializers/new_framework_defaults_6_0.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 #
 # This file contains migration options to ease your Rails 6.0 upgrade.
--- a/db/migrate/20171022032108_all_the_predictions.rb
+++ b/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
--- a/db/migrate/20190712003735_add_like_counter_caches.rb
+++ b/db/migrate/20190712003735_add_like_counter_caches.rb
@@ -14,23 +14,23 @@ class AddLikeCounterCaches < ActiveRecord::Migration[5.2]
  end

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

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

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

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

  def set_counter_value
-    execute <<-SQL.squish
+    execute <<~SQL.squish
      UPDATE posts
         SET comments_count = (
           SELECT count(1)
--- a/db/migrate/20200801084007_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb
+++ b/db/migrate/20200801084007_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This migration comes from active_storage (originally 20180723000244)
 class AddForeignKeyConstraintToActiveStorageAttachmentsForBlobId < ActiveRecord::Migration[6.0]
  def up
--- a/db/migrate/20240101010101_add_fields_to_crops.rb
+++ b/db/migrate/20240101010101_add_fields_to_crops.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddFieldsToCrops < ActiveRecord::Migration[5.2]
  def change
    add_column :crops, :row_spacing, :integer
--- a/db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb
+++ b/db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class PopulateCropFieldsFromOpenfarmData < ActiveRecord::Migration[5.2]
  def up
    Crop.find_each do |crop|
--- a/db/migrate/20240716120000_add_social_media_to_members.rb
+++ b/db/migrate/20240716120000_add_social_media_to_members.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddSocialMediaToMembers < ActiveRecord::Migration[6.0]
  def change
    add_column :members, :website_url, :string
--- a/db/migrate/20240716120001_rename_other_handle_to_other_url_in_members.rb
+++ b/db/migrate/20240716120001_rename_other_handle_to_other_url_in_members.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class RenameOtherHandleToOtherUrlInMembers < ActiveRecord::Migration[6.0]
  def change
    rename_column :members, :other_handle, :other_url
--- a/db/migrate/20240929041435_create_garden_collaborators.rb
+++ b/db/migrate/20240929041435_create_garden_collaborators.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateGardenCollaborators < ActiveRecord::Migration[7.2]
  def change
    create_table :garden_collaborators do |t|
--- a/db/migrate/20241129215300_create_australian_food_classification_data.rb
+++ b/db/migrate/20241129215300_create_australian_food_classification_data.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateAustralianFoodClassificationData < ActiveRecord::Migration[5.2]
  def change
    create_table :australian_food_classification_data do |t|
--- a/db/migrate/20250810120000_make_notifications_polymorphic.rb
+++ b/db/migrate/20250810120000_make_notifications_polymorphic.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class MakeNotificationsPolymorphic < ActiveRecord::Migration[6.1]
  def change
    add_column :notifications, :notifiable_type, :string
--- a/db/migrate/20250824081313_change_comments_polymorphic.rb
+++ b/db/migrate/20250824081313_change_comments_polymorphic.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class ChangeCommentsPolymorphic < ActiveRecord::Migration[7.2]
  def change
    add_column :comments, :commentable_type, :string
--- a/db/migrate/20250824085224_add_photos_comment_count.rb
+++ b/db/migrate/20250824085224_add_photos_comment_count.rb
@@ -11,7 +11,7 @@ class AddPhotosCommentCount < ActiveRecord::Migration[7.2]
  end

  def set_counter_value
-    execute <<-SQL.squish
+    execute <<~SQL.squish
      UPDATE photos
         SET comments_count = (
           SELECT count(1)
--- a/db/migrate/20250901105232_add_source_to_seeds.rb
+++ b/db/migrate/20250901105232_add_source_to_seeds.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddSourceToSeeds < ActiveRecord::Migration[7.2]
  def change
    add_column :seeds, :source, :string
--- a/db/migrate/20250901110545_add_indexes_crops.rb
+++ b/db/migrate/20250901110545_add_indexes_crops.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddIndexesCrops < ActiveRecord::Migration[7.2]
  def change
    add_index :alternate_names, :crop_id
--- a/db/migrate/20250901130830_add_overall_rating_plantings.rb
+++ b/db/migrate/20250901130830_add_overall_rating_plantings.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddOverallRatingPlantings < ActiveRecord::Migration[7.2]
  def change
    add_column :plantings, :overall_rating, :integer
--- a/db/migrate/20251128193317_add_en_youtube_url_to_crops.rb
+++ b/db/migrate/20251128193317_add_en_youtube_url_to_crops.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddEnYoutubeUrlToCrops < ActiveRecord::Migration[7.2]
  def change
    add_column :crops, :en_youtube_url, :string
--- a/db/migrate/20251130035700_create_versions.rb
+++ b/db/migrate/20251130035700_create_versions.rb
@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 # This migration creates the `versions` table for the Version class.
 # All other migrations PT provides are optional.
 class CreateVersions < ActiveRecord::Migration[7.2]
-
  # The largest text column available in all supported RDBMS is
  # 1024^3 - 1 bytes, roughly one gibibyte.  We specify a size
  # so that MySQL will use `longtext` instead of `text`.  Otherwise,
--- a/db/migrate/20251130035701_add_object_changes_to_versions.rb
+++ b/db/migrate/20251130035701_add_object_changes_to_versions.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This migration adds the optional `object_changes` column, in which PaperTrail
 # will store the `changes` diff for each update event. See the readme for
 # details.
--- a/db/migrate/20251130053104_add_public_food_key_to_crops.rb
+++ b/db/migrate/20251130053104_add_public_food_key_to_crops.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddPublicFoodKeyToCrops < ActiveRecord::Migration[5.2]
  def change
    add_column :crops, :public_food_key, :string
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'

 namespace :import do
--- a/package.json
+++ b/package.json
@@ -14,9 +14,8 @@
    "@coffeelint/cli": "^3.0.0",
    "@percy/cli": "^1.0.0-beta.76",
    "csslint": "^1.0.5",
-    "eslint": "^5.0.0",
-    "eslint-config-google": "^0.9.1",
-    "jshint": "^2.9.4"
+    "eslint": "^10.0.0",
+    "eslint-config-google": "^0.9.1"
  },
  "repository": {
    "type": "git",
--- a/spec/controllers/admin_controller_spec.rb
+++ b/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
--- a/spec/controllers/api/v1/plantings_controller_spec.rb
+++ b/spec/controllers/api/v1/plantings_controller_spec.rb
@@ -2,17 +2,17 @@

 require 'rails_helper'

-RSpec.describe Api::V1::PlantingsController, type: :controller do
+RSpec.describe Api::V1::PlantingsController 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,
@@ -42,11 +42,11 @@ RSpec.describe Api::V1::PlantingsController, type: :controller do

        it { expect(matching_planting).to include('id' => my_planting.id.to_s) }
        it { expect(matching_planting['attributes']).to eq expected_attributes }
-        it { expect(response.status).to eq 200 }
+        it { expect(response).to have_http_status :ok }
      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
@@ -81,7 +81,7 @@ RSpec.describe Api::V1::PlantingsController, type: :controller do

        it { expect(matching_planting).to include('id' => my_planting.id.to_s) }
        it { expect(matching_planting['attributes']).to eq expected_attributes }
-        it { expect(response.status).to eq 200 }
+        it { expect(response).to have_http_status :ok }
      end
    end
  end
--- a/spec/controllers/authentications_controller_spec.rb
+++ b/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',
--- a/spec/controllers/charts/crops_controller_spec.rb
+++ b/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 } }
--- a/spec/controllers/charts/gardens_controller_spec.rb
+++ b/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 } }
--- a/spec/controllers/comments_controller_spec.rb
+++ b/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
--- a/spec/controllers/crops_controller_spec.rb
+++ b/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) }
--- a/spec/controllers/garden_types_controller_spec.rb
+++ b/spec/controllers/garden_types_controller_spec.rb
@@ -2,11 +2,11 @@

 require 'rails_helper'

-RSpec.describe GardenTypesController, type: :controller do
+RSpec.describe GardenTypesController 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') }
--- a/spec/controllers/gardens_controller_spec.rb
+++ b/spec/controllers/gardens_controller_spec.rb
@@ -2,12 +2,12 @@

 require 'rails_helper'

-RSpec.describe GardensController, type: :controller do
+RSpec.describe GardensController do
  include Devise::Test::ControllerHelpers

  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') }
--- a/spec/controllers/harvests_controller_spec.rb
+++ b/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 }

@@ -51,7 +51,7 @@ describe HarvestsController, :search do
    describe "generates a csv" do
      before { get :index, format: "csv" }

-      it { expect(response.status).to eq 200 }
+      it { expect(response).to have_http_status :ok }
    end
  end

@@ -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
--- a/spec/controllers/home_controller_spec.rb
+++ b/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
--- a/spec/controllers/likes_controller_spec.rb
+++ b/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 }

@@ -19,10 +19,7 @@ describe LikesController do
    it { JSON.parse(response.body)["description"] == "1 like" }

    describe "Liking someone else's post" do
-      it { expect(response.code).to eq('201') }
-    end
-
-    describe "Liking your own post" do
+      it { expect(response).to have_http_status(:created) }
    end
  end

@@ -32,14 +29,14 @@ describe LikesController do
    it { expect(response.content_type).to eq "application/json; charset=utf-8" }

    describe "un-liking something i liked before" do
-      it { expect(response.code).to eq('200') }
+      it { expect(response).to have_http_status(:ok) }
      it { JSON.parse(response.body)["description"] == "0 likes" }
    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 { expect(response).to have_http_status(:forbidden) }
      it { JSON.parse(response.body)["error"] == "Unable to like" }
    end
  end
--- a/spec/controllers/member_controller_spec.rb
+++ b/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
--- a/spec/controllers/photo_associations_controller_spec.rb
+++ b/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
--- a/spec/controllers/photos_controller_spec.rb
+++ b/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
--- a/spec/controllers/places_controller_spec.rb
+++ b/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
--- a/spec/controllers/plant_parts_controller_spec.rb
+++ b/spec/controllers/plant_parts_controller_spec.rb
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-require 'rails_helper'
-
-describe PlantPartsController do
-end
--- a/spec/controllers/plantings_controller_spec.rb
+++ b/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 } }
--- a/spec/controllers/posts_controller_spec.rb
+++ b/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
--- a/spec/controllers/registrations_controller_spec.rb
+++ b/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
--- a/spec/controllers/scientific_names_controller_spec.rb
+++ b/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 }
--- a/spec/controllers/seeds_controller_spec.rb
+++ b/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
--- a/spec/factories/crop_companions.rb
+++ b/spec/factories/crop_companions.rb
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-FactoryBot.define do
-  factory :crop_companion do
-  end
-end
--- a/spec/factories/garden_collaborators.rb
+++ b/spec/factories/garden_collaborators.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
  factory :garden_collaborator do
    garden
--- a/spec/features/activities/creating_a_recurring_activity_spec.rb
+++ b/spec/features/activities/creating_a_recurring_activity_spec.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rails_helper'

 RSpec.feature 'Creating a recurring activity' do
--- a/spec/features/admin/reverting_crops_spec.rb
+++ b/spec/features/admin/reverting_crops_spec.rb
@@ -32,7 +32,7 @@ RSpec.feature 'Reverting crops' do

    scenario 'Member cannot revert a crop' do
      visit admin_crops_path
-      expect(page).not_to have_link('Revert')
+      expect(page).to have_no_link('Revert')
    end
  end
 end
--- a/spec/features/conversations/index_spec.rb
+++ b/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'
--- a/spec/features/crops/browse_crops_spec.rb
+++ b/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
--- a/spec/features/crops/crop_detail_page_spec.rb
+++ b/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' }
--- a/spec/features/crops/crop_photos_spec.rb
+++ b/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
--- a/spec/features/crops/delete_crop_spec.rb
+++ b/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'
--- a/spec/features/crops/show_spec.rb
+++ b/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
--- a/spec/features/footer_spec.rb
+++ b/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
--- a/spec/features/gardens/actions_spec.rb
+++ b/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
--- a/spec/features/gardens/adding_gardens_spec.rb
+++ b/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
--- a/spec/features/gardens/index_spec.rb
+++ b/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' }
--- a/spec/features/harvests/harvesting_a_crop_spec.rb
+++ b/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
--- a/spec/features/home/home_spec.rb
+++ b/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
--- a/spec/features/likeable_spec.rb
+++ b/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 }
--- a/spec/features/locale_spec.rb
+++ b/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
--- a/spec/features/members/ban_spec.rb
+++ b/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'
--- a/spec/features/members/deletion_spec.rb
+++ b/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)
--- a/spec/features/members/list_spec.rb
+++ b/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
--- a/spec/features/members/profile_spec.rb
+++ b/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
--- a/spec/features/percy/percy_spec.rb
+++ b/spec/features/percy/percy_spec.rb
@@ -2,30 +2,30 @@

 require 'rails_helper'

-describe 'Test with visual testing', :js, type: :feature do
+describe 'Test with visual testing', :js do
  # Use the same random seed every time so our random data is the same
  # 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
--- a/spec/features/photos/new_photo_spec.rb
+++ b/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)
--- a/spec/features/planting_reminder_spec.rb
+++ b/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" }
--- a/spec/features/plantings/planting_a_crop_spec.rb
+++ b/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:'
--- a/spec/features/plantings/prediction_spec.rb
+++ b/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

--- a/spec/features/plantings/show_spec.rb
+++ b/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? ' }

--- a/spec/features/seeds/adding_seeds_spec.rb
+++ b/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
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Daniel O'Connor	9c4238e601	Merge branch 'dev' into feature-use-test-queue	2026-04-26 02:03:56 +09:30
Daniel O'Connor	bbe75df0ad	Merge pull request #4550 from Growstuff/Style/FrozenStringLiteralComment Rubocop: Style/FrozenStringLiteralComment	2026-04-24 08:41:23 +09:30
Daniel O'Connor	279cc88162	Update growstuff_markdown_spec.rb	2026-04-24 00:15:18 +09:30
Daniel O'Connor	fe4dd5c185	Merge pull request #4549 from Growstuff/Rails/WhereMissing Rubocop: Rails/WhereMissing	2026-04-24 00:13:37 +09:30
Daniel O'Connor	75a2ec89e0	Merge branch 'dev' into feature-use-test-queue	2026-04-24 00:02:00 +09:30
Daniel O'Connor	d625eb2dbd	Rubocop: Style/FrozenStringLiteralComment	2026-04-23 14:30:02 +00:00
Daniel O'Connor	2019d0e952	Rubocop: Rails/WhereMissing	2026-04-23 14:27:10 +00:00
Daniel O'Connor	e7659a75a4	Merge pull request #4548 from Growstuff/RSpecRails/HaveHttpStatus Rubocop: RSpecRails/HaveHttpStatus	2026-04-23 23:52:40 +09:30
Daniel O'Connor	4a66bdc9fe	Merge pull request #4546 from Growstuff/Rails/RedundantActiveRecordAllMethod Rubocop: Rails/RedundantActiveRecordAllMethod	2026-04-23 23:46:39 +09:30
Daniel O'Connor	8de6b083f9	Rubocop: RSpecRails/HaveHttpStatus	2026-04-23 14:13:47 +00:00
Daniel O'Connor	accab7f84c	Merge pull request #4545 from Growstuff/RSpecRails/InferredSpecType Rubocop: RSpecRails/InferredSpecType	2026-04-23 23:29:17 +09:30
Daniel O'Connor	3f6dd59dfa	Rubocop: Rails/RedundantActiveRecordAllMethod	2026-04-23 13:48:17 +00:00
Daniel O'Connor	0a71b44dea	Merge pull request #4542 from Growstuff/RSpec/ContextMethod Rubocop: RSpec/ContextMethod	2026-04-23 23:10:33 +09:30
Daniel O'Connor	ba75afb3f5	Rubocop: RSpecRails/InferredSpecType	2026-04-23 13:39:46 +00:00
Daniel O'Connor	aa1c9ceb05	Merge pull request #4543 from Growstuff/RSpec/ExpectChange Rubocop: RSpec/ExpectChange	2026-04-23 23:02:03 +09:30
Daniel O'Connor	ea5f93f929	Merge pull request #4541 from Growstuff/Lint/EmptyBlock Rubocop: Lint/EmptyBlock	2026-04-23 22:53:40 +09:30
Daniel O'Connor	6f59635ca7	Rubocop: RSpec/ExpectChange	2026-04-23 13:23:14 +00:00
Daniel O'Connor	6736ae3142	Rubocop: RSpec/ContextMethod	2026-04-23 13:20:47 +00:00
Daniel O'Connor	8d8ee7069c	Merge pull request #4540 from Growstuff/Bundler/OrderedGems Rubocop: Bundler/OrderedGems	2026-04-23 22:46:10 +09:30
Daniel O'Connor	5d112e9134	Rubocop: Capybara/RSpec/HaveSelector (#4539 ) * Rubocop: Capybara/RSpec/HaveSelector * Rubocop: Capybara/RSpec/HaveSelector	2026-04-23 22:45:58 +09:30
Daniel O'Connor	6ba4f39b4a	Rubocop: Lint/EmptyBlock	2026-04-23 13:14:39 +00:00
Daniel O'Connor	a38d99ed4a	Rubocop: Bundler/OrderedGems	2026-04-23 13:07:38 +00:00
Daniel O'Connor	f1acb35520	Merge pull request #4537 from Growstuff/FactoryBot/SyntaxMethods Rubocop: FactoryBot/SyntaxMethods	2026-04-23 22:29:24 +09:30
Daniel O'Connor	267560aff1	Merge pull request #4494 from Growstuff/dependabot/bundler/puma-8.0.0 Bump puma from 7.2.0 to 8.0.0	2026-04-23 22:26:31 +09:30
dependabot[bot]	e862a5c5b8	Bump puma from 7.2.0 to 8.0.0 Bumps [puma](https://github.com/puma/puma) from 7.2.0 to 8.0.0. - [Release notes](https://github.com/puma/puma/releases) - [Changelog](https://github.com/puma/puma/blob/main/History.md) - [Commits](https://github.com/puma/puma/compare/v7.2.0...v8.0.0) --- updated-dependencies: - dependency-name: puma dependency-version: 8.0.0 dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-23 12:47:21 +00:00
Daniel O'Connor	c0edfb9eed	Merge pull request #4536 from Growstuff/Capybara/NegationMatcher Rubocop: Capybara/NegationMatcher	2026-04-23 22:15:53 +09:30
Daniel O'Connor	a8d0c6e32e	Rubocop: Layout/TrailingWhitespace (#4535 )	2026-04-23 22:15:42 +09:30
Daniel O'Connor	f381ba29cc	Merge pull request #4534 from Growstuff/Layout/HeredocIndentation Rubocop: Layout/HeredocIndentation	2026-04-23 22:07:41 +09:30
Daniel O'Connor	c1f171b09e	Rubocop: Capybara/NegationMatcher	2026-04-23 12:30:06 +00:00
Daniel O'Connor	b9dcd95c00	Rubocop: Layout/TrailingWhitespace	2026-04-23 12:27:06 +00:00
Daniel O'Connor	400db178e4	Merge pull request #4533 from Growstuff/Rails/RedirectBackOrTo Rubocop: Rails/RedirectBackOrTo	2026-04-23 21:54:19 +09:30
Daniel O'Connor	aecde837cc	Merge pull request #4459 from Growstuff/dependabot/github_actions/actions/upload-artifact-7 Bump actions/upload-artifact from 5 to 7	2026-04-23 21:52:13 +09:30
Daniel O'Connor	316351fb1c	Merge pull request #4532 from Growstuff/Layout/IndentationWidth Rubocop: Layout/IndentationWidth	2026-04-23 21:51:15 +09:30
Daniel O'Connor	34ce4e216f	Merge pull request #4531 from Growstuff/EmptyLinesAroundClassBody Rubocop: Layout/EmptyLinesAroundClassBody	2026-04-23 21:49:49 +09:30
Daniel O'Connor	7b8c7f4ff5	Rubocop: Rails/RedirectBackOrTo	2026-04-23 12:15:30 +00:00
Daniel O'Connor	6fe9f7f5d3	Merge pull request #4530 from Growstuff/drop-jshint Drop jshint	2026-04-23 21:40:46 +09:30
Daniel O'Connor	ae5c125a96	Rubocop: Layout/IndentationWidth	2026-04-23 12:10:09 +00:00
Daniel O'Connor	8a70156b61	Rubocop: Layout/EmptyLinesAroundClassBody	2026-04-23 12:07:56 +00:00
dependabot[bot]	f1fde20500	Bump actions/upload-artifact from 5 to 7 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5 to 7. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v5...v7) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-23 12:05:35 +00:00
Daniel O'Connor	d32d28c5de	Merge branch 'dev' of https://github.com/Growstuff/growstuff into drop-jshint	2026-04-23 11:59:08 +00:00
Daniel O'Connor	ed884c5ac6	Merge pull request #4527 from Growstuff/eslint-10 ESLint 10	2026-04-23 21:26:35 +09:30
Daniel O'Connor	84d61a7596	Merge pull request #4529 from Growstuff/eslint-9 ESLint 9	2026-04-23 21:26:22 +09:30
Daniel O'Connor	181431ce94	Merge pull request #4528 from Growstuff/eslint-8 ESLint 8	2026-04-23 21:26:14 +09:30
Daniel O'Connor	da73548695	Drop jshint	2026-04-23 11:48:07 +00:00
Daniel O'Connor	3e95581c06	Merge pull request #4526 from Growstuff/eslint Eslint 7	2026-04-23 21:14:09 +09:30
Daniel O'Connor	37ce3d28aa	ESLint 10	2026-04-23 11:42:44 +00:00
Daniel O'Connor	b7bf5d932a	ESLint 9	2026-04-23 11:41:27 +00:00
Daniel O'Connor	247106d10f	ESLint 8	2026-04-23 11:40:03 +00:00
Daniel O'Connor	39534eab02	eslint 7	2026-04-23 11:36:16 +00:00
Daniel O'Connor	076ba9844a	Merge pull request #4525 from Growstuff/eslint Upgrade eslint	2026-04-23 21:00:29 +09:30
Daniel O'Connor	727c754499	Upgrade eslint	2026-04-23 11:23:16 +00:00
Daniel O'Connor	ce17ec1620	Merge pull request #4522 from Growstuff/node-24 Node 24	2026-04-23 20:13:50 +09:30
Daniel O'Connor	9500de3815	Merge pull request #4521 from Growstuff/node-22 Node 22	2026-04-23 20:10:20 +09:30
Daniel O'Connor	d89e284c3a	Merge pull request #4516 from Growstuff/upgrade-eslint Bump eslint	2026-04-23 20:09:46 +09:30
Daniel O'Connor	4e7a719787	Merge pull request #4520 from Growstuff/node-20 Node 20	2026-04-23 20:04:37 +09:30
Daniel O'Connor	40e402d06a	Merge pull request #4519 from Growstuff/node-18 Node 18	2026-04-23 20:04:25 +09:30
Daniel O'Connor	5cada51fad	Node 24	2026-04-23 10:31:28 +00:00
Daniel O'Connor	b1c1955ed3	Merge branch 'dev' into upgrade-eslint	2026-04-23 19:59:27 +09:30
Daniel O'Connor	4fbdd2a92b	Merge pull request #4518 from Growstuff/node-16 Node 16	2026-04-23 19:58:16 +09:30
Daniel O'Connor	3379526be3	Node 22	2026-04-23 10:27:01 +00:00
Daniel O'Connor	6d2a5884cb	Node 20	2026-04-23 10:24:31 +00:00
Daniel O'Connor	2971bd61dd	Node 18	2026-04-23 10:23:06 +00:00
Daniel O'Connor	3553165ebe	Node 16	2026-04-23 10:20:50 +00:00
Daniel O'Connor	410ee0050f	Merge branch 'dev' into upgrade-eslint	2026-04-23 19:47:15 +09:30
Daniel O'Connor	6ba21bd280	Merge pull request #4517 from Growstuff/node-14 Node 14	2026-04-23 19:46:54 +09:30
Daniel O'Connor	96d290d3fe	Node 14	2026-04-23 10:10:16 +00:00
Daniel O'Connor	a24548defb	Bump eslint	2026-04-23 09:59:45 +00:00
Daniel O'Connor	5493ecfc5e	Merge pull request #4515 from Growstuff/lodash Bump jshint	2026-04-23 19:28:01 +09:30
Daniel O'Connor	b21111e4ce	Merge pull request #4514 from Growstuff/bump-addressable Bump addressable	2026-04-23 19:25:27 +09:30
Daniel O'Connor	702ec2c47c	Merge pull request #4513 from Growstuff/bump-rack Bump rack	2026-04-23 19:24:17 +09:30
Daniel O'Connor	742bc12c89	Upgrade jshint	2026-04-23 09:50:54 +00:00
Daniel O'Connor	27b552aa8e	Bump addressable	2026-04-23 09:42:43 +00:00
Daniel O'Connor	5cb6d8afba	Bump rack	2026-04-23 09:41:56 +00:00
Daniel O'Connor	0729e07e55	Merge pull request #4511 from Growstuff/dependabot/bundler/bullet-8.1.1 Bump bullet from 8.1.0 to 8.1.1	2026-04-23 19:06:41 +09:30
Daniel O'Connor	28997f6053	Merge pull request #4512 from Growstuff/dependabot/bundler/aws-sdk-s3-1.220.0 Bump aws-sdk-s3 from 1.219.0 to 1.220.0	2026-04-23 19:06:31 +09:30
dependabot[bot]	732604d507	Bump aws-sdk-s3 from 1.219.0 to 1.220.0 Bumps [aws-sdk-s3](https://github.com/aws/aws-sdk-ruby) from 1.219.0 to 1.220.0. - [Release notes](https://github.com/aws/aws-sdk-ruby/releases) - [Changelog](https://github.com/aws/aws-sdk-ruby/blob/version-3/gems/aws-sdk-s3/CHANGELOG.md) - [Commits](https://github.com/aws/aws-sdk-ruby/commits) --- updated-dependencies: - dependency-name: aws-sdk-s3 dependency-version: 1.220.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-23 07:07:01 +00:00
dependabot[bot]	e461fdd27e	Bump bullet from 8.1.0 to 8.1.1 Bumps [bullet](https://github.com/flyerhzm/bullet) from 8.1.0 to 8.1.1. - [Changelog](https://github.com/flyerhzm/bullet/blob/main/CHANGELOG.md) - [Commits](https://github.com/flyerhzm/bullet/compare/8.1.0...8.1.1) --- updated-dependencies: - dependency-name: bullet dependency-version: 8.1.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-23 07:03:51 +00:00
Daniel O'Connor	3b40c28288	Merge pull request #4510 from Growstuff/dependabot/bundler/oj-3.17.0 Bump oj from 3.16.17 to 3.17.0	2026-04-20 17:03:57 +09:30
dependabot[bot]	a50b9dcb2a	Bump oj from 3.16.17 to 3.17.0 Bumps [oj](https://github.com/ohler55/oj) from 3.16.17 to 3.17.0. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.16.17...v3.17.0) --- updated-dependencies: - dependency-name: oj dependency-version: 3.17.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-20 07:18:18 +00:00
Daniel O'Connor	ea0a5bfad4	Merge pull request #4508 from Growstuff/dependabot/bundler/scout_apm-6.2.0 Bump scout_apm from 6.1.1 to 6.2.0	2026-04-17 22:57:03 +09:30
dependabot[bot]	77e3db1924	Bump scout_apm from 6.1.1 to 6.2.0 Bumps [scout_apm](https://github.com/scoutapp/scout_apm_ruby) from 6.1.1 to 6.2.0. - [Changelog](https://github.com/scoutapp/scout_apm_ruby/blob/master/CHANGELOG.markdown) - [Commits](https://github.com/scoutapp/scout_apm_ruby/compare/v6.1.1...v6.2.0) --- updated-dependencies: - dependency-name: scout_apm dependency-version: 6.2.0 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-17 07:37:59 +00:00
Daniel O'Connor	34290be6be	Merge pull request #4507 from Growstuff/dependabot/bundler/faker-3.8.0 Bump faker from 3.7.1 to 3.8.0	2026-04-17 17:06:30 +09:30
Daniel O'Connor	02e0473faa	Merge pull request #4509 from Growstuff/dependabot/bundler/axe-core-rspec-4.11.2 Bump axe-core-rspec from 4.11.1 to 4.11.2	2026-04-17 17:06:14 +09:30
dependabot[bot]	95f7cefe0f	Bump axe-core-rspec from 4.11.1 to 4.11.2 Bumps [axe-core-rspec](https://github.com/dequelabs/axe-core-gems) from 4.11.1 to 4.11.2. - [Release notes](https://github.com/dequelabs/axe-core-gems/releases) - [Changelog](https://github.com/dequelabs/axe-core-gems/blob/v4.11.2/CHANGELOG.md) - [Commits](https://github.com/dequelabs/axe-core-gems/compare/v4.11.1...v4.11.2) --- updated-dependencies: - dependency-name: axe-core-rspec dependency-version: 4.11.2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-17 07:09:39 +00:00
dependabot[bot]	bcf6690a0d	Bump faker from 3.7.1 to 3.8.0 Bumps [faker](https://github.com/faker-ruby/faker) from 3.7.1 to 3.8.0. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v3.7.1...v3.8.0) --- updated-dependencies: - dependency-name: faker dependency-version: 3.8.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-17 07:05:21 +00:00
Daniel O'Connor	734aa4795a	Merge pull request #4505 from Growstuff/dependabot/bundler/rake-13.4.2 Bump rake from 13.4.1 to 13.4.2	2026-04-16 18:56:07 +09:30
dependabot[bot]	3729016770	Bump rake from 13.4.1 to 13.4.2 Bumps [rake](https://github.com/ruby/rake) from 13.4.1 to 13.4.2. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](https://github.com/ruby/rake/compare/v13.4.1...v13.4.2) --- updated-dependencies: - dependency-name: rake dependency-version: 13.4.2 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-16 07:08:45 +00:00
Daniel O'Connor	a37589cdc6	Merge pull request #4504 from Growstuff/dependabot/bundler/faker-3.7.1 Bump faker from 3.6.1 to 3.7.1	2026-04-15 21:16:41 +09:30
dependabot[bot]	e86e834d94	Bump faker from 3.6.1 to 3.7.1 Bumps [faker](https://github.com/faker-ruby/faker) from 3.6.1 to 3.7.1. - [Release notes](https://github.com/faker-ruby/faker/releases) - [Changelog](https://github.com/faker-ruby/faker/blob/main/CHANGELOG.md) - [Commits](https://github.com/faker-ruby/faker/compare/v3.6.1...v3.7.1) --- updated-dependencies: - dependency-name: faker dependency-version: 3.7.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-15 09:06:05 +00:00
Daniel O'Connor	c73c435d01	Merge pull request #4500 from Growstuff/dependabot/bundler/timecop-0.9.11 Bump timecop from 0.9.10 to 0.9.11	2026-04-15 18:35:01 +09:30
Daniel O'Connor	0375299ec8	Merge pull request #4499 from Growstuff/dependabot/bundler/oj-3.16.17 Bump oj from 3.16.16 to 3.16.17	2026-04-15 18:34:49 +09:30
Daniel O'Connor	27fe8d58dd	Merge pull request #4501 from Growstuff/dependabot/bundler/xmlrpc-0.3.4 Bump xmlrpc from 0.3.3 to 0.3.4	2026-04-15 18:34:36 +09:30
Daniel O'Connor	171792b6fd	Merge pull request #4503 from Growstuff/dependabot/bundler/rake-13.4.1 Bump rake from 13.3.1 to 13.4.1	2026-04-15 18:34:23 +09:30
dependabot[bot]	83eae50449	Bump rake from 13.3.1 to 13.4.1 Bumps [rake](https://github.com/ruby/rake) from 13.3.1 to 13.4.1. - [Release notes](https://github.com/ruby/rake/releases) - [Changelog](https://github.com/ruby/rake/blob/master/History.rdoc) - [Commits](https://github.com/ruby/rake/compare/v13.3.1...v13.4.1) --- updated-dependencies: - dependency-name: rake dependency-version: 13.4.1 dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-15 07:03:18 +00:00
dependabot[bot]	bf65e77700	Bump xmlrpc from 0.3.3 to 0.3.4 Bumps [xmlrpc](https://github.com/ruby/xmlrpc) from 0.3.3 to 0.3.4. - [Release notes](https://github.com/ruby/xmlrpc/releases) - [Changelog](https://github.com/ruby/xmlrpc/blob/master/NEWS.md) - [Commits](https://github.com/ruby/xmlrpc/compare/v0.3.3...v0.3.4) --- updated-dependencies: - dependency-name: xmlrpc dependency-version: 0.3.4 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-13 07:09:10 +00:00
dependabot[bot]	fd3e81a059	Bump timecop from 0.9.10 to 0.9.11 Bumps [timecop](https://github.com/travisjeffery/timecop) from 0.9.10 to 0.9.11. - [Changelog](https://github.com/travisjeffery/timecop/blob/master/History.md) - [Commits](https://github.com/travisjeffery/timecop/compare/v0.9.10...v0.9.11) --- updated-dependencies: - dependency-name: timecop dependency-version: 0.9.11 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-13 07:08:25 +00:00
dependabot[bot]	5ffbcd4e63	Bump oj from 3.16.16 to 3.16.17 Bumps [oj](https://github.com/ohler55/oj) from 3.16.16 to 3.16.17. - [Release notes](https://github.com/ohler55/oj/releases) - [Changelog](https://github.com/ohler55/oj/blob/develop/CHANGELOG.md) - [Commits](https://github.com/ohler55/oj/compare/v3.16.16...v3.16.17) --- updated-dependencies: - dependency-name: oj dependency-version: 3.16.17 dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-13 07:05:35 +00:00
Daniel O'Connor	5d3118f833	Update nutritional data link to new URL	2026-04-11 15:12:18 +09:30
Daniel O'Connor	2073b443fa	Merge pull request #4498 from Growstuff/CloCkWeRX-patch-2 Add conditional rendering for harvest thumbnail image	2026-04-11 14:57:57 +09:30
Daniel O'Connor	55934bcc4a	Add conditional rendering for harvest thumbnail image	2026-04-11 14:57:36 +09:30
google-labs-jules[bot]	bd5769cf4f	feat: Use test-queue to parallelize RSpec tests This change introduces the `test-queue` gem to the project to enable parallel execution of the RSpec test suite. The CI configuration in `.github/workflows/ci.yml` has been updated to use a single `test-queue` command instead of multiple, sequential `rspec` commands. This will help to speed up the CI process by running tests concurrently. The `--fail-fast` option has been removed from the RSpec command, as it is not recommended when running tests in parallel. This ensures that all tests are run, providing a complete picture of the test suite's status.	2025-11-29 03:40:46 +00:00