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

Rubocop: Style/FrozenStringLiteralComment

.github/workflows/ci.yml

@@ -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

.rubocop_todo.yml

@@ -6,13 +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: 19
 Capybara/NegationMatcherAfterVisit:
   Exclude:
@@ -25,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:
@@ -86,11 +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: 312
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
@@ -164,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:
@@ -282,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
@@ -339,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:
@@ -526,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
@@ -662,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).
@@ -744,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:
@@ -806,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:

Gemfile

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

Gemfile.lock

@@ -498,7 +498,7 @@ 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)
@@ -719,6 +719,7 @@ 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)
@@ -873,6 +874,7 @@ DEPENDENCIES
   sitemap_generator
   sprockets (< 4)
   terser
+  test-queue
   timecop
   unicorn
   validate_url

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)

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.

db/migrate/20171022032108_all_the_predictions.rb

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

db/migrate/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

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

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|

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

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

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|

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|

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

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

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

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

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

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

db/migrate/20251130035700_create_versions.rb

@@ -1,3 +1,5 @@
+# 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]

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.

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

lib/tasks/import.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'
 
 namespace :import do

spec/controllers/admin_controller_spec.rb

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

spec/controllers/api/v1/plantings_controller_spec.rb

@@ -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

spec/controllers/authentications_controller_spec.rb

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

spec/controllers/charts/crops_controller_spec.rb

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

spec/controllers/charts/gardens_controller_spec.rb

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

spec/controllers/comments_controller_spec.rb

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

spec/controllers/crops_controller_spec.rb

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

spec/controllers/garden_types_controller_spec.rb

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

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

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

spec/controllers/home_controller_spec.rb

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

spec/controllers/likes_controller_spec.rb

@@ -3,9 +3,9 @@
 require 'rails_helper'
 
 describe LikesController do
-  let(:like)     { FactoryBot.create(:like, member:) }
-  let(:member)   { FactoryBot.create(:member)               }
-  let(:blogpost) { FactoryBot.create(:post)                 }
+  let(:like)     { create(:like, member:) }
+  let(:member)   { create(:member)               }
+  let(:blogpost) { create(:post)                 }
 
   before { sign_in member }
 
@@ -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

spec/controllers/member_controller_spec.rb

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

spec/controllers/photo_associations_controller_spec.rb

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

spec/controllers/photos_controller_spec.rb

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

spec/controllers/places_controller_spec.rb

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

spec/controllers/plant_parts_controller_spec.rb

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

spec/controllers/plantings_controller_spec.rb

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

spec/controllers/posts_controller_spec.rb

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

spec/controllers/registrations_controller_spec.rb

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

spec/controllers/scientific_names_controller_spec.rb

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

spec/controllers/seeds_controller_spec.rb

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

spec/factories/crop_companions.rb

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

spec/factories/garden_collaborators.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 FactoryBot.define do
   factory :garden_collaborator do
     garden

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

spec/features/conversations/index_spec.rb

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

spec/features/crops/browse_crops_spec.rb

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

spec/features/crops/crop_detail_page_spec.rb

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

spec/features/crops/crop_photos_spec.rb

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

spec/features/crops/delete_crop_spec.rb

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

spec/features/crops/show_spec.rb

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

spec/features/footer_spec.rb

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

spec/features/gardens/actions_spec.rb

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

spec/features/gardens/adding_gardens_spec.rb

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

spec/features/gardens/index_spec.rb

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

spec/features/harvests/harvesting_a_crop_spec.rb

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

spec/features/home/home_spec.rb

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

spec/features/likeable_spec.rb

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

spec/features/locale_spec.rb

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

spec/features/members/ban_spec.rb

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

spec/features/members/deletion_spec.rb

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

spec/features/members/list_spec.rb

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

spec/features/members/profile_spec.rb

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

spec/features/percy/percy_spec.rb

@@ -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

spec/features/photos/new_photo_spec.rb

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

spec/features/planting_reminder_spec.rb

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

spec/features/plantings/planting_a_crop_spec.rb

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

spec/features/plantings/prediction_spec.rb

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

spec/features/plantings/show_spec.rb

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

spec/features/seeds/adding_seeds_spec.rb

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

spec/features/seeds/misc_seeds_spec.rb

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

spec/features/seeds/seed_photos_spec.rb

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

spec/features/shared_examples/crop_suggest.rb

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

spec/features/signin_spec.rb

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

spec/features/signout_spec.rb

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

spec/features/timeline/index_spec.rb

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

spec/helpers/application_helper_spec.rb

@@ -13,7 +13,7 @@ describe ApplicationHelper do
   describe '#avatar_uri' do
     context 'with a normal user' do
       before do
-        @member = FactoryBot.build(:member, email: 'example@example.com', preferred_avatar_uri: nil)
+        @member = build(:member, email: 'example@example.com', preferred_avatar_uri: nil)
       end
 
       it 'renders a gravatar uri' do
@@ -27,7 +27,7 @@ describe ApplicationHelper do
 
     context 'with a user who specified a preferred avatar uri' do
       before do
-        @member = FactoryBot.build(:member, email: 'example@example.com', preferred_avatar_uri: 'http://media.catmoji.com/post/ujg/cat-in-hat.jpg')
+        @member = build(:member, email: 'example@example.com', preferred_avatar_uri: 'http://media.catmoji.com/post/ujg/cat-in-hat.jpg')
       end
 
       it 'renders a the specified uri' do

spec/helpers/buttons_helper_spec.rb

@@ -12,13 +12,13 @@ require 'rails_helper'
 #     end
 #   end
 # end
-RSpec.describe ButtonsHelper, type: :helper do
+RSpec.describe ButtonsHelper do
   before { allow(self).to receive(:can?).and_return(true) }
 
-  let(:garden)   { FactoryBot.create(:garden)   }
-  let(:planting) { FactoryBot.create(:planting) }
-  let(:harvest)  { FactoryBot.create(:harvest)  }
-  let(:seed)     { FactoryBot.create(:seed)     }
+  let(:garden)   { create(:garden)   }
+  let(:planting) { create(:planting) }
+  let(:harvest)  { create(:harvest)  }
+  let(:seed)     { create(:seed)     }
 
   describe 'add_photo_button' do
     it { expect(add_photo_button(garden)).to include "/photos/new?id=#{garden.id}&type=garden" }

spec/helpers/event_helper_spec.rb

@@ -2,15 +2,15 @@
 
 require 'rails_helper'
 
-RSpec.describe EventHelper, type: :helper do
+RSpec.describe EventHelper do
   subject { resolve_model(event) }
 
-  let(:planting) { FactoryBot.create(:planting) }
-  let(:harvest) { FactoryBot.create(:harvest) }
-  let(:seed) { FactoryBot.create(:seed) }
-  let(:post) { FactoryBot.create(:post) }
-  let(:comment) { FactoryBot.create(:comment) }
-  let(:photo) { FactoryBot.create(:photo) }
+  let(:planting) { create(:planting) }
+  let(:harvest) { create(:harvest) }
+  let(:seed) { create(:seed) }
+  let(:post) { create(:post) }
+  let(:comment) { create(:comment) }
+  let(:photo) { create(:photo) }
 
   describe 'plantings' do
     let(:event) { OpenStruct.new(id: planting.id, event_type: 'planting') }

spec/helpers/gardens_helper_spec.rb

@@ -5,29 +5,29 @@ require 'rails_helper'
 describe GardensHelper do
   describe "garden description" do
     it "is missing" do
-      garden = FactoryBot.create(:garden,
-                                 description: nil)
+      garden = create(:garden,
+                      description: nil)
       result = helper.display_garden_description(garden)
       expect(result).to eq "no description provided."
     end
 
     it "is less than 130 characters long" do
-      garden = FactoryBot.create(:garden,
-                                 description: 'a' * 20)
+      garden = create(:garden,
+                      description: 'a' * 20)
       result = helper.display_garden_description(garden)
       expect(result).to eq 'a' * 20
     end
 
     it "is 130 characters long" do
-      garden = FactoryBot.create(:garden,
-                                 description: 'a' * 130)
+      garden = create(:garden,
+                      description: 'a' * 130)
       result = helper.display_garden_description(garden)
       expect(result).to eq 'a' * 130
     end
 
     it "is more than 130 characters long" do
-      garden = FactoryBot.create(:garden,
-                                 description: 'a' * 140)
+      garden = create(:garden,
+                      description: 'a' * 140)
       result = helper.display_garden_description(garden)
       expect(result).to eq ('a' * 126) + '...' + ' ' + link_to("Read more", garden_path(garden))
     end
@@ -40,8 +40,8 @@ describe GardensHelper do
     end
 
     it "has 1 planting" do
-      crop = FactoryBot.create(:crop)
-      plantings = [FactoryBot.create(:planting, quantity: 10, crop:)]
+      crop = create(:crop)
+      plantings = [create(:planting, quantity: 10, crop:)]
       result = helper.display_garden_plantings(plantings)
 
       output = '<ul class="plantings"><li>'
@@ -54,11 +54,11 @@ describe GardensHelper do
     it "has 2 plantings" do
       plantings = []
 
-      crop1 = FactoryBot.create(:crop)
-      plantings << FactoryBot.create(:planting, quantity: 10, crop: crop1)
+      crop1 = create(:crop)
+      plantings << create(:planting, quantity: 10, crop: crop1)
 
-      crop2 = FactoryBot.create(:crop)
-      plantings << FactoryBot.create(:planting, quantity: 10, crop: crop2)
+      crop2 = create(:crop)
+      plantings << create(:planting, quantity: 10, crop: crop2)
 
       result = helper.display_garden_plantings(plantings.first(2))
 
@@ -76,14 +76,14 @@ describe GardensHelper do
     it "has 3 plantings" do
       plantings = []
 
-      crop1 = FactoryBot.create(:crop)
-      plantings << FactoryBot.create(:planting, quantity: 10, crop: crop1)
+      crop1 = create(:crop)
+      plantings << create(:planting, quantity: 10, crop: crop1)
 
-      crop2 = FactoryBot.create(:crop)
-      plantings << FactoryBot.create(:planting, quantity: 10, crop: crop2)
+      crop2 = create(:crop)
+      plantings << create(:planting, quantity: 10, crop: crop2)
 
-      crop3 = FactoryBot.create(:crop)
-      plantings << FactoryBot.create(:planting, quantity: 10, crop: crop3)
+      crop3 = create(:crop)
+      plantings << create(:planting, quantity: 10, crop: crop3)
 
       result = helper.display_garden_plantings(plantings.first(2))
 

spec/helpers/harvests_helper_spec.rb

@@ -5,66 +5,66 @@ require 'rails_helper'
 describe HarvestsHelper do
   describe "display_quantity" do
     it "blank" do
-      harvest = FactoryBot.create(:harvest,
-                                  quantity:        nil,
-                                  weight_quantity: nil)
+      harvest = create(:harvest,
+                       quantity:        nil,
+                       weight_quantity: nil)
       result = helper.display_quantity(harvest)
       result.should eq 'not specified'
     end
 
     it '3 individual' do
-      harvest = FactoryBot.create(:harvest,
-                                  quantity:        3,
-                                  unit:            'individual',
-                                  weight_quantity: nil)
+      harvest = create(:harvest,
+                       quantity:        3,
+                       unit:            'individual',
+                       weight_quantity: nil)
       result = helper.display_quantity(harvest)
       result.should eq '3'
     end
 
     it '1 bunch' do
-      harvest = FactoryBot.create(:harvest,
-                                  quantity:        1,
-                                  unit:            'bunch',
-                                  weight_quantity: nil)
+      harvest = create(:harvest,
+                       quantity:        1,
+                       unit:            'bunch',
+                       weight_quantity: nil)
       result = helper.display_quantity(harvest)
       result.should eq '1 bunch'
     end
 
     it '3 bunches' do
-      harvest = FactoryBot.create(:harvest,
-                                  quantity:        3,
-                                  unit:            'bunch',
-                                  weight_quantity: nil)
+      harvest = create(:harvest,
+                       quantity:        3,
+                       unit:            'bunch',
+                       weight_quantity: nil)
       result = helper.display_quantity(harvest)
       result.should eq '3 bunches'
     end
 
     it '3 kg' do
-      harvest = FactoryBot.create(:harvest,
-                                  quantity:        nil,
-                                  unit:            nil,
-                                  weight_quantity: 3,
-                                  weight_unit:     'kg')
+      harvest = create(:harvest,
+                       quantity:        nil,
+                       unit:            nil,
+                       weight_quantity: 3,
+                       weight_unit:     'kg')
       result = helper.display_quantity(harvest)
       result.should eq '3 kg'
     end
 
     it '3 individual weighing 3 kg' do
-      harvest = FactoryBot.create(:harvest,
-                                  quantity:        3,
-                                  unit:            'individual',
-                                  weight_quantity: 3,
-                                  weight_unit:     'kg')
+      harvest = create(:harvest,
+                       quantity:        3,
+                       unit:            'individual',
+                       weight_quantity: 3,
+                       weight_unit:     'kg')
       result = helper.display_quantity(harvest)
       result.should eq '3, weighing 3 kg'
     end
 
     it '3 bunches weighing 3 kg' do
-      harvest = FactoryBot.create(:harvest,
-                                  quantity:        3,
-                                  unit:            'bunch',
-                                  weight_quantity: 3,
-                                  weight_unit:     'kg')
+      harvest = create(:harvest,
+                       quantity:        3,
+                       unit:            'bunch',
+                       weight_quantity: 3,
+                       weight_unit:     'kg')
       result = helper.display_quantity(harvest)
       result.should eq '3 bunches, weighing 3 kg'
     end

spec/helpers/photos_helper_spec.rb

@@ -3,17 +3,17 @@
 require 'rails_helper'
 
 describe PhotosHelper do
-  let(:crop) { FactoryBot.create(:crop) }
-  let(:crop_photo_of) { FactoryBot.create(:photo, source: 'openfarm') }
-  let(:crop_photo_flickr) { FactoryBot.create(:photo, source: 'flickr') }
+  let(:crop) { create(:crop) }
+  let(:crop_photo_of) { create(:photo, source: 'openfarm') }
+  let(:crop_photo_flickr) { create(:photo, source: 'flickr') }
 
-  let(:garden) { FactoryBot.create(:garden) }
-  let(:planting)       { FactoryBot.create(:planting, crop:, owner: garden.owner) }
-  let(:planting_photo) { FactoryBot.create(:photo, owner: garden.owner) }
-  let(:harvest)        { FactoryBot.create(:harvest, crop:, owner: garden.owner) }
-  let(:harvest_photo)  { FactoryBot.create(:photo, owner: garden.owner) }
-  let(:seed)           { FactoryBot.create(:seed, crop:, owner: garden.owner) }
-  let(:seed_photo)     { FactoryBot.create(:photo, owner: garden.owner) }
+  let(:garden) { create(:garden) }
+  let(:planting)       { create(:planting, crop:, owner: garden.owner) }
+  let(:planting_photo) { create(:photo, owner: garden.owner) }
+  let(:harvest)        { create(:harvest, crop:, owner: garden.owner) }
+  let(:harvest_photo)  { create(:photo, owner: garden.owner) }
+  let(:seed)           { create(:seed, crop:, owner: garden.owner) }
+  let(:seed_photo)     { create(:photo, owner: garden.owner) }
 
   describe "crops" do
     subject { crop_image_path(crop) }
@@ -51,7 +51,7 @@ describe PhotosHelper do
     it { is_expected.to eq 'placeholder_600.png' }
 
     describe "has a flickr photo" do
-      let(:garden_photo)   { FactoryBot.create(:photo, owner: garden.owner, source: 'flickr') }
+      let(:garden_photo)   { create(:photo, owner: garden.owner, source: 'flickr') }
 
       before { garden.photos << garden_photo }
 

spec/helpers/plantings_helper_spec.rb

@@ -4,41 +4,41 @@ require 'rails_helper'
 
 describe PlantingsHelper do
   describe "display_planting" do
-    let!(:member) { FactoryBot.build(:member, login_name: 'crop_lady') }
+    let!(:member) { build(:member, login_name: 'crop_lady') }
 
     it "does not have a quantity nor a planted from value provided" do
-      planting = FactoryBot.build(:planting,
-                                  quantity:     nil,
-                                  planted_from: '',
-                                  owner:        member)
+      planting = build(:planting,
+                       quantity:     nil,
+                       planted_from: '',
+                       owner:        member)
       result = helper.display_planting(planting)
       expect(result).to eq "crop_lady planted magic bean."
     end
 
     it "does not have a quantity provided" do
-      planting = FactoryBot.build(:planting,
-                                  quantity:     nil,
-                                  planted_from: 'seed',
-                                  owner:        member)
+      planting = build(:planting,
+                       quantity:     nil,
+                       planted_from: 'seed',
+                       owner:        member)
       result = helper.display_planting(planting)
       expect(result).to eq "crop_lady planted seeds."
     end
 
     context "when quantity is greater than 1" do
       it "does not have a planted from value provided" do
-        planting = FactoryBot.build(:planting,
-                                    quantity:     10,
-                                    planted_from: '',
-                                    owner:        member)
+        planting = build(:planting,
+                         quantity:     10,
+                         planted_from: '',
+                         owner:        member)
         result = helper.display_planting(planting)
         expect(result).to eq "crop_lady planted 10 units."
       end
 
       it "does have a planted from value provided" do
-        planting = FactoryBot.build(:planting,
-                                    quantity:     5,
-                                    planted_from: 'seed',
-                                    owner:        member)
+        planting = build(:planting,
+                         quantity:     5,
+                         planted_from: 'seed',
+                         owner:        member)
         result = helper.display_planting(planting)
         expect(result).to eq "crop_lady planted 5 seeds."
       end
@@ -46,19 +46,19 @@ describe PlantingsHelper do
 
     context "when quantity is 1" do
       it "does not have a planted from value provided" do
-        planting = FactoryBot.build(:planting,
-                                    quantity:     1,
-                                    planted_from: '',
-                                    owner:        member)
+        planting = build(:planting,
+                         quantity:     1,
+                         planted_from: '',
+                         owner:        member)
         result = helper.display_planting(planting)
         expect(result).to eq "crop_lady planted 1 unit."
       end
 
       it "does have a planted from value provided" do
-        planting = FactoryBot.build(:planting,
-                                    quantity:     1,
-                                    planted_from: 'seed',
-                                    owner:        member)
+        planting = build(:planting,
+                         quantity:     1,
+                         planted_from: 'seed',
+                         owner:        member)
         result = helper.display_planting(planting)
         expect(result).to eq "crop_lady planted 1 seed."
       end

spec/helpers/seeds_helper_spec.rb

@@ -5,29 +5,29 @@ require 'rails_helper'
 describe SeedsHelper do
   describe "seed description" do
     it "is missing" do
-      seed = FactoryBot.create(:seed,
-                               description: nil)
+      seed = create(:seed,
+                    description: nil)
       result = helper.display_seed_description(seed)
       expect(result).to eq ""
     end
 
     it "is less than 130 characters long" do
-      seed = FactoryBot.create(:seed,
-                               description: 'a' * 20)
+      seed = create(:seed,
+                    description: 'a' * 20)
       result = helper.display_seed_description(seed)
       expect(result).to eq 'a' * 20
     end
 
     it "is 130 characters long" do
-      seed = FactoryBot.create(:seed,
-                               description: 'a' * 130)
+      seed = create(:seed,
+                    description: 'a' * 130)
       result = helper.display_seed_description(seed)
       expect(result).to eq 'a' * 130
     end
 
     it "is more than 130 characters long" do
-      seed = FactoryBot.create(:seed,
-                               description: 'a' * 140)
+      seed = create(:seed,
+                    description: 'a' * 140)
       result = helper.display_seed_description(seed)
       expect(result).to eq ('a' * 126) + '...' + ' ' + link_to("Read more", seed_path(seed))
     end

spec/lib/haml/filters/escaped_markdown_spec.rb

@@ -21,7 +21,7 @@ describe 'Haml::Filters::Escaped_Markdown' do
   end
 
   it 'converts quick crop links' do
-    @crop = FactoryBot.create(:crop)
+    @crop = create(:crop)
     template = <<~HTML
       :escaped_markdown
         [#{@crop.name}](crop)

spec/lib/haml/filters/growstuff_markdown_spec.rb

@@ -28,7 +28,7 @@ describe 'Haml::Filters::Growstuff_Markdown' do
   include ApplicationHelper
 
   it 'converts quick crop links' do
-    @crop = FactoryBot.create(:crop)
+    @crop = create(:crop)
     rendered = render_haml(haml_template(input_link(@crop.name)))
     expect(rendered).to match(/#{output_link(@crop)}/)
   end
@@ -39,14 +39,14 @@ describe 'Haml::Filters::Growstuff_Markdown' do
   end
 
   it "doesn't convert escaped crop links" do
-    @crop = FactoryBot.create(:crop)
+    @crop = create(:crop)
     rendered = render_haml(haml_template("\\" << input_link(@crop.name)))
     expect(rendered).to match(/\[#{@crop.name}\]\(crop\)/)
   end
 
   it "handles multiple crop links" do
-    tomato = FactoryBot.create(:tomato)
-    maize = FactoryBot.create(:maize)
+    tomato = create(:tomato)
+    maize = create(:maize)
     string = "#{input_link(tomato)} #{input_link(maize)}"
     rendered = render_haml(haml_template(string))
     expect(rendered).to match(/#{output_link(tomato)} #{output_link(maize)}/)
@@ -59,13 +59,13 @@ describe 'Haml::Filters::Growstuff_Markdown' do
   end
 
   it "finds crops case insensitively" do
-    @crop = FactoryBot.create(:crop, name: 'tomato', slug: 'tomato')
+    @crop = create(:crop, name: 'tomato', slug: 'tomato')
     rendered = render_haml(haml_template(input_link('ToMaTo')))
     expect(rendered).to match(/#{output_link(@crop, 'ToMaTo')}/)
   end
 
   it "fixes PT bug #78615258 (Markdown rendering bug with URLs and crops in same text)" do
-    tomato = FactoryBot.create(:tomato)
+    tomato = create(:tomato)
     string = "[test](http://example.com) [tomato](crop)"
     rendered = render_haml(haml_template(string))
 
@@ -74,7 +74,7 @@ describe 'Haml::Filters::Growstuff_Markdown' do
   end
 
   it 'converts quick member links' do
-    @member = FactoryBot.create(:member)
+    @member = create(:member)
     rendered = render_haml(haml_template(input_member_link(@member.login_name)))
     expect(rendered).to match(/#{output_member_link(@member)}/)
   end
@@ -85,13 +85,13 @@ describe 'Haml::Filters::Growstuff_Markdown' do
   end
 
   it "doesn't convert escaped members" do
-    @member = FactoryBot.create(:member)
+    @member = create(:member)
     rendered = render_haml(haml_template("\\" << input_member_link(@member.login_name)))
     expect(rendered).to match(/\[#{@member.login_name}\]\(member\)/)
   end
 
   it 'converts @ member links' do
-    @member = FactoryBot.create(:member)
+    @member = create(:member)
     rendered = render_haml(haml_template("Hey @#{@member.login_name}! What's up"))
     expect(rendered).to match(/#{output_member_link(@member, "@#{@member.login_name}")}/)
   end
@@ -102,7 +102,7 @@ describe 'Haml::Filters::Growstuff_Markdown' do
   end
 
   it "doesn't convert nonexistent @ members" do
-    @member = FactoryBot.create(:member)
+    @member = create(:member)
     @member_name = @member.login_name
     @member.destroy
     rendered = render_haml(haml_template("Hey @#{@member_name}"))
@@ -110,7 +110,7 @@ describe 'Haml::Filters::Growstuff_Markdown' do
   end
 
   it "doesn't convert escaped @ members" do
-    @member = FactoryBot.create(:member)
+    @member = create(:member)
     rendered = render_haml(haml_template("Hey \\@#{@member.login_name}! What's up"))
     expect(rendered).to include("Hey @#{@member.login_name}!")
   end

spec/models/ability_spec.rb

@@ -4,38 +4,38 @@ require 'rails_helper'
 require 'cancan/matchers'
 
 describe Ability do
-  let(:member)  { FactoryBot.create(:member) }
+  let(:member)  { create(:member) }
   let(:ability) { described_class.new(member) }
 
   context "notifications" do
     it 'member can view their own notifications' do
-      notification = FactoryBot.create(:notification, recipient: member)
+      notification = create(:notification, recipient: member)
       ability.should be_able_to(:read, notification)
     end
 
     it "member can't view someone else's notifications" do
-      notification = FactoryBot.create(:notification,
-                                       recipient: FactoryBot.create(:member))
+      notification = create(:notification,
+                            recipient: create(:member))
       ability.should_not be_able_to(:read, notification)
     end
 
     it "member can't send messages to themself" do
       ability.should_not be_able_to(:create,
-                                    FactoryBot.create(:notification,
-                                                      recipient: member,
-                                                      sender:    member))
+                                    create(:notification,
+                                           recipient: member,
+                                           sender:    member))
     end
 
     it "member can send messages to someone else" do
       ability.should be_able_to(:create,
-                                FactoryBot.create(:notification,
-                                                  recipient: FactoryBot.create(:member),
-                                                  sender:    member))
+                                create(:notification,
+                                       recipient: create(:member),
+                                       sender:    member))
     end
   end
 
   context "crop wrangling" do
-    let(:crop) { FactoryBot.create(:crop) }
+    let(:crop) { create(:crop) }
 
     context "standard member" do
       it "can't manage crops" do
@@ -53,7 +53,7 @@ describe Ability do
     end
 
     context "crop wrangler" do
-      let(:role) { FactoryBot.create(:crop_wrangler) }
+      let(:role) { create(:crop_wrangler) }
 
       before do
         member.roles << role
@@ -78,7 +78,7 @@ describe Ability do
   end
 
   context 'plant parts' do
-    let(:plant_part) { FactoryBot.create(:plant_part) }
+    let(:plant_part) { create(:plant_part) }
 
     context 'ordinary member' do
       it "can read plant parts" do
@@ -93,7 +93,7 @@ describe Ability do
     end
 
     context 'admin' do
-      let(:role) { FactoryBot.create(:admin) }
+      let(:role) { create(:admin) }
 
       before do
         member.roles << role
@@ -113,7 +113,7 @@ describe Ability do
       end
 
       it "can't delete a plant part that has harvests" do
-        @harvest = FactoryBot.create(:harvest, plant_part:)
+        @harvest = create(:harvest, plant_part:)
         ability.should_not be_able_to(:destroy, plant_part)
       end
     end
@@ -127,14 +127,14 @@ describe Ability do
     end
 
     context 'admin' do
-      let(:role) { FactoryBot.create(:admin) }
+      let(:role) { create(:admin) }
 
       before do
         member.roles << role
       end
 
       it "can manage members" do
-        ability.should be_able_to(:destroy, FactoryBot.create(:member))
+        ability.should be_able_to(:destroy, create(:member))
       end
       it "cannot delete themselves" do
         ability.should_not be_able_to(:destroy, member)

spec/models/alternate_name_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe AlternateName do
-  let(:an) { FactoryBot.create(:alternate_eggplant) }
+  let(:an) { create(:alternate_eggplant) }
 
   it 'saves a basic alternate name' do
     expect(an.save).to be(true)
@@ -22,9 +22,9 @@ describe AlternateName do
   end
 
   describe 'relationships' do
-    let(:alternate_name) { FactoryBot.create(:alternate_name, crop:, creator: member) }
-    let(:crop)   { FactoryBot.create(:crop)   }
-    let(:member) { FactoryBot.create(:member) }
+    let(:alternate_name) { create(:alternate_name, crop:, creator: member) }
+    let(:crop)   { create(:crop)   }
+    let(:member) { create(:member) }
 
     it { expect(alternate_name.crop).to eq crop }
     it { expect(alternate_name.creator).to eq member }

spec/models/authentication_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe Authentication do
   it 'creates an authentication' do
-    @auth = FactoryBot.create(:authentication)
+    @auth = create(:authentication)
     @auth.should be_an_instance_of described_class
     @auth.member.should be_an_instance_of Member
   end

spec/models/comment_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe Comment do
   context "basic" do
-    let(:comment) { FactoryBot.create(:comment) }
+    let(:comment) { create(:comment) }
 
     it "belongs to a post" do
       comment.commentable.should be_an_instance_of Post
@@ -18,12 +18,12 @@ describe Comment do
   context "notifications" do
     it "sends a notification when a comment is posted" do
       expect do
-        FactoryBot.create(:comment)
+        create(:comment)
       end.to change(Notification, :count).by(1)
     end
 
     it "sets the notification fields" do
-      @c = FactoryBot.create(:comment)
+      @c = create(:comment)
       @n = Notification.first
       @n.sender.should eq @c.author
       @n.recipient.should eq @c.commentable.author
@@ -33,20 +33,20 @@ describe Comment do
     end
 
     it "doesn't send notifications to yourself" do
-      @m = FactoryBot.create(:member)
-      @p = FactoryBot.create(:post, author: @m)
+      @m = create(:member)
+      @p = create(:post, author: @m)
       expect do
-        FactoryBot.create(:comment, commentable: @p, author: @m)
+        create(:comment, commentable: @p, author: @m)
       end.not_to change(Notification, :count)
     end
   end
 
   context "ordering" do
     before do
-      @m = FactoryBot.create(:member)
-      @p = FactoryBot.create(:post, author: @m)
-      @c1 = FactoryBot.create(:comment, commentable: @p, author: @m)
-      @c2 = FactoryBot.create(:comment, commentable: @p, author: @m)
+      @m = create(:member)
+      @p = create(:post, author: @m)
+      @c1 = create(:comment, commentable: @p, author: @m)
+      @c2 = create(:comment, commentable: @p, author: @m)
     end
 
     it 'has a scope for ASC order for displaying on post page' do

spec/models/crop_companion_spec.rb

@@ -2,11 +2,11 @@
 
 require 'rails_helper'
 
-RSpec.describe CropCompanion, type: :model do
+RSpec.describe CropCompanion do
   it 'has a crop' do
     cc = described_class.new
-    cc.crop_a = FactoryBot.create :tomato
-    cc.crop_b = FactoryBot.create :maize
+    cc.crop_a = create :tomato
+    cc.crop_b = create :maize
     cc.save!
 
     expect(cc.crop_a.name).to eq 'tomato'

spec/models/crop_spec.rb

@@ -4,7 +4,7 @@ require 'rails_helper'
 
 describe Crop do
   context 'all fields present' do
-    let(:crop) { FactoryBot.create(:tomato) }
+    let(:crop) { create(:tomato) }
 
     it 'saves a basic crop' do
       crop.save.should be(true)
@@ -30,15 +30,15 @@ describe Crop do
 
   context 'invalid data' do
     it 'does not save a crop without a system name' do
-      crop = FactoryBot.build(:crop, name: nil)
+      crop = build(:crop, name: nil)
       expect { crop.save }.to raise_error ActiveRecord::StatementInvalid
     end
   end
 
   context 'ordering' do
     before do
-      @uppercase = FactoryBot.create(:uppercasecrop, created_at: 1.minute.ago)
-      @lowercase = FactoryBot.create(:lowercasecrop, created_at: 2.days.ago)
+      @uppercase = create(:uppercasecrop, created_at: 1.minute.ago)
+      @lowercase = create(:lowercasecrop, created_at: 2.days.ago)
     end
 
     it 'recent scope sorts by creation date' do
@@ -47,39 +47,39 @@ describe Crop do
   end
 
   context 'popularity' do
-    let(:tomato)   { FactoryBot.create(:tomato)                 }
-    let(:maize)    { FactoryBot.create(:maize)                  }
+    let(:tomato)   { create(:tomato)                 }
+    let(:maize)    { create(:maize)                  }
 
     before do
-      FactoryBot.create_list(:planting, 10, crop: maize)
-      FactoryBot.create_list(:planting, 3, crop: tomato)
+      create_list(:planting, 10, crop: maize)
+      create_list(:planting, 3, crop: tomato)
     end
 
     it "sorts by most plantings" do
       expect(described_class.popular.first).to eq maize
-      FactoryBot.create_list(:planting, 10, crop: tomato)
+      create_list(:planting, 10, crop: tomato)
       expect(described_class.popular.first).to eq tomato
     end
   end
 
   it 'finds a default scientific name' do
-    @crop = FactoryBot.create(:tomato)
+    @crop = create(:tomato)
     expect(@crop.default_scientific_name).to be_nil
-    @sn = FactoryBot.create(:solanum_lycopersicum, crop: @crop)
+    @sn = create(:solanum_lycopersicum, crop: @crop)
     @crop.reload
     expect(@crop.default_scientific_name.to_s).to eq @sn.name
   end
 
   it 'counts plantings' do
-    @crop = FactoryBot.create(:tomato)
+    @crop = create(:tomato)
     expect(@crop.plantings.size).to eq 0
-    @planting = FactoryBot.create(:planting, crop: @crop)
+    @planting = create(:planting, crop: @crop)
     @crop.reload
     expect(@crop.plantings.size).to eq 1
   end
 
   context "wikipedia url" do
-    subject { FactoryBot.build(:tomato, en_wikipedia_url: wikipedia_url) }
+    subject { build(:tomato, en_wikipedia_url: wikipedia_url) }
 
     context 'not a url' do
       let(:wikipedia_url) { 'this is not valid' }
@@ -126,15 +126,15 @@ describe Crop do
 
   context 'varieties' do
     it 'has a crop hierarchy' do
-      @tomato = FactoryBot.create(:tomato)
-      @roma = FactoryBot.create(:roma, parent_id: @tomato.id)
+      @tomato = create(:tomato)
+      @roma = create(:roma, parent_id: @tomato.id)
       expect(@roma.parent).to eq @tomato
       expect(@tomato.varieties).to eq [@roma]
     end
 
     it 'toplevel scope works' do
-      @tomato = FactoryBot.create(:tomato)
-      @roma = FactoryBot.create(:roma, parent_id: @tomato.id)
+      @tomato = create(:tomato)
+      @roma = create(:roma, parent_id: @tomato.id)
       expect(described_class.toplevel).to eq [@tomato]
     end
   end
@@ -144,11 +144,11 @@ describe Crop do
       it { expect(described_class.has_photos).to include(crop) }
     end
 
-    let!(:crop) { FactoryBot.create(:tomato) }
+    let!(:crop) { create(:tomato) }
 
     context 'with a planting photo' do
-      let!(:photo) { FactoryBot.create(:photo, owner: planting.owner) }
-      let!(:planting) { FactoryBot.create(:planting, crop:) }
+      let!(:photo) { create(:photo, owner: planting.owner) }
+      let!(:planting) { create(:planting, crop:) }
 
       before { planting.photos << photo }
 
@@ -158,8 +158,8 @@ describe Crop do
     end
 
     context 'with a harvest photo' do
-      let!(:harvest) { FactoryBot.create(:harvest, crop:) }
-      let!(:photo) { FactoryBot.create(:photo, owner: harvest.owner) }
+      let!(:harvest) { create(:harvest, crop:) }
+      let!(:photo) { create(:photo, owner: harvest.owner) }
 
       before { harvest.photos << photo }
 
@@ -168,8 +168,8 @@ describe Crop do
       include_examples 'has default photo'
 
       context 'and planting photo' do
-        let(:planting) { FactoryBot.create(:planting, crop:) }
-        let!(:planting_photo) { FactoryBot.create(:photo, owner: planting.owner) }
+        let(:planting) { create(:planting, crop:) }
+        let!(:planting_photo) { create(:photo, owner: planting.owner) }
 
         before { planting.photos << planting_photo }
 
@@ -191,15 +191,15 @@ describe Crop do
     end
 
     describe 'finding all photos' do
-      let(:planting) { FactoryBot.create(:planting, crop:) }
-      let(:harvest) { FactoryBot.create(:harvest, crop:) }
-      let(:seed)    { FactoryBot.create(:seed, crop:)    }
+      let(:planting) { create(:planting, crop:) }
+      let(:harvest) { create(:harvest, crop:) }
+      let(:seed)    { create(:seed, crop:)    }
 
       before do
         # Add photos to all
-        planting.photos << FactoryBot.create(:photo, owner: planting.owner)
-        harvest.photos << FactoryBot.create(:photo, owner: harvest.owner)
-        seed.photos << FactoryBot.create(:photo, owner: seed.owner)
+        planting.photos << create(:photo, owner: planting.owner)
+        harvest.photos << create(:photo, owner: harvest.owner)
+        seed.photos << create(:photo, owner: seed.owner)
       end
 
       it { expect(crop.photos.size).to eq 3 }
@@ -210,83 +210,83 @@ describe Crop do
   end
 
   context 'sunniness' do
-    let(:crop) { FactoryBot.create(:tomato) }
+    let(:crop) { create(:tomato) }
 
     it 'returns a hash of sunniness values' do
-      FactoryBot.create(:sunny_planting, crop:)
-      FactoryBot.create(:sunny_planting, crop:)
-      FactoryBot.create(:semi_shady_planting, crop:)
-      FactoryBot.create(:shady_planting, crop:)
+      create(:sunny_planting, crop:)
+      create(:sunny_planting, crop:)
+      create(:semi_shady_planting, crop:)
+      create(:shady_planting, crop:)
       crop.sunniness.should be_an_instance_of Hash
     end
 
     it 'counts each sunniness value' do
-      FactoryBot.create(:sunny_planting, crop:)
-      FactoryBot.create(:sunny_planting, crop:)
-      FactoryBot.create(:semi_shady_planting, crop:)
-      FactoryBot.create(:shady_planting, crop:)
+      create(:sunny_planting, crop:)
+      create(:sunny_planting, crop:)
+      create(:semi_shady_planting, crop:)
+      create(:shady_planting, crop:)
       crop.sunniness.should == { 'sun' => 2, 'shade' => 1, 'semi-shade' => 1 }
     end
 
     it 'ignores unused sunniness values' do
-      FactoryBot.create(:sunny_planting, crop:)
-      FactoryBot.create(:sunny_planting, crop:)
-      FactoryBot.create(:semi_shady_planting, crop:)
+      create(:sunny_planting, crop:)
+      create(:sunny_planting, crop:)
+      create(:semi_shady_planting, crop:)
       crop.sunniness.should == { 'sun' => 2, 'semi-shade' => 1 }
     end
   end
 
   context 'planted_from' do
-    let(:crop) { FactoryBot.create(:tomato) }
+    let(:crop) { create(:tomato) }
 
     it 'returns a hash of sunniness values' do
-      FactoryBot.create(:seed_planting, crop:)
-      FactoryBot.create(:seed_planting, crop:)
-      FactoryBot.create(:seedling_planting, crop:)
-      FactoryBot.create(:cutting_planting, crop:)
+      create(:seed_planting, crop:)
+      create(:seed_planting, crop:)
+      create(:seedling_planting, crop:)
+      create(:cutting_planting, crop:)
       crop.planted_from.should be_an_instance_of Hash
     end
 
     it 'counts each planted_from value' do
-      FactoryBot.create(:seed_planting, crop:)
-      FactoryBot.create(:seed_planting, crop:)
-      FactoryBot.create(:seedling_planting, crop:)
-      FactoryBot.create(:cutting_planting, crop:)
+      create(:seed_planting, crop:)
+      create(:seed_planting, crop:)
+      create(:seedling_planting, crop:)
+      create(:cutting_planting, crop:)
       crop.planted_from.should == { 'seed' => 2, 'seedling' => 1, 'cutting' => 1 }
     end
 
     it 'ignores unused planted_from values' do
-      FactoryBot.create(:seed_planting, crop:)
-      FactoryBot.create(:seed_planting, crop:)
-      FactoryBot.create(:seedling_planting, crop:)
+      create(:seed_planting, crop:)
+      create(:seed_planting, crop:)
+      create(:seedling_planting, crop:)
       crop.planted_from.should == { 'seed' => 2, 'seedling' => 1 }
     end
   end
 
   context 'popular plant parts' do
-    let(:crop) { FactoryBot.create(:tomato) }
+    let(:crop) { create(:tomato) }
 
     it 'returns a hash of plant_part values' do
       crop.popular_plant_parts.should be_an_instance_of Hash
     end
 
     it 'counts each plant_part value' do
-      @fruit = FactoryBot.create(:plant_part)
-      @seed = FactoryBot.create(:plant_part, name: 'seed')
-      @root = FactoryBot.create(:plant_part, name: 'root')
-      @bulb = FactoryBot.create(:plant_part, name: 'bulb')
-      @harvest1 = FactoryBot.create(:harvest,
-                                    crop:,
-                                    plant_part: @fruit)
-      @harvest2 = FactoryBot.create(:harvest,
-                                    crop:,
-                                    plant_part: @fruit)
-      @harvest3 = FactoryBot.create(:harvest,
-                                    crop:,
-                                    plant_part: @seed)
-      @harvest4 = FactoryBot.create(:harvest,
-                                    crop:,
-                                    plant_part: @root)
+      @fruit = create(:plant_part)
+      @seed = create(:plant_part, name: 'seed')
+      @root = create(:plant_part, name: 'root')
+      @bulb = create(:plant_part, name: 'bulb')
+      @harvest1 = create(:harvest,
+                         crop:,
+                         plant_part: @fruit)
+      @harvest2 = create(:harvest,
+                         crop:,
+                         plant_part: @fruit)
+      @harvest3 = create(:harvest,
+                         crop:,
+                         plant_part: @seed)
+      @harvest4 = create(:harvest,
+                         crop:,
+                         plant_part: @root)
       crop.popular_plant_parts.should == { [@fruit.id, @fruit.name] => 2,
                                            [@seed.id, @seed.name]   => 1,
                                            [@root.id, @root.name]   => 1 }
@@ -297,22 +297,22 @@ describe Crop do
     subject { described_class.interesting }
 
     # first, a couple of candidate crops
-    let(:crop1) { FactoryBot.create(:crop) }
-    let(:crop2) { FactoryBot.create(:crop) }
+    let(:crop1) { create(:crop) }
+    let(:crop2) { create(:crop) }
 
     let(:crop1_planting) { crop1.plantings.first }
     let(:crop2_planting) { crop2.plantings.first }
 
-    let(:member) { FactoryBot.create(:member, login_name: 'pikachu') }
+    let(:member) { create(:member, login_name: 'pikachu') }
 
     describe 'lists interesting crops' do
       before do
         # they need 3+ plantings each to be interesting
-        FactoryBot.create_list(:planting, 3, crop: crop1, owner: member)
-        FactoryBot.create_list(:planting, 3, crop: crop2, owner: member)
+        create_list(:planting, 3, crop: crop1, owner: member)
+        create_list(:planting, 3, crop: crop2, owner: member)
         # crops need 3+ photos to be interesting
-        crop1_planting.photos = FactoryBot.create_list :photo, 3, owner: member
-        crop2_planting.photos = FactoryBot.create_list :photo, 3, owner: member
+        crop1_planting.photos = create_list :photo, 3, owner: member
+        crop2_planting.photos = create_list :photo, 3, owner: member
       end
 
       it { is_expected.to include crop1 }
@@ -323,9 +323,9 @@ describe Crop do
     describe 'crops without plantings are not interesting' do
       before do
         # only crop1 has plantings
-        FactoryBot.create_list(:planting, 3, crop: crop1, owner: member)
+        create_list(:planting, 3, crop: crop1, owner: member)
         # ... and photos
-        crop1_planting.photos = FactoryBot.create_list(:photo, 3, owner: member)
+        crop1_planting.photos = create_list(:photo, 3, owner: member)
       end
 
       it { is_expected.to include crop1 }
@@ -336,11 +336,11 @@ describe Crop do
     describe 'crops without photos are not interesting' do
       before do
         # both crops have plantings
-        FactoryBot.create_list(:planting, 3, crop: crop1, owner: member)
-        FactoryBot.create_list(:planting, 3, crop: crop2, owner: member)
+        create_list(:planting, 3, crop: crop1, owner: member)
+        create_list(:planting, 3, crop: crop2, owner: member)
 
         # but only crop1 has photos
-        crop1_planting.photos = FactoryBot.create_list(:photo, 3, owner: member)
+        crop1_planting.photos = create_list(:photo, 3, owner: member)
       end
 
       it { is_expected.to include crop1 }
@@ -350,8 +350,8 @@ describe Crop do
   end
 
   context "harvests" do
-    let!(:crop)    { FactoryBot.create(:crop) }
-    let!(:harvest) { FactoryBot.create(:harvest, crop:) }
+    let!(:crop)    { create(:crop) }
+    let!(:harvest) { create(:harvest, crop:) }
 
     it "has harvests" do
       expect(crop.harvests).to eq [harvest]
@@ -359,10 +359,10 @@ describe Crop do
   end
 
   it "doesn't duplicate plant_parts" do
-    @maize = FactoryBot.create(:maize)
-    @pp1 = FactoryBot.create(:plant_part)
-    @h1 = FactoryBot.create(:harvest, crop: @maize, plant_part: @pp1)
-    @h2 = FactoryBot.create(:harvest, crop: @maize, plant_part: @pp1)
+    @maize = create(:maize)
+    @pp1 = create(:plant_part)
+    @h1 = create(:harvest, crop: @maize, plant_part: @pp1)
+    @h2 = create(:harvest, crop: @maize, plant_part: @pp1)
     expect(@maize.plant_parts).to eq [@pp1]
   end
 
@@ -370,7 +370,7 @@ describe Crop do
     before do
       # don't use 'let' for this -- we need to actually create it,
       # regardless of whether it's used.
-      @cropbot = FactoryBot.create(:cropbot)
+      @cropbot = create(:cropbot)
     end
 
     context "scientific names" do
@@ -492,7 +492,7 @@ describe Crop do
     end
 
     it "loads a crop with a parent" do
-      parent = FactoryBot.create(:crop, name: 'parent')
+      parent = create(:crop, name: 'parent')
       crop = CsvImporter.new.import_crop(
         ["tomato", "http://en.wikipedia.org/wiki/Tomato", "parent"]
       )
@@ -525,9 +525,9 @@ describe Crop do
   end
 
   context "crop-post association" do
-    let!(:tomato) { FactoryBot.create(:tomato)                                                  }
-    let!(:maize)  { FactoryBot.create(:maize)                                                   }
-    let!(:post)   { FactoryBot.create(:post, body: "[maize](crop)[tomato](crop)[tomato](crop)") }
+    let!(:tomato) { create(:tomato)                                                  }
+    let!(:maize)  { create(:maize)                                                   }
+    let!(:post)   { create(:post, body: "[maize](crop)[tomato](crop)[tomato](crop)") }
 
     describe "destroying a crop" do
       before do
@@ -545,8 +545,8 @@ describe Crop do
   end
 
   context "destroying a crop" do
-    let!(:crop_a) { FactoryBot.create(:crop) }
-    let!(:crop_b) { FactoryBot.create(:crop) }
+    let!(:crop_a) { create(:crop) }
+    let!(:crop_b) { create(:crop) }
 
     before do
       CropCompanion.create(crop_a: crop_a, crop_b: crop_b)
@@ -554,21 +554,21 @@ describe Crop do
     end
 
     it "destroys companion links" do
-      expect { crop_a.destroy }.to change { CropCompanion.count }.from(2).to(0)
+      expect { crop_a.destroy }.to change(CropCompanion, :count).from(2).to(0)
     end
   end
 
   context "crop rejections" do
     let!(:rejected_reason) do
-      FactoryBot.create(:crop, name:                 'tomato',
-                               approval_status:      'rejected',
-                               reason_for_rejection: 'not edible')
+      create(:crop, name:                 'tomato',
+                    approval_status:      'rejected',
+                    reason_for_rejection: 'not edible')
     end
     let!(:rejected_other) do
-      FactoryBot.create(:crop, name:                 'tomato',
-                               approval_status:      'rejected',
-                               reason_for_rejection: 'other',
-                               rejection_notes:      'blah blah blah')
+      create(:crop, name:                 'tomato',
+                    approval_status:      'rejected',
+                    reason_for_rejection: 'other',
+                    rejection_notes:      'blah blah blah')
     end
 
     describe "rejecting a crop" do

spec/models/follow_spec.rb

@@ -4,8 +4,8 @@ require 'spec_helper'
 
 describe Follow do
   before do
-    @member1 = FactoryBot.create(:member)
-    @member2 = FactoryBot.create(:member)
+    @member1 = create(:member)
+    @member2 = create(:member)
   end
 
   it "sends a notification when a follow is created" do

spec/models/forum_spec.rb

@@ -3,7 +3,7 @@
 require 'rails_helper'
 
 describe Forum do
-  let(:forum) { FactoryBot.create(:forum) }
+  let(:forum) { create(:forum) }
 
   it "belongs to an owner" do
     forum.owner.should be_an_instance_of Member
@@ -18,8 +18,8 @@ describe Forum do
   end
 
   it "has many posts" do
-    @post1 = FactoryBot.create(:forum_post, forum:)
-    @post2 = FactoryBot.create(:forum_post, forum:)
+    @post1 = create(:forum_post, forum:)
+    @post2 = create(:forum_post, forum:)
     forum.posts.size.should == 2
   end
 end

spec/models/garden_spec.rb

@@ -3,8 +3,8 @@
 require 'rails_helper'
 
 describe Garden do
-  let(:owner)       { FactoryBot.create(:member, login_name: 'hatupatu') }
-  let(:garden)      { FactoryBot.create(:garden, owner:, name: 'Springfield Community Garden') }
+  let(:owner)       { create(:member, login_name: 'hatupatu') }
+  let(:garden)      { create(:garden, owner:, name: 'Springfield Community Garden') }
 
   it "has a slug" do
     garden.slug.should match(/hatupatu-springfield-community-garden/)
@@ -15,42 +15,42 @@ describe Garden do
   end
 
   it "doesn't allow a nil name" do
-    garden = FactoryBot.build(:garden, name: nil)
+    garden = build(:garden, name: nil)
     garden.should_not be_valid
   end
 
   it "doesn't allow a blank name" do
-    garden = FactoryBot.build(:garden, name: "")
+    garden = build(:garden, name: "")
     garden.should_not be_valid
   end
 
   it "allows numbers" do
-    garden = FactoryBot.build(:garden, name: "100 vines of 2 kamo-kamo")
+    garden = build(:garden, name: "100 vines of 2 kamo-kamo")
     garden.should be_valid
   end
 
   it "allows brackets" do
-    garden = FactoryBot.build(:garden, name: "Garden (second)")
+    garden = build(:garden, name: "Garden (second)")
     garden.should be_valid
   end
 
   it "allows macrons" do
-    garden = FactoryBot.build(:garden, name: "Kūmara and pūha patch")
+    garden = build(:garden, name: "Kūmara and pūha patch")
     garden.should be_valid
   end
 
   it "allows some punctuation" do
-    garden = FactoryBot.build(:garden, name: "best-garden-eva!")
+    garden = build(:garden, name: "best-garden-eva!")
     garden.should be_valid
   end
 
   it "doesn't allow a name with only spaces" do
-    garden = FactoryBot.build(:garden, name: "    ")
+    garden = build(:garden, name: "    ")
     garden.should_not be_valid
   end
 
   it "doesn't allow new line chars in garden names" do
-    garden = FactoryBot.build(:garden, name: "My garden\nI am a 1337 hacker")
+    garden = build(:garden, name: "My garden\nI am a 1337 hacker")
     garden.should_not be_valid
   end
 
@@ -63,9 +63,9 @@ describe Garden do
   end
 
   it "destroys plantings when deleted" do
-    garden = FactoryBot.create(:garden, owner:)
-    @planting1 = FactoryBot.create(:planting, garden:, owner: garden.owner)
-    @planting2 = FactoryBot.create(:planting, garden:, owner: garden.owner)
+    garden = create(:garden, owner:)
+    @planting1 = create(:planting, garden:, owner: garden.owner)
+    @planting2 = create(:planting, garden:, owner: garden.owner)
     expect(garden.plantings.size).to eq(2)
     all = Planting.count
     garden.destroy
@@ -74,37 +74,37 @@ describe Garden do
 
   context 'area' do
     it 'allows numeric area' do
-      garden = FactoryBot.build(:garden, area: 33)
+      garden = build(:garden, area: 33)
       garden.should be_valid
     end
 
     it "doesn't allow negative area" do
-      garden = FactoryBot.build(:garden, area: -5)
+      garden = build(:garden, area: -5)
       garden.should_not be_valid
     end
 
     it 'allows decimal quantities' do
-      garden = FactoryBot.build(:garden, area: 3.3)
+      garden = build(:garden, area: 3.3)
       garden.should be_valid
     end
 
     it 'allows blank quantities' do
-      garden = FactoryBot.build(:garden, area: '')
+      garden = build(:garden, area: '')
       garden.should be_valid
     end
 
     it 'allows nil quantities' do
-      garden = FactoryBot.build(:garden, area: nil)
+      garden = build(:garden, area: nil)
       garden.should be_valid
     end
 
     it 'cleans up zero quantities' do
-      garden = FactoryBot.build(:garden, area: 0)
+      garden = build(:garden, area: 0)
       expect(garden.area).to eq 0
     end
 
     it "doesn't allow non-numeric quantities" do
-      garden = FactoryBot.build(:garden, area: "99a")
+      garden = build(:garden, area: "99a")
       garden.should_not be_valid
     end
   end
@@ -112,27 +112,27 @@ describe Garden do
   context 'units' do
     Garden::AREA_UNITS_VALUES.values.push(nil, '').each do |s|
       it "#{s} should be a valid unit" do
-        garden = FactoryBot.build(:garden, area_unit: s)
+        garden = build(:garden, area_unit: s)
         garden.should be_valid
       end
     end
 
     it 'refuses invalid unit values' do
-      garden = FactoryBot.build(:garden, area_unit: 'not valid')
+      garden = build(:garden, area_unit: 'not valid')
       garden.should_not be_valid
       garden.errors[:area_unit].should include("not valid is not a valid area unit")
     end
 
     it 'sets area unit to blank if area is blank' do
-      garden = FactoryBot.build(:garden, area: '', area_unit: 'acre')
+      garden = build(:garden, area: '', area_unit: 'acre')
       garden.should be_valid
       expect(garden.area_unit).to be_nil
     end
   end
 
   context 'active scopes' do
-    let(:active) { FactoryBot.create(:garden) }
-    let(:inactive) { FactoryBot.create(:inactive_garden) }
+    let(:active) { create(:garden) }
+    let(:inactive) { create(:inactive_garden) }
 
     it 'includes active garden in active scope' do
       described_class.active.should include active
@@ -146,9 +146,9 @@ describe Garden do
   end
 
   it "marks plantings as finished when garden is inactive" do
-    garden = FactoryBot.create(:garden)
-    p1 = FactoryBot.create(:planting, garden:, owner: garden.owner)
-    p2 = FactoryBot.create(:planting, garden:, owner: garden.owner)
+    garden = create(:garden)
+    p1 = create(:planting, garden:, owner: garden.owner)
+    p2 = create(:planting, garden:, owner: garden.owner)
 
     expect(p1.finished).to be false
     expect(p2.finished).to be false
@@ -163,10 +163,10 @@ describe Garden do
   end
 
   it "doesn't mark the wrong plantings as finished" do
-    g1 = FactoryBot.create(:garden)
-    g2 = FactoryBot.create(:garden)
-    p1 = FactoryBot.create(:planting, garden: g1, owner: g1.owner)
-    p2 = FactoryBot.create(:planting, garden: g2, owner: g2.owner)
+    g1 = create(:garden)
+    g2 = create(:garden)
+    p1 = create(:planting, garden: g1, owner: g1.owner)
+    p2 = create(:planting, garden: g2, owner: g2.owner)
 
     # mark the garden as inactive
     g1.active = false
@@ -182,8 +182,8 @@ describe Garden do
   end
 
   context 'photos' do
-    let(:garden) { FactoryBot.create(:garden) }
-    let(:photo) { FactoryBot.create(:photo, owner: garden.owner) }
+    let(:garden) { create(:garden) }
+    let(:photo) { create(:photo, owner: garden.owner) }
 
     before do
       garden.photos << photo
@@ -204,7 +204,7 @@ describe Garden do
     end
 
     it 'chooses the most recent photo' do
-      @photo2 = FactoryBot.create(:photo, owner: garden.owner)
+      @photo2 = create(:photo, owner: garden.owner)
       garden.photos << @photo2
       expect(garden.default_photo).to eq @photo2
     end

spec/models/garden_type_spec.rb

@@ -3,36 +3,36 @@
 require 'rails_helper'
 
 describe GardenType do
-  let(:garden) { FactoryBot.create(:garden, 'Free Carrots') }
+  let(:garden) { create(:garden, 'Free Carrots') }
 
   describe "should have a name" do
-    let(:garden_type) { FactoryBot.build(:garden_type, name: "organic") }
+    let(:garden_type) { build(:garden_type, name: "organic") }
 
     it { expect(garden_type).to be_valid }
   end
 
   describe "doesn't allow a nil name" do
-    let(:garden_type) { FactoryBot.build(:garden_type, name: nil) }
+    let(:garden_type) { build(:garden_type, name: nil) }
 
     it { expect(garden_type).not_to be_valid }
   end
 
   describe "doesn't allow a blank name" do
-    let(:garden_type) { FactoryBot.build(:garden_type, name: "") }
+    let(:garden_type) { build(:garden_type, name: "") }
 
     it { expect(garden_type).not_to be_valid }
   end
 
   describe "doesn't allow a name with only spaces" do
-    let(:garden_type) { FactoryBot.build(:garden_type, name: "    ") }
+    let(:garden_type) { build(:garden_type, name: "    ") }
 
     it { expect(garden_type).not_to be_valid }
   end
 
   describe "does not delete gardens when deleted" do
-    before { FactoryBot.create(:garden, garden_type:) }
+    before { create(:garden, garden_type:) }
 
-    let(:garden_type) { FactoryBot.create(:garden_type, name: "Massive Flower Pot") }
+    let(:garden_type) { create(:garden_type, name: "Massive Flower Pot") }
 
     it { expect(garden_type.gardens.size).to eq(1) }
     it { expect { garden_type.destroy }.not_to change(Garden, :count) }