Rubocop: RSpec/IncludeExamples

2026-05-26 01:37:39 -04:00 · 2026-04-23 13:31:16 +00:00
115 changed files with 582 additions and 761 deletions
--- a/.dockerignore
+++ b/.dockerignore
@@ -1,31 +0,0 @@
-.git
-.github
-.devcontainer
-log/*
-tmp/*
-!tmp/keep
-node_modules
-public/assets
-.env
-.ruby-version
-.ruby-gemset
-.editorconfig
-.esignore
-.eslintrc.json
-.haml-lint.yml
-.overcommit.yml
-.rspec
-.rubocop.yml
-.rubocop_todo.yml
-.scss-lint.yml
-.travis.yml
-.yamllint
-CODE_OF_CONDUCT.md
-CONTRIBUTING.md
-CONTRIBUTORS.md
-LICENSE.txt
-README.md
-TECH.md
-docker-compose.yml
-Dockerfile
-.dockerignore
--- a/.github/workflows/docker-build-push.yml
+++ b/.github/workflows/docker-build-push.yml
@@ -1,43 +0,0 @@
-name: Docker Build and Push
-
-on:
-  push:
-    branches:
-      - mainline
-
-jobs:
-  build-and-push:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v4
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to the Container registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Extract metadata (tags, labels) for Docker
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: ghcr.io/${{ github.repository }}
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2026-04-25 16:44:38 UTC using RuboCop version 1.86.1.
+# on 2026-03-01 05:17:50 UTC using RuboCop version 1.85.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -81,7 +81,7 @@ Layout/HashAlignment:
    - 'spec/requests/api/v1/activities_request_spec.rb'
    - 'spec/requests/api/v1/members_request_spec.rb'

-# Offense count: 5
+# Offense count: 6
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, AllowQualifiedName, URISchemes, AllowRBSInlineAnnotation, AllowCopDirectives, AllowedPatterns, SplitStrings.
 # URISchemes: http, https
@@ -92,6 +92,7 @@ Layout/LineLength:
    - 'app/models/concerns/predict_planting.rb'
    - 'app/models/crop.rb'
    - 'db/seeds.rb'
+    - 'spec/requests/api/v1/activities_request_spec.rb'

 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -153,6 +154,21 @@ Lint/SuppressedException:
  Exclude:
    - 'lib/tasks/testing.rake'

+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: EnforcedStyle.
+# SupportedStyles: strict, consistent
+Lint/SymbolConversion:
+  Exclude:
+    - 'app/helpers/crops_helper.rb'
+
+# Offense count: 7
+# This cop supports safe autocorrection (--autocorrect).
+Lint/UselessAssignment:
+  Exclude:
+    - 'config.rb'
+    - 'config/compass.rb'
+
 # Offense count: 1
 Lint/UselessConstantScoping:
  Exclude:
@@ -226,12 +242,24 @@ RSpec/BeforeAfterAll:
  Exclude:
    - 'spec/tasks/import_spec.rb'

-# Offense count: 298
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+RSpec/ContextMethod:
+  Exclude:
+    - 'spec/requests/api/v1/activities_request_spec.rb'
+
+# Offense count: 299
 # Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
  Enabled: false

+# Offense count: 1
+# Configuration parameters: IgnoredMetadata.
+RSpec/DescribeClass:
+  Exclude:
+    - 'spec/tasks/import_spec.rb'
+
 # Offense count: 36
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: SkipBlocks, EnforcedStyle, OnlyStaticConstants.
@@ -242,12 +270,55 @@ RSpec/DescribedClass:
    - 'spec/models/member_spec.rb'
    - 'spec/services/timeline_service_spec.rb'

+# Offense count: 13
+# This cop supports unsafe autocorrection (--autocorrect-all).
+RSpec/EmptyExampleGroup:
+  Exclude:
+    - 'spec/controllers/authentications_controller_spec.rb'
+    - 'spec/controllers/forums_controller_spec.rb'
+    - 'spec/controllers/home_controller_spec.rb'
+    - 'spec/controllers/likes_controller_spec.rb'
+    - 'spec/controllers/plant_parts_controller_spec.rb'
+    - 'spec/controllers/seeds_controller_spec.rb'
+    - 'spec/features/crops/crop_detail_page_spec.rb'
+    - 'spec/features/plantings/planting_a_crop_spec.rb'
+    - 'spec/requests/authentications_spec.rb'
+    - 'spec/views/home/index_spec.rb'
+    - 'spec/views/photos/edit.html.haml_spec.rb'
+    - 'spec/views/posts/_single.html.haml_spec.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowConsecutiveOneLiners.
+RSpec/EmptyLineAfterExample:
+  Exclude:
+    - 'spec/models/ability_spec.rb'
+
 # Offense count: 146
 # Configuration parameters: CountAsOne.
 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:
+    - 'spec/controllers/garden_types_controller_spec.rb'
+    - 'spec/controllers/gardens_controller_spec.rb'
+    - 'spec/features/admin/forums_spec.rb'
+    - 'spec/features/admin/plant_parts_spec.rb'
+    - 'spec/features/admin/roles_spec.rb'
+    - 'spec/features/crops/crop_photos_spec.rb'
+    - 'spec/features/members/list_spec.rb'
+    - 'spec/features/plantings/planting_a_crop_spec.rb'
+    - 'spec/features/shared_examples/append_date.rb'

 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
@@ -263,26 +334,6 @@ RSpec/HooksBeforeExamples:
  Exclude:
    - 'spec/features/crops/creating_a_crop_spec.rb'

-# Offense count: 53
-# This cop supports unsafe autocorrection (--autocorrect-all).
-RSpec/IncludeExamples:
-  Exclude:
-    - 'spec/features/conversations/index_spec.rb'
-    - 'spec/features/crops/alternate_name_spec.rb'
-    - 'spec/features/crops/browse_crops_spec.rb'
-    - 'spec/features/crops/creating_a_crop_spec.rb'
-    - 'spec/features/crops/crop_photos_spec.rb'
-    - 'spec/features/crops/delete_crop_spec.rb'
-    - 'spec/features/gardens/actions_spec.rb'
-    - 'spec/features/gardens/adding_gardens_spec.rb'
-    - 'spec/features/gardens/index_spec.rb'
-    - 'spec/features/likeable_spec.rb'
-    - 'spec/features/signout_spec.rb'
-    - 'spec/models/crop_spec.rb'
-    - 'spec/support/feature_helpers.rb'
-    - 'spec/views/photos/show.html.haml_spec.rb'
-    - 'spec/views/seeds/index.rss.haml_spec.rb'
-
 # Offense count: 37
 # Configuration parameters: Max, AllowedIdentifiers, AllowedPatterns.
 RSpec/IndexedLet:
@@ -295,6 +346,7 @@ RSpec/IndexedLet:
    - 'spec/features/percy/percy_spec.rb'
    - 'spec/features/planting_reminder_spec.rb'
    - 'spec/features/timeline/index_spec.rb'
+    - 'spec/models/crop_spec.rb'
    - 'spec/models/member_spec.rb'
    - 'spec/views/forums/index.html.haml_spec.rb'

@@ -329,7 +381,7 @@ RSpec/MultipleDescribes:
  Exclude:
    - 'spec/features/crops/crop_wranglers_spec.rb'

-# Offense count: 191
+# Offense count: 189
 RSpec/MultipleExpectations:
  Max: 19

@@ -344,7 +396,7 @@ RSpec/MultipleMemoizedHelpers:
 RSpec/NamedSubject:
  Enabled: false

-# Offense count: 109
+# Offense count: 111
 # Configuration parameters: AllowedGroups.
 RSpec/NestedGroups:
  Max: 6
@@ -414,6 +466,23 @@ 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
@@ -475,6 +544,10 @@ Rails/I18nLocaleAssignment:
  Exclude:
    - 'spec/features/locale_spec.rb'

+# Offense count: 40
+Rails/I18nLocaleTexts:
+  Enabled: false
+
 # Offense count: 1
 # Configuration parameters: IgnoreScopes.
 Rails/InverseOf:
@@ -516,7 +589,7 @@ Rails/RakeEnvironment:
    - 'lib/tasks/i18n.rake'
    - 'lib/tasks/testing.rake'

-# Offense count: 8
+# Offense count: 9
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedReceivers.
 # AllowedReceivers: ActionMailer::Preview, ActiveSupport::TimeZone
@@ -529,6 +602,7 @@ 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).
@@ -570,6 +644,15 @@ Rails/RootPathnameMethods:
    - 'lib/tasks/import.rake'
    - 'spec/rails_helper.rb'

+# Offense count: 4
+# Configuration parameters: ForbiddenMethods, AllowedMethods.
+# ForbiddenMethods: decrement!, decrement_counter, increment!, increment_counter, insert, insert!, insert_all, insert_all!, toggle!, touch, touch_all, update_all, update_attribute, update_column, update_columns, update_counters, upsert, upsert_all
+Rails/SkipsModelValidations:
+  Exclude:
+    - 'db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb'
+    - 'db/migrate/20240810160538_set_default_language_for_existing_alternate_names.rb'
+    - 'db/migrate/20251128200506_add_description_to_crops.rb'
+
 # Offense count: 21
 Rails/ThreeStateBooleanColumn:
  Enabled: false
@@ -601,6 +684,12 @@ 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:
@@ -657,13 +746,12 @@ Style/FloatDivision:
  Exclude:
    - 'app/models/concerns/predict_planting.rb'

-# Offense count: 1
+# Offense count: 22
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
 # SupportedStyles: always, always_true, never
 Style/FrozenStringLiteralComment:
-  Exclude:
-    - 'spec/lib/haml/filters/growstuff_markdown_spec.rb'
+  Enabled: false

 # Offense count: 2
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -729,6 +817,13 @@ Style/OptionalBooleanParameter:
    - 'app/helpers/application_helper.rb'
    - 'app/models/concerns/member_newsletter.rb'

+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: PreferredDelimiters.
+Style/PercentLiteralDelimiters:
+  Exclude:
+    - 'db/migrate/20251130035700_create_versions.rb'
+
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Methods.
--- a/.scss-lint.yml
+++ b/.scss-lint.yml
@@ -248,3 +248,6 @@ linters:

  ZeroUnit:
    enabled: true
+
+  Compass::*:
+    enabled: false
--- a/52
+++ b/52
@@ -1,52 +0,0 @@
-FROM ruby:3.4.8-trixie
-
-# Install system dependencies
-RUN apt-get update -qq && \
-    apt-get install -y --no-install-recommends \
-    build-essential \
-    libpq-dev \
-    git \
-    curl \
-    gnupg2 \
-    shared-mime-info \
-    libvips \
-    && curl -fsSL https://deb.nodesource.com/setup_22.x | bash - \
-    && apt-get install -y --no-install-recommends nodejs \
-    && npm install -g yarn \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists/*
-
-# Set production environment
-ENV RAILS_ENV=production \
-    BUNDLE_WITHOUT="development test" \
-    RAILS_SERVE_STATIC_FILES=true \
-    RAILS_LOG_TO_STDOUT=true
-
-WORKDIR /app
-
-# Install gems
-COPY Gemfile Gemfile.lock ./
-RUN bundle config set --local deployment 'true' && \
-    bundle config set --local without 'development test' && \
-    bundle install --jobs 4 --retry 3
-
-# Install JavaScript dependencies
-COPY package.json yarn.lock ./
-RUN yarn install --check-files
-
-# Copy the application code
-COPY . .
-
-# Precompile assets
-# Secret key base is needed for asset compilation but doesn't need to be the real one
-RUN RAILS_ENV=production SECRET_KEY_BASE_DUMMY=1 bundle exec rake assets:precompile
-
-# Add a script to be executed every time the container starts.
-COPY entrypoint.sh /usr/bin/
-RUN chmod +x /usr/bin/entrypoint.sh
-ENTRYPOINT ["entrypoint.sh"]
-
-EXPOSE 3000
-
-# Start the main process.
-CMD ["bundle", "exec", "puma", "-C", "config/puma.rb"]
--- a/app/controllers/admin/crop_companions_controller.rb
+++ b/app/controllers/admin/crop_companions_controller.rb
@@ -15,7 +15,7 @@ module Admin
    def create
      @crop_companion = @crop.crop_companions.new(crop_companion_params)
      if @crop_companion.save
-        redirect_to admin_crop_crop_companions_path(@crop), notice: t('crop_companions.created')
+        redirect_to admin_crop_crop_companions_path(@crop), notice: 'Companion was successfully created.'
      else
        render :new
      end
@@ -24,7 +24,7 @@ module Admin
    def destroy
      @crop_companion = @crop.crop_companions.find(params[:id])
      @crop_companion.destroy
-      redirect_to admin_crop_crop_companions_path(@crop), notice: t('crop_companions.deleted')
+      redirect_to admin_crop_crop_companions_path(@crop), notice: 'Companion was successfully destroyed.'
    end

    private
--- a/app/controllers/admin/versions_controller.rb
+++ b/app/controllers/admin/versions_controller.rb
@@ -9,9 +9,9 @@ module Admin
      @version = PaperTrail::Version.find(params[:id])
      @object = @version.reify
      if @object.save
-        redirect_to admin_crops_path, notice: t('messages.revert_success', date: @version.created_at.strftime('%B %d, %Y'))
+        redirect_to admin_crops_path, notice: "Reverted to version from #{@version.created_at.strftime('%B %d, %Y')}"
      else
-        redirect_to admin_crops_path, alert: t('messages.revert_error', date: @version.created_at.strftime('%B %d, %Y'), errors: @object.errors.full_messages.to_sentence)
+        redirect_to admin_crops_path, alert: "Could not revert to version from #{@version.created_at.strftime('%B %d, %Y')}. Errors: #{@object.errors.full_messages.to_sentence}"
      end
    end

--- a/app/controllers/alternate_names_controller.rb
+++ b/app/controllers/alternate_names_controller.rb
@@ -30,7 +30,7 @@ class AlternateNamesController < ApplicationController
    @alternate_name = AlternateName.new(alternate_name_params)

    if @alternate_name.save
-      redirect_to @alternate_name.crop, notice: t('alternate_names.created')
+      redirect_to @alternate_name.crop, notice: 'Alternate name was successfully created.'
    else
      render action: "new"
    end
@@ -40,7 +40,7 @@ class AlternateNamesController < ApplicationController
  # PUT /alternate_names/1.json
  def update
    if @alternate_name.update(alternate_name_params)
-      redirect_to @alternate_name.crop, notice: t('alternate_names.updated')
+      redirect_to @alternate_name.crop, notice: 'Alternate name was successfully updated.'
    else
      render action: "edit"
    end
@@ -51,7 +51,7 @@ class AlternateNamesController < ApplicationController
  def destroy
    @crop = @alternate_name.crop
    @alternate_name.destroy
-    redirect_to @crop, notice: t('alternate_names.deleted')
+    redirect_to @crop, notice: 'Alternate name was successfully deleted.'
  end

  private
--- a/app/controllers/authentications_controller.rb
+++ b/app/controllers/authentications_controller.rb
@@ -24,9 +24,9 @@ class AuthenticationsController < ApplicationController
          name:
        )

-      flash[:notice] = t('messages.auth_success')
+      flash[:notice] = "Authentication successful."
    else
-      flash[:notice] = t('messages.auth_failed')
+      flash[:notice] = "Authentication failed."
    end
    redirect_to request.env['omniauth.origin'] || edit_member_registration_path
  end
--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -160,7 +160,7 @@ class CropsController < ApplicationController
             when 'youtube'
               Crop.approved.where(en_youtube_url: [nil, '']).order(plantings_count: :desc)
             when 'alternate_names'
-               Crop.approved.where.missing(:alternate_names).order(plantings_count: :desc)
+               Crop.approved.left_joins(:alternate_names).where(alternate_names: { id: nil }).order(plantings_count: :desc)
             when 'wikidata'
               crops_with_wikidata = Crop.joins(:scientific_names).where.not(scientific_names: { wikidata_id: nil }).distinct
               Crop.approved.where.not(id: crops_with_wikidata).order(plantings_count: :desc)
--- a/app/controllers/follows_controller.rb
+++ b/app/controllers/follows_controller.rb
@@ -13,9 +13,9 @@ class FollowsController < ApplicationController
    @follow = current_member.follows.build(followed: Member.find(params[:followed]))

    if @follow.save
-      flash[:notice] = t('messages.followed', name: @follow.followed.login_name)
+      flash[:notice] = "Followed #{@follow.followed.login_name}"
    else
-      flash[:error] = t('messages.follow_error')
+      flash[:error] = "Already following or error while following."
    end
    redirect_back_or_to(root_path)
  end
@@ -25,7 +25,7 @@ class FollowsController < ApplicationController
    @unfollowed = @follow.followed
    @follow.destroy

-    flash[:notice] = t('messages.unfollowed', name: @unfollowed.login_name)
+    flash[:notice] = "Unfollowed #{@unfollowed.login_name}"
    redirect_to @unfollowed
  end

--- a/app/controllers/forums_controller.rb
+++ b/app/controllers/forums_controller.rb
@@ -32,14 +32,14 @@ class ForumsController < ApplicationController
  # POST /forums.json
  def create
    @forum = Forum.new(forum_params)
-    flash[:notice] = t('forums.created') if @forum.save
+    flash[:notice] = 'Forum was successfully created.' if @forum.save
    respond_with(@forum)
  end

  # PUT /forums/1
  # PUT /forums/1.json
  def update
-    flash[:notice] = t('forums.updated') if @forum.update(forum_params)
+    flash[:notice] = 'Forum was successfully updated.' if @forum.update(forum_params)
    respond_with(@forum)
  end

@@ -47,7 +47,7 @@ class ForumsController < ApplicationController
  # DELETE /forums/1.json
  def destroy
    @forum.destroy
-    flash[:notice] = t('forums.deleted')
+    flash[:notice] = 'Forum was successfully deleted'
    redirect_to forums_url
  end

--- a/app/controllers/likes_controller.rb
+++ b/app/controllers/likes_controller.rb
@@ -14,7 +14,7 @@ class LikesController < ApplicationController
      @like.likeable.reindex(refresh: true)
      success(@like, liked_by_member: true, status_code: :created)
    else
-      failed(@like, message: t('messages.unable_to_like'))
+      failed(@like, message: 'Unable to like')
    end
  end

@@ -29,7 +29,7 @@ class LikesController < ApplicationController
      @like.likeable.reindex(refresh: true)
      success(@like, liked_by_member: false, status_code: :ok)
    else
-      failed(@like, message: t('messages.unable_to_unlike'))
+      failed(@like, message: 'Unable to unlike')
    end
  end

--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -10,7 +10,7 @@ require './lib/actions/oauth_signup_action'
 #
 class OmniauthCallbacksController < Devise::OmniauthCallbacksController
  def failure
-    flash[:alert] = t('messages.auth_failed')
+    flash[:alert] = "Authentication failed."
    redirect_to request.env['omniauth.origin'] || "/"
  end

--- a/app/controllers/places_controller.rb
+++ b/app/controllers/places_controller.rb
@@ -33,7 +33,7 @@ class PlacesController < ApplicationController

  def search
    if params[:new_place].empty?
-      redirect_to places_path, alert: t('messages.invalid_location')
+      redirect_to places_path, alert: 'Please enter a valid location'
    else
      redirect_to place_path(params[:new_place])
    end
--- a/app/controllers/plantings_controller.rb
+++ b/app/controllers/plantings_controller.rb
@@ -116,11 +116,11 @@ class PlantingsController < DataController
    new_planting.finished_at = nil

    if new_planting.save
-      redirect_to edit_planting_path(new_planting), notice: t('messages.transplant_success')
+      redirect_to edit_planting_path(new_planting), notice: 'Planting was successfully transplanted.'
    else
      # if the save fails, we should probably roll back the finishing of the original planting
      @planting.update(finished: false, finished_at: nil)
-      redirect_to @planting, alert: t('messages.transplant_error', errors: new_planting.errors.full_messages.to_sentence)
+      redirect_to @planting, alert: "There was an error transplanting the planting: #{new_planting.errors.full_messages.to_sentence}"
    end
  end

--- a/app/controllers/posts_controller.rb
+++ b/app/controllers/posts_controller.rb
@@ -29,17 +29,17 @@ class PostsController < ApplicationController
  def create
    params[:post][:author_id] = current_member.id
    @post = Post.new(post_params)
-    flash[:notice] = t('posts.created') if @post.save
+    flash[:notice] = 'Post was successfully created.' if @post.save
    respond_with(@post)
  end

  def update
-    flash[:notice] = t('posts.updated') if @post.update(post_params)
+    flash[:notice] = 'Post was successfully updated.' if @post.update(post_params)
    respond_with(@post)
  end

  def destroy
-    flash[:notice] = t('posts.deleted') if @post.destroy
+    flash[:notice] = 'Post was deleted.' if @post.destroy
    respond_with(@post)
  end

--- a/app/controllers/scientific_names_controller.rb
+++ b/app/controllers/scientific_names_controller.rb
@@ -54,7 +54,7 @@ class ScientificNamesController < ApplicationController
  def destroy
    @crop = @scientific_name.crop
    @scientific_name.destroy
-    flash[:notice] = t('scientific_names.deleted')
+    flash[:notice] = 'Scientific name was successfully deleted.'
    respond_with(@crop)
  end

--- a/app/controllers/seeds_controller.rb
+++ b/app/controllers/seeds_controller.rb
@@ -61,7 +61,7 @@ class SeedsController < DataController
    @seed.finished ||= false
    @seed.owner = current_member
    @seed.crop = @seed.parent_planting.crop if @seed.parent_planting
-    flash[:notice] = t('seeds.added_to_stash', crop: @seed.crop) if @seed.save
+    flash[:notice] = "Successfully added #{@seed.crop} seed to your stash." if @seed.save
    if params[:return] == 'planting'
      respond_with(@seed, location: @seed.parent_planting)
    else
@@ -70,7 +70,7 @@ class SeedsController < DataController
  end

  def update
-    flash[:notice] = t('seeds.updated') if @seed.update(seed_params)
+    flash[:notice] = 'Seed was successfully updated.' if @seed.update(seed_params)
    respond_with(@seed)
  end

--- a/app/controllers/sessions_controller.rb
+++ b/app/controllers/sessions_controller.rb
@@ -5,7 +5,7 @@ class SessionsController < Devise::SessionsController

  def create
    super do |_resource|
-      flash[:alert] = t('messages.crops_waiting') if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
+      flash[:alert] = "There are crops waiting to be wrangled." if Crop.pending_approval.present? && current_member.role?(:crop_wrangler)
    end
  end
 end
--- a/app/helpers/crops_helper.rb
+++ b/app/helpers/crops_helper.rb
@@ -62,7 +62,7 @@ module CropsHelper
            '@type': 'Person',
            name: post.author.login_name
          },
-          datePublished: post.created_at
+          'datePublished': post.created_at
        }
      end

--- a/app/models/ability.rb
+++ b/app/models/ability.rb
@@ -79,6 +79,7 @@ class Ability
      can :manage, CropCompanion
      can :manage, ScientificName
      can :manage, AlternateName
+      can :openfarm, Crop
      can :gbif, Crop
    end

--- a/app/models/crop.rb
+++ b/app/models/crop.rb
@@ -4,6 +4,7 @@ class Crop < ApplicationRecord
  has_paper_trail
  extend FriendlyId
  include PhotoCapable
+  include OpenFarmData
  include GbifData
  include SearchCrops

@@ -56,13 +57,13 @@ class Crop < ApplicationRecord
  validates :en_wikipedia_url,
            format: {
              with:    %r{\Ahttps?://en\.wikipedia\.org/wiki/[[:alnum:]%_.()-]+\z},
-              message: :not_a_valid_wikipedia_url
+              message: 'is not a valid English Wikipedia URL'
            },
            if:     :approved?
  validates :en_youtube_url,
            format: {
              with:    %r{\A(?:https?://)?(?:www\.)?(?:youtube(?:-nocookie)?\.com/(?:(?:v|e(?:mbed)?)/|\S*?[?&]v=)|youtu\.be/)[a-zA-Z0-9_-]{11}(?:[?&]\S*)?\z},
-              message: :not_a_valid_youtube_url
+              message: 'is not a valid YouTube URL'
            },
            allow_blank: true
  validates :name, uniqueness: { scope: :approval_status }, if: :pending?
@@ -189,12 +190,12 @@ class Crop < ApplicationRecord
    return if rejected?
    return unless reason_for_rejection.present? || rejection_notes.present?

-    errors.add(:approval_status, :rejection_reason_required)
+    errors.add(:approval_status, "must be rejected if a reason for rejection is present")
  end

  def must_have_meaningful_reason_for_rejection
    return unless reason_for_rejection == "other" && rejection_notes.blank?

-    errors.add(:rejection_notes, :rejection_notes_required)
+    errors.add(:rejection_notes, "must be added if the reason for rejection is \"other\"")
  end
 end
--- a/app/models/garden.rb
+++ b/app/models/garden.rb
@@ -32,7 +32,7 @@ class Garden < ApplicationRecord

  validates :name, uniqueness: { scope: :owner_id }
  validates :name,
-            format: { without: /\n/, message: :no_newlines },
+            format: { without: /\n/, message: "must contain no newlines" },
            allow_blank: false, presence: true,
            length: { maximum: 255 }

@@ -53,7 +53,7 @@ class Garden < ApplicationRecord
    "acres"         => "acre"
  }.freeze
  validates :area_unit, inclusion:   { in:      AREA_UNITS_VALUES.values,
-                                       message: :not_a_valid_area_unit },
+                                       message: "%<value>s is not a valid area unit" },
                        allow_blank: true

  def cleanup_area
--- a/app/models/garden_collaborator.rb
+++ b/app/models/garden_collaborator.rb
@@ -11,7 +11,7 @@ class GardenCollaborator < ApplicationRecord
    return unless member
    return unless garden

-    errors.add(:member_id, :cannot_be_garden_owner) if garden.owner == member
+    errors.add(:member_id, "cannot be the garden owner") if garden.owner == member
  end

  def member_slug
--- a/app/models/harvest.rb
+++ b/app/models/harvest.rb
@@ -58,18 +58,18 @@ class Harvest < ApplicationRecord
  ##
  ## Validations
  validates :crop, approved: true
-  validates :crop, presence: { message: :crop_not_found }
-  validates :plant_part, presence: { message: :crop_not_found }
+  validates :crop, presence: { message: "must be present and exist in our database" }
+  validates :plant_part, presence: { message: "must be present and exist in our database" }
  validates :harvested_at, presence: true
  validates :quantity, allow_nil: true, numericality: {
    only_integer: false, greater_than_or_equal_to: 0
  }
  validates :unit, allow_blank: true, inclusion: {
-    in: UNITS_VALUES.values, message: :not_a_valid_unit
+    in: UNITS_VALUES.values, message: "%<value>s is not a valid unit"
  }
  validates :weight_quantity, allow_nil: true, numericality: { only_integer: false }
  validates :weight_unit, allow_blank: true, inclusion: {
-    in: WEIGHT_UNITS_VALUES.values, message: :not_a_valid_unit
+    in: WEIGHT_UNITS_VALUES.values, message: "%<value>s is not a valid unit"
  }
  validate :crop_must_match_planting
  validate :owner_must_match_planting
@@ -147,7 +147,7 @@ class Harvest < ApplicationRecord
  def crop_must_match_planting
    return if planting.blank? # only check if we are linked to a planting

-    errors.add(:planting, :same_crop_required) unless crop == planting.crop
+    errors.add(:planting, "must be the same crop") unless crop == planting.crop
  end

  def owner_must_match_planting
@@ -155,13 +155,14 @@ class Harvest < ApplicationRecord

    return if owner == planting.owner || planting.garden.garden_collaborators.where(member_id: owner).any?

-    errors.add(:owner, :same_owner_required)
+    errors.add(:owner,
+               "of harvest must be the same as planting, or a collaborator on that garden")
  end

  def harvest_must_be_after_planting
    # only check if we are linked to a planting
    return unless harvested_at.present? && planting.present? && planting.planted_at.present?

-    errors.add(:planting, :harvest_after_planted) unless harvested_at > planting.planted_at
+    errors.add(:planting, "cannot be harvested before planting") unless harvested_at > planting.planted_at
  end
 end
--- a/app/models/member.rb
+++ b/app/models/member.rb
@@ -96,21 +96,21 @@ class Member < ApplicationRecord
  validates :tos_agreement, acceptance: { allow_nil: true, accept: true }
  validates :login_name,
            length:     {
-              minimum: 2, maximum: 25, message: :login_name_length
+              minimum: 2, maximum: 25, message: "should be between 2 and 25 characters long"
            },
            exclusion:  {
-              in: %w(growstuff admin moderator staff nearby), message: :login_name_reserved
+              in: %w(growstuff admin moderator staff nearby), message: "name is reserved"
            },
            format:     {
-              with: /\A\w+\z/, message: :login_name_format
+              with: /\A\w+\z/, message: "may only include letters, numbers, or underscores"
            },
            uniqueness: {
              case_sensitive: false
            }
-  validates :website_url, format: { with: %r{\Ahttps?://}, message: :url_format }, allow_blank: true
-  validates :other_url, format: { with: %r{\Ahttps?://}, message: :url_format }, allow_blank: true
+  validates :website_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
+  validates :other_url, format: { with: %r{\Ahttps?://}, message: "must start with http:// or https://" }, allow_blank: true
  validates :instagram_handle, :facebook_handle, :bluesky_handle,
-            format: { without: %r{\Ahttps?://|/}, message: :handle_format }, allow_blank: true
+            format: { without: %r{\Ahttps?://|/}, message: "should be a handle, not a URL" }, allow_blank: true

  #
  # Triggers
--- a/app/models/photo_association.rb
+++ b/app/models/photo_association.rb
@@ -29,12 +29,12 @@ class PhotoAssociation < ApplicationRecord
  def photo_and_item_have_same_owner
    return if photographable_type == 'Crop'

-    errors.add(:photo, :photo_owner_mismatch) unless photographable.owner_id == photo.owner_id
+    errors.add(:photo, "must have same owner as item it links to") unless photographable.owner_id == photo.owner_id
  end

  def crop_present
    return unless %w(Planting Seed Harvest).include?(photographable_type)

-    errors.add(:crop_id, :calculate_crop_failed) if crop_id.blank?
+    errors.add(:crop_id, "failed to calculate crop") if crop_id.blank?
  end
 end
--- a/app/models/planting.rb
+++ b/app/models/planting.rb
@@ -72,7 +72,7 @@ class Planting < ApplicationRecord
  ##
  ## Validations
  validates :garden, presence: true
-  validates :crop, presence: true, approved: { message: :crop_must_be_approved }
+  validates :crop, presence: true, approved: { message: "must be present and exist in our database" }
  validate :finished_must_be_after_planted
  validate :owner_must_match_garden_owner
  validate :cannot_be_finished_and_failed
@@ -80,10 +80,10 @@ class Planting < ApplicationRecord
    only_integer: true, greater_than_or_equal_to: 0
  }
  validates :sunniness, allow_blank: true, inclusion: {
-    in: SUNNINESS_VALUES, message: :not_a_valid_sunniness
+    in: SUNNINESS_VALUES, message: "%<value>s is not a valid sunniness value"
  }
  validates :planted_from, allow_blank: true, inclusion: {
-    in: PLANTED_FROM_VALUES, message: :not_a_valid_planting_method
+    in: PLANTED_FROM_VALUES, message: "%<value>s is not a valid planting method"
  }
  validates :overall_rating, allow_blank: true, numericality: {
    only_integer: true, greater_than_or_equal_to: 1, less_than_or_equal_to: 5
@@ -132,19 +132,20 @@ class Planting < ApplicationRecord
  private

  def cannot_be_finished_and_failed
-    errors.add(:failed, :failed_and_finished) if finished && failed
+    errors.add(:failed, "can't be true if planting is also finished") if finished && failed
  end

  # check that any finished_at date occurs after planted_at
  def finished_must_be_after_planted
    return unless planted_at && finished_at # only check if we have both

-    errors.add(:finished_at, :finished_after_planted) unless planted_at < finished_at
+    errors.add(:finished_at, "must be after the planting date") unless planted_at < finished_at
  end

  def owner_must_match_garden_owner
    return if owner == garden.owner || garden.garden_collaborators.where(member_id: owner).any?

-    errors.add(:owner, :same_owner_required)
+    errors.add(:owner,
+               "must be the same as garden, or a collaborator on that garden")
  end
 end
--- a/app/models/seed.rb
+++ b/app/models/seed.rb
@@ -28,7 +28,7 @@ class Seed < ApplicationRecord
  #
  # Validations
  validates :crop, approved: true
-  validates :crop, presence: { message: :crop_not_found }
+  validates :crop, presence: { message: "must be present and exist in our database" }
  validates :quantity, allow_nil:    true,
                       numericality: { only_integer: true, greater_than_or_equal_to: 0 }
  validates :days_until_maturity_min, allow_nil:    true,
@@ -36,15 +36,20 @@ class Seed < ApplicationRecord
  validates :days_until_maturity_max, allow_nil:    true,
                                      numericality: { only_integer: true, greater_than_or_equal_to: 0 }
  validates :tradable_to, allow_blank: false,
-                          inclusion:   { in: TRADABLE_TO_VALUES, message: :tradable_to_inclusion }
+                          inclusion:   { in: TRADABLE_TO_VALUES, message: "You may only trade seed nowhere, " \
+                                                                          "locally, nationally, or internationally" }
  validates :organic, allow_blank: false,
-                      inclusion:   { in: ORGANIC_VALUES, message: :organic_inclusion }
+                      inclusion:   { in: ORGANIC_VALUES, message: "You must say whether the seeds " \
+                                                                  "are organic or not, or that you don't know" }
  validates :gmo, allow_blank: false,
-                  inclusion:   { in: GMO_VALUES, message: :gmo_inclusion }
+                  inclusion:   { in: GMO_VALUES, message: "You must say whether the seeds are " \
+                                                          "genetically modified or not, or that you don't know" }
  validates :heirloom, allow_blank: false,
-                       inclusion:   { in: HEIRLOOM_VALUES, message: :heirloom_inclusion }
+                       inclusion:   { in: HEIRLOOM_VALUES, message: "You must say whether the seeds" \
+                                                                    "are heirloom, hybrid, or unknown" }
  validates :source, allow_blank: true,
-                     inclusion:   { in: SOURCE_VALUES, message: :source_inclusion }
+                     inclusion:   { in: SOURCE_VALUES, message: "You must say where the seeds are from," \
+                                                                "or that you don't know" }

  #
  # Delegations
--- a/app/services/gbif_service.rb
+++ b/app/services/gbif_service.rb
@@ -126,9 +126,12 @@ class GbifService

    gbif_record = fetch(gbif_usage_key)
    if gbif_record.present?
+      #   crop.update! openfarm_data: gbif_record.fetch('data', false)
+      #   save_companions(crop, gbif_record)
      save_photos(crop, gbif_usage_key)
    else
      Rails.logger.debug "\tcrop not found on GBIF"
+      #   crop.update!(openfarm_data: false)
    end
  end

--- a/app/views/alternate_names/_form.html.haml
+++ b/app/views/alternate_names/_form.html.haml
@@ -16,7 +16,7 @@
      %p
        %span.help-block
          For detailed crop wrangling guidelines, please consult the
-          = link_to "crop wrangling guide", "https://github.com/Growstuff/growstuff/wiki/Crop-Wrangling"
+          = link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
          on the Growstuff wiki.

      .form-group
--- a/app/views/scientific_names/_form.html.haml
+++ b/app/views/scientific_names/_form.html.haml
@@ -11,7 +11,7 @@
  %p
    %span.help-block
      For detailed crop wrangling guidelines, please consult the
-      = link_to "crop wrangling guide", "https://github.com/Growstuff/growstuff/wiki/Crop-Wrangling"
+      = link_to "crop wrangling guide", "http://wiki.growstuff.org/index.php/Crop_wrangling"
      on the Growstuff wiki.

  .form-group
--- a/config.rb
+++ b/config.rb
@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# Require any additional compass plugins here.
+# Set this to the root of your project when deployed:
+http_path = "/"
+css_dir = "app/assets/stylesheets"
+sass_dir = "app/assets/stylesheets"
+javascripts_dir = "app/assets/javascripts"
+images_dir      = "app/assets/images"
+
+# You can select your preferred output style here (can be overridden via the command line):
+# output_style = :expanded or :nested or :compact or :compressed
+
+# To enable relative paths to assets via compass helper functions. Uncomment:
+# relative_assets = true
+
+# To disable debugging comments that display the original location of your selectors. Uncomment:
+# line_comments = false
+
+# If you prefer the indented syntax, you might want to regenerate this
+# project again passing --syntax sass, or you can uncomment this:
+preferred_syntax = :sass
+# and then run:
+# sass-convert -R --from scss --to sass sass scss && rm -rf sass && mv scss sass
--- a/config/compass.rb
+++ b/config/compass.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+
+# Require any additional compass plugins here.
+project_type = :rails
--- a/config/initializers/new_framework_defaults_6_0.rb
+++ b/config/initializers/new_framework_defaults_6_0.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # Be sure to restart your server when you modify this file.
 #
 # This file contains migration options to ease your Rails 6.0 upgrade.
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -63,56 +63,6 @@ en:
      seed:
        one: seed
        other: seeds
-    errors:
-      messages:
-        crop_not_found: must be present and exist in our database
-        crop_must_be_approved: must be present and exist in our database
-        failed_and_finished: "can't be true if planting is also finished"
-        finished_after_planted: must be after the planting date
-        rejection_reason_required: must be rejected if a reason for rejection is present
-        rejection_notes_required: "must be added if the reason for rejection is \"other\""
-        same_crop_required: must be the same crop
-        harvest_after_planted: cannot be harvested before planting
-        cannot_be_garden_owner: cannot be the garden owner
-        same_owner_required: "of harvest must be the same as planting, or a collaborator on that garden"
-        photo_owner_mismatch: must have same owner as item it links to
-        calculate_crop_failed: failed to calculate crop
-        not_a_valid_wikipedia_url: is not a valid English Wikipedia URL
-        not_a_valid_youtube_url: is not a valid YouTube URL
-        not_a_valid_sunniness: "%{value} is not a valid sunniness value"
-        not_a_valid_planting_method: "%{value} is not a valid planting method"
-        not_a_valid_unit: "%{value} is not a valid unit"
-        not_a_valid_area_unit: "%{value} is not a valid area unit"
-        no_newlines: must contain no newlines
-      models:
-        member:
-          attributes:
-            login_name:
-              login_name_length: should be between 2 and 25 characters long
-              login_name_reserved: name is reserved
-              login_name_format: may only include letters, numbers, or underscores
-            website_url:
-              url_format: "must start with http:// or https://"
-            other_url:
-              url_format: "must start with http:// or https://"
-            instagram_handle:
-              handle_format: should be a handle, not a URL
-            facebook_handle:
-              handle_format: should be a handle, not a URL
-            bluesky_handle:
-              handle_format: should be a handle, not a URL
-        seed:
-          attributes:
-            tradable_to:
-              tradable_to_inclusion: "You may only trade seed nowhere, locally, nationally, or internationally"
-            organic:
-              organic_inclusion: "You must say whether the seeds are organic or not, or that you don't know"
-            gmo:
-              gmo_inclusion: "You must say whether the seeds are genetically modified or not, or that you don't know"
-            heirloom:
-              heirloom_inclusion: "You must say whether the seeds are heirloom, hybrid, or unknown"
-            source:
-              source_inclusion: "You must say where the seeds are from, or that you don't know"
  application_helper:
    title:
      title:
@@ -162,9 +112,6 @@ en:
  forums:
    index:
      title: Forums
-    created: Forum was successfully created.
-    updated: Forum was successfully updated.
-    deleted: Forum was successfully deleted.
  gardens:
    created: Garden was successfully created.
    deleted: Garden was successfully deleted.
@@ -261,8 +208,6 @@ en:
      trade_to: Will trade to
      unspecified: unspecified
      view_all: View all seeds
-    added_to_stash: Successfully added %{crop} seed to your stash.
-    updated: Seed was successfully updated.
    stats:
      member_linktext: "%{count} members"
      message_html: So far, %{member} have planted %{number_crops} %{number_plantings} in %{number_gardens}; and %{contributors} people have contributed to our code on %{github}!
@@ -330,21 +275,6 @@ en:
  links:
    my_gardens: My gardens

-  messages:
-    auth_success: Authentication successful.
-    auth_failed: Authentication failed.
-    crops_waiting: There are crops waiting to be wrangled.
-    followed: "Followed %{name}"
-    unfollowed: "Unfollowed %{name}"
-    follow_error: Already following or error while following.
-    transplant_success: Planting was successfully transplanted.
-    transplant_error: "There was an error transplanting the planting: %{errors}"
-    revert_success: "Reverted to version from %{date}"
-    revert_error: "Could not revert to version from %{date}. Errors: %{errors}"
-    invalid_location: Please enter a valid location
-    unable_to_like: Unable to like
-    unable_to_unlike: Unable to unlike
-
  members:
    edit_profile: Edit profile
    index:
@@ -412,22 +342,10 @@ en:
      progress_0_not_planted_yet: 'Progress: 0% - not planted yet'
  posts:
    write_blog_post: Write blog post
-    created: Post was successfully created.
-    updated: Post was successfully updated.
-    deleted: Post was deleted.
    index:
      title:
        author_posts: "%{author} posts"
        default: Everyone's posts
-  scientific_names:
-    deleted: Scientific name was successfully deleted.
-  alternate_names:
-    created: Alternate name was successfully created.
-    updated: Alternate name was successfully updated.
-    deleted: Alternate name was successfully deleted.
-  crop_companions:
-    created: Companion was successfully created.
-    deleted: Companion was successfully destroyed.
  seeds:
    form:
      trade_help: >
@@ -443,7 +361,6 @@ en:
        owner_seeds: "%{owner} seeds"
    save_seeds: Save seeds
    string: "%{crop} seeds belonging to %{owner}"
-    added_to_stash: Successfully added %{crop} seed to your stash.
  unauthorized:
    create:
      all: Please sign in or sign up to create a %{subject}.
--- a/db/migrate/20200801084007_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb
+++ b/db/migrate/20200801084007_add_foreign_key_constraint_to_active_storage_attachments_for_blob_id.active_storage.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # This migration comes from active_storage (originally 20180723000244)
 class AddForeignKeyConstraintToActiveStorageAttachmentsForBlobId < ActiveRecord::Migration[6.0]
  def up
--- a/db/migrate/20240101010101_add_fields_to_crops.rb
+++ b/db/migrate/20240101010101_add_fields_to_crops.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddFieldsToCrops < ActiveRecord::Migration[5.2]
  def change
    add_column :crops, :row_spacing, :integer
--- a/db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb
+++ b/db/migrate/20240101010102_populate_crop_fields_from_openfarm_data.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class PopulateCropFieldsFromOpenfarmData < ActiveRecord::Migration[5.2]
  def up
    Crop.find_each do |crop|
--- a/db/migrate/20240716120000_add_social_media_to_members.rb
+++ b/db/migrate/20240716120000_add_social_media_to_members.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddSocialMediaToMembers < ActiveRecord::Migration[6.0]
  def change
    add_column :members, :website_url, :string
--- a/db/migrate/20240716120001_rename_other_handle_to_other_url_in_members.rb
+++ b/db/migrate/20240716120001_rename_other_handle_to_other_url_in_members.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class RenameOtherHandleToOtherUrlInMembers < ActiveRecord::Migration[6.0]
  def change
    rename_column :members, :other_handle, :other_url
--- a/db/migrate/20240929041435_create_garden_collaborators.rb
+++ b/db/migrate/20240929041435_create_garden_collaborators.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class CreateGardenCollaborators < ActiveRecord::Migration[7.2]
  def change
    create_table :garden_collaborators do |t|
--- a/db/migrate/20241129215300_create_australian_food_classification_data.rb
+++ b/db/migrate/20241129215300_create_australian_food_classification_data.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class CreateAustralianFoodClassificationData < ActiveRecord::Migration[5.2]
  def change
    create_table :australian_food_classification_data do |t|
--- a/db/migrate/20250810120000_make_notifications_polymorphic.rb
+++ b/db/migrate/20250810120000_make_notifications_polymorphic.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class MakeNotificationsPolymorphic < ActiveRecord::Migration[6.1]
  def change
    add_column :notifications, :notifiable_type, :string
--- a/db/migrate/20250824081313_change_comments_polymorphic.rb
+++ b/db/migrate/20250824081313_change_comments_polymorphic.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class ChangeCommentsPolymorphic < ActiveRecord::Migration[7.2]
  def change
    add_column :comments, :commentable_type, :string
--- a/db/migrate/20250901105232_add_source_to_seeds.rb
+++ b/db/migrate/20250901105232_add_source_to_seeds.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddSourceToSeeds < ActiveRecord::Migration[7.2]
  def change
    add_column :seeds, :source, :string
--- a/db/migrate/20250901110545_add_indexes_crops.rb
+++ b/db/migrate/20250901110545_add_indexes_crops.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddIndexesCrops < ActiveRecord::Migration[7.2]
  def change
    add_index :alternate_names, :crop_id
--- a/db/migrate/20250901130830_add_overall_rating_plantings.rb
+++ b/db/migrate/20250901130830_add_overall_rating_plantings.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddOverallRatingPlantings < ActiveRecord::Migration[7.2]
  def change
    add_column :plantings, :overall_rating, :integer
--- a/db/migrate/20251128193317_add_en_youtube_url_to_crops.rb
+++ b/db/migrate/20251128193317_add_en_youtube_url_to_crops.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddEnYoutubeUrlToCrops < ActiveRecord::Migration[7.2]
  def change
    add_column :crops, :en_youtube_url, :string
--- a/db/migrate/20251130035700_create_versions.rb
+++ b/db/migrate/20251130035700_create_versions.rb
@@ -1,5 +1,3 @@
-# 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]
@@ -37,6 +35,6 @@ class CreateVersions < ActiveRecord::Migration[7.2]
      t.string   :event,     null: false
      t.text     :object, limit: TEXT_BYTES
    end
-    add_index :versions, %i(item_type item_id)
+    add_index :versions, %i[item_type item_id]
  end
 end
--- a/db/migrate/20251130035701_add_object_changes_to_versions.rb
+++ b/db/migrate/20251130035701_add_object_changes_to_versions.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 # This migration adds the optional `object_changes` column, in which PaperTrail
 # will store the `changes` diff for each update event. See the readme for
 # details.
--- a/db/migrate/20251130053104_add_public_food_key_to_crops.rb
+++ b/db/migrate/20251130053104_add_public_food_key_to_crops.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 class AddPublicFoodKeyToCrops < ActiveRecord::Migration[5.2]
  def change
    add_column :crops, :public_food_key, :string
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,76 +0,0 @@
-version: '3.8'
-
-services:
-  web:
-    build: .
-    ports:
-      - "3000:3000"
-    depends_on:
-      db:
-        condition: service_healthy
-      elasticsearch:
-        condition: service_healthy
-    environment:
-      DATABASE_URL: postgresql://postgres:postgres@db:5432/growstuff_prod
-      ELASTICSEARCH_URL: http://elasticsearch:9200/
-      RAILS_ENV: production
-      RAILS_LOG_TO_STDOUT: "true"
-      RAILS_SERVE_STATIC_FILES: "true"
-      APP_DOMAIN_NAME: localhost:3000
-      APP_PROTOCOL: http
-      DEVISE_SECRET_KEY: secret
-      GROWSTUFF_EMAIL: "noreply@test.growstuff.org"
-      GROWSTUFF_FLICKR_KEY: secretkey
-      GROWSTUFF_FLICKR_SECRET: secretsecret
-      GROWSTUFF_SITE_NAME: "Growstuff (local)"
-      RAILS_SECRET_TOKEN: supersecret
-      SECRET_KEY_BASE: supersecretbase
-
-  db:
-    image: postgres:17
-    restart: unless-stopped
-    volumes:
-      - postgres-data:/var/lib/postgresql/data
-      - .devcontainer/create-db-user.sql:/docker-entrypoint-initdb.d/create-db-user.sql
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_DB: growstuff_prod
-      POSTGRES_PASSWORD: postgres
-    ports:
-      - "5432:5432"
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-
-  elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.4.0
-    container_name: elasticsearch
-    restart: unless-stopped
-    environment:
-      - xpack.security.enabled=false
-      - discovery.type=single-node
-    ulimits:
-      memlock:
-        soft: -1
-        hard: -1
-      nofile:
-        soft: 65536
-        hard: 65536
-    cap_add:
-      - IPC_LOCK
-    healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:9200 | grep tagline"]
-      interval: 10s
-      timeout: 10s
-      retries: 120
-    volumes:
-      - esdata01:/usr/share/elasticsearch/data
-    ports:
-      - 9200:9200
-      - 9300:9300
-
-volumes:
-  postgres-data:
-  esdata01:
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,8 +0,0 @@
-#!/bin/bash
-set -e
-
-# Remove a potentially pre-existing server.pid for Rails.
-rm -f /app/tmp/pids/server.pid
-
-# Then exec the container's main process (what's set as CMD in the Dockerfile).
-exec "$@"
--- a/lib/tasks/import.rake
+++ b/lib/tasks/import.rake
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'csv'

 namespace :import do
--- a/spec/controllers/api/v1/plantings_controller_spec.rb
+++ b/spec/controllers/api/v1/plantings_controller_spec.rb
@@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe Api::V1::PlantingsController do
+RSpec.describe Api::V1::PlantingsController, type: :controller do
  subject { JSON.parse response.body }

  let!(:member) { create(:member) }
@@ -42,7 +42,7 @@ RSpec.describe Api::V1::PlantingsController 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).to have_http_status :ok }
+        it { expect(response.status).to eq 200 }
      end

      context 'with photo' do
@@ -81,7 +81,7 @@ RSpec.describe Api::V1::PlantingsController 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).to have_http_status :ok }
+        it { expect(response.status).to eq 200 }
      end
    end
  end
--- a/spec/controllers/authentications_controller_spec.rb
+++ b/spec/controllers/authentications_controller_spec.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe AuthenticationsController do
+  before do
+    @member = create(:member)
+    sign_in @member
+    controller.stub(:current_member) { @member }
+    @auth = create(:authentication, member: @member)
+    request.env['omniauth.auth'] = {
+      'provider'    => 'foo',
+      'uid'         => 'bar',
+      'info'        => { 'nickname' => 'blah' },
+      'credentials' => { 'token' => 'blah', 'secret' => 'blah' }
+    }
+  end
+end
--- a/spec/controllers/forums_controller_spec.rb
+++ b/spec/controllers/forums_controller_spec.rb
@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+require 'rails_helper'
+
+describe ForumsController do
+  login_member(:admin_member)
+
+  def valid_attributes
+    {
+      "name"        => "MyString",
+      "description" => "Something",
+      "owner_id"    => 1
+    }
+  end
+
+  def valid_session
+    {}
+  end
+end
--- a/spec/controllers/garden_types_controller_spec.rb
+++ b/spec/controllers/garden_types_controller_spec.rb
@@ -2,7 +2,7 @@

 require 'rails_helper'

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

  let(:valid_params) { { name: 'My second GardenType' } }
@@ -24,42 +24,29 @@ RSpec.describe GardenTypesController do
    describe 'changing existing records' do
      before do
        allow(GardenType).to receive(:find).and_return(:garden_type)
+        expect(garden_type).not_to receive(:save)
+        expect(garden_type).not_to receive(:save!)
+        expect(garden_type).not_to receive(:update)
+        expect(garden_type).not_to receive(:update!)
+        expect(garden_type).not_to receive(:destroy)
      end

      describe 'GET edit' do
-        it "redirects to root" do
-          expect(garden_type).not_to receive(:save)
-          expect(garden_type).not_to receive(:save!)
-          expect(garden_type).not_to receive(:update)
-          expect(garden_type).not_to receive(:update!)
-          expect(garden_type).not_to receive(:destroy)
-          get :edit, params: { id: garden_type.to_param }
-          expect(response).to redirect_to(root_path)
-        end
+        before { get :edit, params: { id: garden_type.to_param } }
+
+        it { expect(response).to redirect_to(root_path) }
      end

      describe 'POST update' do
-        it "redirects to root" do
-          expect(garden_type).not_to receive(:save)
-          expect(garden_type).not_to receive(:save!)
-          expect(garden_type).not_to receive(:update)
-          expect(garden_type).not_to receive(:update!)
-          expect(garden_type).not_to receive(:destroy)
-          post :update, params: { id: garden_type.to_param, garden_type: valid_params }
-          expect(response).to redirect_to(root_path)
-        end
+        before { post :update, params: { id: garden_type.to_param, garden_type: valid_params } }
+
+        it { expect(response).to redirect_to(root_path) }
      end

      describe 'DELETE' do
-        it "redirects to root" do
-          expect(garden_type).not_to receive(:save)
-          expect(garden_type).not_to receive(:save!)
-          expect(garden_type).not_to receive(:update)
-          expect(garden_type).not_to receive(:update!)
-          expect(garden_type).not_to receive(:destroy)
-          delete :destroy, params: { id: garden_type.to_param, params: { garden_type: valid_params } }
-          expect(response).to redirect_to(root_path)
-        end
+        before { delete :destroy, params: { id: garden_type.to_param, params: { garden_type: valid_params } } }
+
+        it { expect(response).to redirect_to(root_path) }
      end
    end
  end
@@ -73,43 +60,30 @@ RSpec.describe GardenTypesController do
      let(:any_garden_type) { double('garden_type') }

      before do
-        allow(GardenType).to receive(:find).and_return(:any_garden_type)
+        expect(GardenType).to receive(:find).and_return(:any_garden_type)
+        expect(any_garden_type).not_to receive(:save)
+        expect(any_garden_type).not_to receive(:save!)
+        expect(any_garden_type).not_to receive(:update)
+        expect(any_garden_type).not_to receive(:update!)
+        expect(any_garden_type).not_to receive(:destroy)
      end

      describe 'GET edit' do
-        it "redirects to root" do
-          expect(any_garden_type).not_to receive(:save)
-          expect(any_garden_type).not_to receive(:save!)
-          expect(any_garden_type).not_to receive(:update)
-          expect(any_garden_type).not_to receive(:update!)
-          expect(any_garden_type).not_to receive(:destroy)
-          get :edit, params: { id: any_garden_type.to_param }
-          expect(response).to redirect_to(root_path)
-        end
+        before { get :edit, params: { id: any_garden_type.to_param } }
+
+        it { expect(response).to redirect_to(root_path) }
      end

      describe 'POST update' do
-        it "redirects to root" do
-          expect(any_garden_type).not_to receive(:save)
-          expect(any_garden_type).not_to receive(:save!)
-          expect(any_garden_type).not_to receive(:update)
-          expect(any_garden_type).not_to receive(:update!)
-          expect(any_garden_type).not_to receive(:destroy)
-          post :update, params: { id: any_garden_type.to_param, garden_type: valid_params }
-          expect(response).to redirect_to(root_path)
-        end
+        before { post :update, params: { id: any_garden_type.to_param, garden_type: valid_params } }
+
+        it { expect(response).to redirect_to(root_path) }
      end

      describe 'DELETE' do
-        it "redirects to root" do
-          expect(any_garden_type).not_to receive(:save)
-          expect(any_garden_type).not_to receive(:save!)
-          expect(any_garden_type).not_to receive(:update)
-          expect(any_garden_type).not_to receive(:update!)
-          expect(any_garden_type).not_to receive(:destroy)
-          delete :destroy, params: { id: any_garden_type.to_param, params: { garden_type: valid_params } }
-          expect(response).to redirect_to(root_path)
-        end
+        before { delete :destroy, params: { id: any_garden_type.to_param, params: { garden_type: valid_params } } }
+
+        it { expect(response).to redirect_to(root_path) }
      end
    end
  end
--- a/spec/controllers/gardens_controller_spec.rb
+++ b/spec/controllers/gardens_controller_spec.rb
@@ -2,7 +2,7 @@

 require 'rails_helper'

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

  let(:valid_params) { { name: 'My second Garden' } }
@@ -25,42 +25,29 @@ RSpec.describe GardensController do
    describe 'changing existing records' do
      before do
        allow(Garden).to receive(:find).and_return(:garden)
+        expect(garden).not_to receive(:save)
+        expect(garden).not_to receive(:save!)
+        expect(garden).not_to receive(:update)
+        expect(garden).not_to receive(:update!)
+        expect(garden).not_to receive(:destroy)
      end

      describe 'GET edit' do
-        it "redirects to login" do
-          expect(garden).not_to receive(:save)
-          expect(garden).not_to receive(:save!)
-          expect(garden).not_to receive(:update)
-          expect(garden).not_to receive(:update!)
-          expect(garden).not_to receive(:destroy)
-          get :edit, params: { slug: garden.to_param }
-          expect(response).to redirect_to(new_member_session_path)
-        end
+        before { get :edit, params: { slug: garden.to_param } }
+
+        it { expect(response).to redirect_to(new_member_session_path) }
      end

      describe 'POST update' do
-        it "redirects to login" do
-          expect(garden).not_to receive(:save)
-          expect(garden).not_to receive(:save!)
-          expect(garden).not_to receive(:update)
-          expect(garden).not_to receive(:update!)
-          expect(garden).not_to receive(:destroy)
-          post :update, params: { slug: garden.to_param, garden: valid_params }
-          expect(response).to redirect_to(new_member_session_path)
-        end
+        before { post :update, params: { slug: garden.to_param, garden: valid_params } }
+
+        it { expect(response).to redirect_to(new_member_session_path) }
      end

      describe 'DELETE' do
-        it "redirects to login" do
-          expect(garden).not_to receive(:save)
-          expect(garden).not_to receive(:save!)
-          expect(garden).not_to receive(:update)
-          expect(garden).not_to receive(:update!)
-          expect(garden).not_to receive(:destroy)
-          delete :destroy, params: { slug: garden.to_param, params: { garden: valid_params } }
-          expect(response).to redirect_to(new_member_session_path)
-        end
+        before { delete :destroy, params: { slug: garden.to_param, params: { garden: valid_params } } }
+
+        it { expect(response).to redirect_to(new_member_session_path) }
      end
    end
  end
@@ -74,43 +61,30 @@ RSpec.describe GardensController do
      let(:not_my_garden) { double('garden') }

      before do
-        allow(Garden).to receive(:find).and_return(:not_my_garden)
+        expect(Garden).to receive(:find).and_return(:not_my_garden)
+        expect(not_my_garden).not_to receive(:save)
+        expect(not_my_garden).not_to receive(:save!)
+        expect(not_my_garden).not_to receive(:update)
+        expect(not_my_garden).not_to receive(:update!)
+        expect(not_my_garden).not_to receive(:destroy)
      end

      describe 'GET edit' do
-        it "redirects to root" do
-          expect(not_my_garden).not_to receive(:save)
-          expect(not_my_garden).not_to receive(:save!)
-          expect(not_my_garden).not_to receive(:update)
-          expect(not_my_garden).not_to receive(:update!)
-          expect(not_my_garden).not_to receive(:destroy)
-          get :edit, params: { slug: not_my_garden.to_param }
-          expect(response).to redirect_to(root_path)
-        end
+        before { get :edit, params: { slug: not_my_garden.to_param } }
+
+        it { expect(response).to redirect_to(root_path) }
      end

      describe 'POST update' do
-        it "redirects to root" do
-          expect(not_my_garden).not_to receive(:save)
-          expect(not_my_garden).not_to receive(:save!)
-          expect(not_my_garden).not_to receive(:update)
-          expect(not_my_garden).not_to receive(:update!)
-          expect(not_my_garden).not_to receive(:destroy)
-          post :update, params: { slug: not_my_garden.to_param, garden: valid_params }
-          expect(response).to redirect_to(root_path)
-        end
+        before { post :update, params: { slug: not_my_garden.to_param, garden: valid_params } }
+
+        it { expect(response).to redirect_to(root_path) }
      end

      describe 'DELETE' do
-        it "redirects to root" do
-          expect(not_my_garden).not_to receive(:save)
-          expect(not_my_garden).not_to receive(:save!)
-          expect(not_my_garden).not_to receive(:update)
-          expect(not_my_garden).not_to receive(:update!)
-          expect(not_my_garden).not_to receive(:destroy)
-          delete :destroy, params: { slug: not_my_garden.to_param, params: { garden: valid_params } }
-          expect(response).to redirect_to(root_path)
-        end
+        before { delete :destroy, params: { slug: not_my_garden.to_param, params: { garden: valid_params } } }
+
+        it { expect(response).to redirect_to(root_path) }
      end
    end
  end
--- a/spec/controllers/harvests_controller_spec.rb
+++ b/spec/controllers/harvests_controller_spec.rb
@@ -15,12 +15,12 @@ describe HarvestsController, :search do
  end

  describe "GET index" do
-    let!(:first_member)     { create(:member)                                                  }
-    let(:second_member)     { create(:member)                                                  }
-    let(:tomato)            { create(:tomato)                                                  }
-    let(:maize)             { create(:maize)                                                   }
-    let!(:tomato_harvest)   { create(:harvest, owner_id: first_member.id, crop_id: tomato.id)  }
-    let!(:maize_harvest)    { create(:harvest, owner_id: second_member.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 }

@@ -28,16 +28,16 @@ describe HarvestsController, :search do
      before { get :index, params: {} }

      it { expect(assigns(:harvests).size).to eq 2 }
-      it { expect(assigns(:harvests)[0].slug).to eq tomato_harvest.slug }
-      it { expect(assigns(:harvests)[1].slug).to eq maize_harvest.slug }
+      it { expect(assigns(:harvests)[0].slug).to eq harvest1.slug }
+      it { expect(assigns(:harvests)[1].slug).to eq harvest2.slug }
    end

    describe "picks up owner from params and shows owner's harvests only" do
-      before { get :index, params: { member_slug: first_member.slug } }
+      before { get :index, params: { member_slug: member1.slug } }

-      it { expect(assigns(:owner)).to eq first_member }
+      it { expect(assigns(:owner)).to eq member1 }
      it { expect(assigns(:harvests).size).to eq 1 }
-      it { expect(assigns(:harvests)[0].slug).to eq tomato_harvest.slug }
+      it { expect(assigns(:harvests)[0].slug).to eq harvest1.slug }
    end

    describe "picks up crop from params and shows the harvests for the crop only" do
@@ -45,13 +45,13 @@ describe HarvestsController, :search do

      it { expect(assigns(:crop)).to eq maize }
      it { expect(assigns(:harvests).size).to eq 1 }
-      it { expect(assigns(:harvests)[0].slug).to eq maize_harvest.slug }
+      it { expect(assigns(:harvests)[0].slug).to eq harvest2.slug }
    end

    describe "generates a csv" do
      before { get :index, format: "csv" }

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

--- a/spec/controllers/likes_controller_spec.rb
+++ b/spec/controllers/likes_controller_spec.rb
@@ -19,7 +19,7 @@ describe LikesController do
    it { JSON.parse(response.body)["description"] == "1 like" }

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

@@ -29,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).to have_http_status(:ok) }
+      it { expect(response.code).to eq('200') }
      it { JSON.parse(response.body)["description"] == "0 likes" }
    end

    describe "Deleting someone else's like" do
      let(:like) { create(:like) }

-      it { expect(response).to have_http_status(:forbidden) }
+      it { expect(response.code).to eq('403') }
      it { JSON.parse(response.body)["error"] == "Unable to like" }
    end
  end
--- a/spec/controllers/plantings_controller_spec.rb
+++ b/spec/controllers/plantings_controller_spec.rb
@@ -13,12 +13,12 @@ describe PlantingsController, :search do
  end

  describe "GET index", :search do
-    let!(:first_member)      { create(:member)                                                       }
-    let!(:second_member)     { create(:member)                                                       }
-    let!(:tomato)            { create(:tomato)                                                       }
-    let!(:maize)             { create(:maize)                                                        }
-    let!(:tomato_planting)   { create(:planting, crop: tomato, owner: first_member, created_at: 1.day.ago) }
-    let!(:maize_planting)    { create(:planting, crop: maize, owner: second_member, 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
@@ -28,23 +28,23 @@ describe PlantingsController, :search do
      before { get :index }

      it { expect(assigns(:plantings).size).to eq 2 }
-      it { expect(assigns(:plantings)[0]['slug']).to eq tomato_planting.slug }
-      it { expect(assigns(:plantings)[1]['slug']).to eq maize_planting.slug }
+      it { expect(assigns(:plantings)[0]['slug']).to eq planting1.slug }
+      it { expect(assigns(:plantings)[1]['slug']).to eq planting2.slug }
    end

    describe "picks up owner from params and shows owner's plantings only" do
-      before { get :index, params: { member_slug: first_member.slug } }
+      before { get :index, params: { member_slug: member1.slug } }

-      it { expect(assigns(:owner)).to eq first_member }
+      it { expect(assigns(:owner)).to eq member1 }
      it { expect(assigns(:plantings).size).to eq 1 }
-      it { expect(assigns(:plantings).first['slug']).to eq tomato_planting.slug }
+      it { expect(assigns(:plantings).first['slug']).to eq planting1.slug }
    end

    describe "picks up crop from params and shows the plantings for the crop only" do
      before { get :index, params: { crop_slug: maize.slug } }

      it { expect(assigns(:crop)).to eq maize }
-      it { expect(assigns(:plantings).first['slug']).to eq maize_planting.slug }
+      it { expect(assigns(:plantings).first['slug']).to eq planting2.slug }
    end
  end

--- a/spec/controllers/seeds_controller_spec.rb
+++ b/spec/controllers/seeds_controller_spec.rb
@@ -21,6 +21,10 @@ describe SeedsController, :search do

    it { expect(response).to be_successful }

+    context 'no parent planting' do
+      before { get :new }
+    end
+
    context 'with parent planting' do
      let!(:planting) { create(:planting, owner:) }

--- a/spec/factories/garden_collaborators.rb
+++ b/spec/factories/garden_collaborators.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 FactoryBot.define do
  factory :garden_collaborator do
    garden
--- a/spec/features/activities/creating_a_recurring_activity_spec.rb
+++ b/spec/features/activities/creating_a_recurring_activity_spec.rb
@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 require 'rails_helper'

 RSpec.feature 'Creating a recurring activity' do
--- a/spec/features/admin/forums_spec.rb
+++ b/spec/features/admin/forums_spec.rb
@@ -22,6 +22,7 @@ describe "forums", :js do
    before do
      visit forums_path
      click_link "New forum"
+      expect(page).to have_current_path new_forum_path, ignore_query: true
      fill_in 'Name', with: 'Discussion'
      fill_in 'Description', with: "this is a new forum"
      select member.login_name, from: "Owner"
--- a/spec/features/admin/plant_parts_spec.rb
+++ b/spec/features/admin/plant_parts_spec.rb
@@ -23,6 +23,7 @@ describe "plant parts", :js do
    before do
      visit plant_parts_path
      click_link "New plant part"
+      expect(page).to have_current_path new_plant_part_path, ignore_query: true
      fill_in 'Name', with: "this is a new plant part"
      click_button 'Save'
    end
--- a/spec/features/admin/roles_spec.rb
+++ b/spec/features/admin/roles_spec.rb
@@ -23,6 +23,7 @@ describe "roles", :js do
    before do
      visit admin_roles_path
      click_link "New role"
+      expect(page).to have_current_path new_admin_role_path, ignore_query: true
      fill_in 'Name', with: 'Discussion'
      fill_in 'Description', with: "this is a new role"
      click_button 'Save'
--- a/spec/features/conversations/index_spec.rb
+++ b/spec/features/conversations/index_spec.rb
@@ -18,7 +18,7 @@ describe "Conversations", :js do
      click_link 'Inbox'
    end

-    include_examples 'is accessible'
+    it_behaves_like 'is accessible'

    it { expect(page).to have_content 'something i want to say' }
    it { page.percy_snapshot(page, name: 'conversations#index') }
--- a/spec/features/crops/alternate_name_spec.rb
+++ b/spec/features/crops/alternate_name_spec.rb
@@ -83,23 +83,23 @@ describe "Alternate names", :js do
  end

  context 'Anonymous' do
-    include_examples 'show alt names'
+    it_behaves_like 'show alt names'
  end

  context 'Signed in member' do
    include_context 'signed in member'
-    include_examples 'show alt names'
+    it_behaves_like 'show alt names'
  end

  context 'Crop wrangler' do
    include_context 'signed in crop wrangler'
-    include_examples 'show alt names'
-    include_examples 'edit alt names'
+    it_behaves_like 'show alt names'
+    it_behaves_like 'edit alt names'
  end

  context 'Admin' do
    include_context 'signed in admin'
-    include_examples 'show alt names'
-    include_examples 'edit alt names'
+    it_behaves_like 'show alt names'
+    it_behaves_like 'edit alt names'
  end
 end
--- a/spec/features/crops/browse_crops_spec.rb
+++ b/spec/features/crops/browse_crops_spec.rb
@@ -34,25 +34,25 @@ describe "browse crops", :search do
  end

  context 'anon' do
-    include_examples 'shows crops'
+    it_behaves_like 'shows crops'
    it { expect(page).to have_no_link "Add New Crop" }
  end

  context 'member' do
    include_context 'signed in member'
-    include_examples 'shows crops'
-    include_examples 'add new crop'
+    it_behaves_like 'shows crops'
+    it_behaves_like 'add new crop'
  end

  context 'wrangler' do
    include_context 'signed in crop wrangler'
-    include_examples 'shows crops'
-    include_examples 'add new crop'
+    it_behaves_like 'shows crops'
+    it_behaves_like 'add new crop'
  end

  context 'admin' do
    include_context 'signed in admin'
-    include_examples 'shows crops'
-    include_examples 'add new crop'
+    it_behaves_like 'shows crops'
+    it_behaves_like 'add new crop'
  end
 end
--- a/spec/features/crops/creating_a_crop_spec.rb
+++ b/spec/features/crops/creating_a_crop_spec.rb
@@ -33,7 +33,7 @@ describe "Crop", :js do

  shared_examples 'request crop' do
    describe "requesting a crop with multiple scientific and alternate name" do
-      include_examples 'fill in form'
+      it_behaves_like 'fill in form'
      before do
        within "form#new_crop" do
          fill_in "request_notes", with: "This is the Philippine national flower."
@@ -50,7 +50,7 @@ describe "Crop", :js do

  shared_examples 'create crop' do
    describe "creating a crop with multiple scientific and alternate name" do
-      include_examples 'fill in form'
+      it_behaves_like 'fill in form'
      before do
        click_button "Save"
      end
@@ -69,16 +69,16 @@ describe "Crop", :js do

  context 'member' do
    include_context 'signed in member'
-    include_examples 'request crop'
+    it_behaves_like 'request crop'
  end

  context 'crop wrangler' do
    include_context 'signed in crop wrangler'
-    include_examples 'create crop'
+    it_behaves_like 'create crop'
  end

  context 'admin' do
    include_context 'signed in admin'
-    include_examples 'create crop'
+    it_behaves_like 'create crop'
  end
 end
--- a/spec/features/crops/crop_photos_spec.rb
+++ b/spec/features/crops/crop_photos_spec.rb
@@ -15,44 +15,41 @@ describe "crop detail page", :js, :search do
  let!(:planting) { create(:planting, crop:, owner: owner_member) }
  let!(:seed)     { create(:seed, crop:, owner: owner_member)     }

-  let!(:first_planting_photo)  { create(:photo, owner: owner_member) }
-  let!(:second_planting_photo) { create(:photo, owner: owner_member) }
-  let!(:first_harvest_photo)   { create(:photo, owner: owner_member) }
-  let!(:second_harvest_photo)  { create(:photo, owner: owner_member) }
-  let!(:first_seed_photo)      { create(:photo, owner: owner_member) }
-  let!(:second_seed_photo)     { 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 << first_planting_photo
-    planting.photos << second_planting_photo
-    harvest.photos << first_harvest_photo
-    harvest.photos << second_harvest_photo
-    seed.photos << first_seed_photo
-    seed.photos << second_seed_photo
+    planting.photos << photo1
+    planting.photos << photo2
+    harvest.photos << photo3
+    harvest.photos << photo4
+    seed.photos << photo5
+    seed.photos << photo6
    Crop.reindex
    visit crop_path(crop)
+    expect(crop.photos.count).to eq 6
+    expect(crop.photos.by_model(Planting).count).to eq 2
+    expect(page).to have_content 'Photos'
  end

  shared_examples "shows photos" do
-    it "shows the photo section" do
-      expect(crop.photos.count).to eq 6
-      expect(crop.photos.by_model(Planting).count).to eq 2
-      expect(page).to have_content 'Photos'
-    end
-
    describe "show planting photos" do
-      it { is_expected.to have_xpath("//img[contains(@src,'#{first_planting_photo.fullsize_url}')]") }
-      it { is_expected.to have_xpath("//img[contains(@src,'#{second_planting_photo.fullsize_url}')]") }
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo1.fullsize_url}')]") }
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo2.fullsize_url}')]") }
    end

    describe "show harvest photos" do
-      it { is_expected.to have_xpath("//img[contains(@src,'#{first_harvest_photo.fullsize_url}')]") }
-      it { is_expected.to have_xpath("//img[contains(@src,'#{second_harvest_photo.fullsize_url}')]") }
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo3.fullsize_url}')]") }
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo4.fullsize_url}')]") }
    end

    describe "show seed photos" do
-      it { is_expected.to have_xpath("//img[contains(@src,'#{first_seed_photo.fullsize_url}')]") }
-      it { is_expected.to have_xpath("//img[contains(@src,'#{second_seed_photo.fullsize_url}')]") }
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo5.fullsize_url}')]") }
+      it { is_expected.to have_xpath("//img[contains(@src,'#{photo6.fullsize_url}')]") }
    end

    describe "link to more photos" do
@@ -62,17 +59,17 @@ describe "crop detail page", :js, :search do

  context "when signed in" do
    include_context 'signed in member'
-    include_examples "shows photos"
+    it_behaves_like "shows photos"
  end

  context "when signed in as photos owner" do
    include_context 'signed in member'
    let(:member) { owner_member }

-    include_examples "shows photos"
+    it_behaves_like "shows photos"
  end

  context "when not signed in" do
-    include_examples "shows photos"
+    it_behaves_like "shows photos"
  end
 end
--- a/spec/features/crops/delete_crop_spec.rb
+++ b/spec/features/crops/delete_crop_spec.rb
@@ -27,11 +27,11 @@ describe "Delete crop spec" do

  context "As a crop wrangler" do
    include_context 'signed in crop wrangler'
-    include_examples 'delete crop'
+    it_behaves_like 'delete crop'
  end

  context 'admin' do
    include_context 'signed in admin'
-    include_examples 'delete crop'
+    it_behaves_like 'delete crop'
  end
 end
--- a/spec/features/gardens/actions_spec.rb
+++ b/spec/features/gardens/actions_spec.rb
@@ -25,7 +25,7 @@ describe "Gardens" do
      context 'my gardens' do
        before { visit gardens_path(member_slug: member.slug) }

-        include_examples "has buttons bar at top"
+        it_behaves_like "has buttons bar at top"

        context 'with actions menu expanded' do
          before { click_link 'Actions' }
@@ -43,13 +43,13 @@ describe "Gardens" do
      context 'all gardens' do
        before { visit gardens_path }

-        include_examples "has buttons bar at top"
+        it_behaves_like "has buttons bar at top"
      end

      context "other member's garden" do
        before { visit gardens_path(member_slug: create(:member).slug) }

-        include_examples "has buttons bar at top"
+        it_behaves_like "has buttons bar at top"
        describe 'does not show actions on other member garden' do
          it { is_expected.to have_no_link 'Actions' }
        end
--- a/spec/features/gardens/adding_gardens_spec.rb
+++ b/spec/features/gardens/adding_gardens_spec.rb
@@ -8,7 +8,7 @@ describe "Gardens", :js do
    include_context 'signed in member'
    before { visit new_garden_path }

-    include_examples 'is accessible'
+    it_behaves_like 'is accessible'

    it "displays required and optional fields properly" do
      expect(page).to have_css ".required", text: "Name"
--- a/spec/features/gardens/index_spec.rb
+++ b/spec/features/gardens/index_spec.rb
@@ -14,7 +14,7 @@ describe "Gardens#index", :js do
        visit member_gardens_path(member_slug: member.slug)
      end

-      include_examples 'is accessible'
+      it_behaves_like 'is accessible'

      it "displays each of the gardens" do
        member.gardens.each do |garden|
--- a/spec/features/likeable_spec.rb
+++ b/spec/features/likeable_spec.rb
@@ -58,13 +58,13 @@ describe 'Likeable', :js, :search do
    describe 'photos#index' do
      let(:path) { photos_path }

-      include_examples 'object can be liked'
+      it_behaves_like 'object can be liked'
    end

    describe 'photos#show' do
      let(:path) { photo_path(photo) }

-      include_examples 'object can be liked'
+      it_behaves_like 'object can be liked'
    end

    describe 'crops#show' do
@@ -74,7 +74,7 @@ describe 'Likeable', :js, :search do

      before { planting.photos << photo }

-      include_examples 'object can be liked'
+      it_behaves_like 'object can be liked'
    end
  end

@@ -82,27 +82,27 @@ describe 'Likeable', :js, :search do
    let(:like_count_class) { ".post-#{post.id} .like-count" }
    let(:path) { post_path(post) }

-    include_examples 'object can be liked'
+    it_behaves_like 'object can be liked'
  end

  describe 'activities' do
    let(:like_count_class) { ".activity-#{activity.id} .like-count" }
    let(:path) { activity_path(activity) }

-    include_examples 'object can be liked'
+    it_behaves_like 'object can be liked'
  end

  describe 'plantings' do
    let(:like_count_class) { ".planting-#{planting.id} .like-count" }
    let(:path) { planting_path(planting) }

-    include_examples 'object can be liked'
+    it_behaves_like 'object can be liked'
  end

  describe 'harvests' do
    let(:like_count_class) { ".harvest-#{harvest.id} .like-count" }
    let(:path) { harvest_path(harvest) }

-    include_examples 'object can be liked'
+    it_behaves_like 'object can be liked'
  end
 end
--- a/spec/features/members/list_spec.rb
+++ b/spec/features/members/list_spec.rb
@@ -6,29 +6,27 @@ describe "members list" do
  context "list all members" do
    subject { page.all("#maincontainer h4.login-name") }

-    let!(:archaeopteryx) { create(:member, login_name: "Archaeopteryx", confirmed_at: Time.zone.parse('2013-02-10')) }
-    let!(:zephyrosaurus) { create(:member, login_name: "Zephyrosaurus", confirmed_at: Time.zone.parse('2014-01-11')) }
-    let!(:testingname)   { create(:member, login_name: "Testingname", confirmed_at: Time.zone.parse('2014-05-09'))   }
+    let!(:member1) { create(:member, login_name: "Archaeopteryx", confirmed_at: Time.zone.parse('2013-02-10')) }
+    let!(:member2) { create(:member, login_name: "Zephyrosaurus", confirmed_at: Time.zone.parse('2014-01-11')) }
+    let!(:member3) { create(:member, login_name: "Testingname", confirmed_at: Time.zone.parse('2014-05-09'))   }

    before do
      visit members_path
+      expect(page).to have_css "#sort"
+      expect(page).to have_css "form"
    end

    it "default alphabetical sort" do
-      expect(page).to have_css "#sort"
-      expect(page).to have_css "form"
      click_button('Show')
-      expect(subject.first).to have_text archaeopteryx.login_name
-      expect(subject.last).to have_text zephyrosaurus.login_name
+      expect(subject.first).to have_text member1.login_name
+      expect(subject.last).to have_text member2.login_name
    end

    it "recently joined sort" do
-      expect(page).to have_css "#sort"
-      expect(page).to have_css "form"
      select("recently", from: 'sort')
      click_button('Show')
-      expect(subject.first).to have_text testingname.login_name
-      expect(subject.last).to have_text archaeopteryx.login_name
+      expect(subject.first).to have_text member3.login_name
+      expect(subject.last).to have_text member1.login_name
    end
  end
 end
--- a/spec/features/members/profile_spec.rb
+++ b/spec/features/members/profile_spec.rb
@@ -118,15 +118,15 @@ describe "member profile", :js do
    end

    context 'member has activities' do
-      let!(:past_activity) { create(:activity, owner: member, due_date: 3.days.ago) }
-      let!(:planting_activity) { create(:activity, :planting, owner: member) }
-      let!(:garden_activity) { 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) }

-      it { expect(page).to have_link href: activity_path(past_activity) }
-      it { expect(page).to have_link href: activity_path(planting_activity) }
-      it { expect(page).to have_link href: activity_path(garden_activity) }
+      it { expect(page).to have_link href: activity_path(activity) }
+      it { expect(page).to have_link href: activity_path(activity2) }
+      it { expect(page).to have_link href: activity_path(activity3) }
    end

    context 'member has seeds' do
--- a/spec/features/percy/percy_spec.rb
+++ b/spec/features/percy/percy_spec.rb
@@ -2,22 +2,22 @@

 require 'rails_helper'

-describe 'Test with visual testing', :js do
+describe 'Test with visual testing', :js, type: :feature 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)        { create(:member, login_name: 'percy', preferred_avatar_uri: member_gravatar) }
-  let!(:crop_wrangler) { create(:crop_wrangling_member, login_name: 'croppy', preferred_avatar_uri: crop_wrangler_gravatar) }
-  let!(:admin_user) { create(:admin_member, login_name: 'janitor', preferred_avatar_uri: admin_gravatar) }
-  let!(:someone_else) { create(:edinburgh_member, login_name: 'ruby', preferred_avatar_uri: someone_else_gravatar) }
+  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(:member_gravatar) { 'https://secure.gravatar.com/avatar/d021434aac03a7f7c7c0de60d07dad1c?size=150&default=identicon' }
-  let(:crop_wrangler_gravatar) { 'https://secure.gravatar.com/avatar/353d83d3677b142520987e1936fd093c?size=150&default=identicon' }
-  let(:admin_gravatar) { 'https://secure.gravatar.com/avatar/622db62c7beab8d5d8b7a80aa6385b2f?size=150&default=identicon' }
-  let(:someone_else_gravatar) { 'https://secure.gravatar.com/avatar/7fd767571ff5ceefc7a687a543b2c402?size=150&default=identicon' }
+  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) { create(:tomato, creator: someone_else) }
+  let!(:tomato)   { create(:tomato, creator: someone_else) }
  let(:plant_part) { create(:plant_part, name: 'fruit') }

  let(:tomato_photo) do
--- a/spec/features/planting_reminder_spec.rb
+++ b/spec/features/planting_reminder_spec.rb
@@ -30,13 +30,13 @@ 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!(:recent_planting) { create(:predictable_planting, planted_at: 10.days.ago, garden: member.gardens.first, owner: member) }
-    let!(:older_planting)  { 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" }
-      it { expect(mail).to have_link recent_planting.crop.to_s, href: planting_url(recent_planting) }
-      it { expect(mail).to have_link older_planting.crop.to_s, href: planting_url(older_planting) }
+      it { expect(mail).to have_link p1.crop.to_s, href: planting_url(p1) }
+      it { expect(mail).to have_link p2.crop.to_s, href: planting_url(p2) }
      it { expect(mail).to have_content "keep your garden records up to date" }
    end
  end
@@ -50,15 +50,15 @@ 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!(:recent_planting) { create(:predictable_planting, garden: member.gardens.first, owner: member, planted_at: 20.days.ago) }
-    let!(:older_planting)  { create(:predictable_planting, garden: member.gardens.first, owner: member) }
-    let!(:recent_harvest)  { create(:harvest, owner: member, planting: recent_planting, harvested_at: 1.day.ago) }
-    let!(:older_harvest)   { create(:harvest, owner: member, planting: older_planting, 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" }
-      it { expect(mail).to have_link recent_planting.crop.name, href: planting_url(recent_planting) }
-      it { expect(mail).to have_link older_planting.crop.name, href: planting_url(older_planting) }
+      it { expect(mail).to have_link p1.crop.name, href: planting_url(p1) }
+      it { expect(mail).to have_link p2.crop.name, href: planting_url(p2) }
      it { expect(mail).to have_content "Harvested anything lately?" }
    end
  end
--- a/spec/features/plantings/planting_a_crop_spec.rb
+++ b/spec/features/plantings/planting_a_crop_spec.rb
@@ -286,9 +286,9 @@ describe "Planting a crop", :js, :search do
          check "Mark as finished"
          click_button "Save"
        end
-      end

-      xit { expect(page).to have_css("img[alt='sun']") }
+        it { expect(page).to have_css("img[alt='sun']") }
+      end
    end

    describe "Marking a planting as finished from the show page" do
--- a/spec/features/shared_examples/append_date.rb
+++ b/spec/features/shared_examples/append_date.rb
@@ -11,7 +11,7 @@ shared_examples "append date" do
      click_link 'Actions'
      click_link link_text
      within "div.datepicker" do
-        find(".datepicker-days", text: this_month.to_s)
+        expect(page).to have_content this_month.to_s
        find(".datepicker-days td.day", text: "21").click
      end
    end
--- a/spec/features/signout_spec.rb
+++ b/spec/features/signout_spec.rb
@@ -34,11 +34,11 @@ describe "signout" do
  end

  describe 'after signout, redirect to signin page if page needs authentication' do
-    include_examples "sign-in redirects", "/plantings/new"
-    include_examples "sign-in redirects", "/harvests/new"
-    include_examples "sign-in redirects", "/posts/new"
-    include_examples "sign-in redirects", "/gardens/new"
-    include_examples "sign-in redirects", "/seeds/new"
+    it_behaves_like "sign-in redirects", "/plantings/new"
+    it_behaves_like "sign-in redirects", "/harvests/new"
+    it_behaves_like "sign-in redirects", "/posts/new"
+    it_behaves_like "sign-in redirects", "/gardens/new"
+    it_behaves_like "sign-in redirects", "/seeds/new"
  end

  it 'photos' do
--- a/spec/features/timeline/index_spec.rb
+++ b/spec/features/timeline/index_spec.rb
@@ -4,23 +4,23 @@ require 'rails_helper'

 describe "timeline", :js do
  let(:member) { create(:member) }
-  let(:planting_friend) { create(:member) }
-  let(:post_friend) { create(:member) }
+  let(:friend1) { create(:member) }
+  let(:friend2) { create(:member) }

  before do
-    member.followed << planting_friend
-    member.followed << post_friend
+    member.followed << friend1
+    member.followed << friend2
  end

  describe 'visit timeline' do
-    let!(:friend_planting) { create(:planting, owner: planting_friend, planted_at: 1.day.ago) }
-    let!(:friend_harvest) { create(:planting, owner: post_friend, planted_at: 3.years.ago) }
-    let!(:finished_planting) { create(:finished_planting, owner: planting_friend) }
-    let!(:no_planted_at_planting) { create(:planting, owner: post_friend, planted_at: nil) }
-    let!(:friend_photo) { create(:photo, owner: planting_friend) }
-    let!(:friend_post) { create(:post, author: post_friend) }
-    let!(:liked_post) { create(:like, likeable: friend_photo, member: post_friend) }
-    let!(:liked_photo) { create(:like, likeable: friend_post, member: planting_friend) }
+    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)
@@ -37,8 +37,8 @@ describe "timeline", :js do
    end

    describe 'shows the friends you follow' do
-      it { expect(page).to have_link href: member_path(planting_friend) }
-      it { expect(page).to have_link href: member_path(post_friend) }
+      it { expect(page).to have_link href: member_path(friend1) }
+      it { expect(page).to have_link href: member_path(friend2) }
    end
  end
 end
--- a/spec/helpers/buttons_helper_spec.rb
+++ b/spec/helpers/buttons_helper_spec.rb
@@ -12,7 +12,7 @@ require 'rails_helper'
 #     end
 #   end
 # end
-RSpec.describe ButtonsHelper do
+RSpec.describe ButtonsHelper, type: :helper do
  before { allow(self).to receive(:can?).and_return(true) }

  let(:garden)   { create(:garden)   }
--- a/spec/helpers/event_helper_spec.rb
+++ b/spec/helpers/event_helper_spec.rb
@@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe EventHelper do
+RSpec.describe EventHelper, type: :helper do
  subject { resolve_model(event) }

  let(:planting) { create(:planting) }
--- a/spec/helpers/photos_helper_spec.rb
+++ b/spec/helpers/photos_helper_spec.rb
@@ -4,6 +4,7 @@ require 'rails_helper'

 describe PhotosHelper do
  let(:crop) { create(:crop) }
+  let(:crop_photo_of) { create(:photo, source: 'openfarm') }
  let(:crop_photo_flickr) { create(:photo, source: 'flickr') }

  let(:garden) { create(:garden) }
--- a/spec/models/ability_spec.rb
+++ b/spec/models/ability_spec.rb
@@ -136,7 +136,6 @@ describe Ability do
      it "can manage members" do
        ability.should be_able_to(:destroy, create(:member))
      end
-
      it "cannot delete themselves" do
        ability.should_not be_able_to(:destroy, member)
      end
--- a/spec/models/crop_companion_spec.rb
+++ b/spec/models/crop_companion_spec.rb
@@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe CropCompanion do
+RSpec.describe CropCompanion, type: :model do
  it 'has a crop' do
    cc = described_class.new
    cc.crop_a = create :tomato
--- a/spec/models/crop_spec.rb
+++ b/spec/models/crop_spec.rb
@@ -154,7 +154,7 @@ describe Crop do

      it { expect(crop.default_photo).to eq photo }

-      include_examples 'has default photo'
+      it_behaves_like 'has default photo'
    end

    context 'with a harvest photo' do
@@ -165,7 +165,7 @@ describe Crop do

      it { expect(crop.default_photo).to eq photo }

-      include_examples 'has default photo'
+      it_behaves_like 'has default photo'

      context 'and planting photo' do
        let(:planting) { create(:planting, crop:) }
@@ -297,54 +297,54 @@ describe Crop do
    subject { described_class.interesting }

    # first, a couple of candidate crops
-    let(:first_crop) { create(:crop) }
-    let(:second_crop) { create(:crop) }
+    let(:crop1) { create(:crop) }
+    let(:crop2) { create(:crop) }

-    let(:first_crop_planting) { first_crop.plantings.first }
-    let(:second_crop_planting) { second_crop.plantings.first }
+    let(:crop1_planting) { crop1.plantings.first }
+    let(:crop2_planting) { crop2.plantings.first }

    let(:member) { create(:member, login_name: 'pikachu') }

    describe 'lists interesting crops' do
      before do
        # they need 3+ plantings each to be interesting
-        create_list(:planting, 3, crop: first_crop, owner: member)
-        create_list(:planting, 3, crop: second_crop, 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
-        first_crop_planting.photos = create_list :photo, 3, owner: member
-        second_crop_planting.photos = 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 first_crop }
-      it { is_expected.to include second_crop }
+      it { is_expected.to include crop1 }
+      it { is_expected.to include crop2 }
      it { expect(subject.size).to eq 2 }
    end

    describe 'crops without plantings are not interesting' do
      before do
-        # only first_crop has plantings
-        create_list(:planting, 3, crop: first_crop, owner: member)
+        # only crop1 has plantings
+        create_list(:planting, 3, crop: crop1, owner: member)
        # ... and photos
-        first_crop_planting.photos = create_list(:photo, 3, owner: member)
+        crop1_planting.photos = create_list(:photo, 3, owner: member)
      end

-      it { is_expected.to include first_crop }
-      it { is_expected.not_to include second_crop }
+      it { is_expected.to include crop1 }
+      it { is_expected.not_to include crop2 }
      it { expect(subject.size).to eq 1 }
    end

    describe 'crops without photos are not interesting' do
      before do
        # both crops have plantings
-        create_list(:planting, 3, crop: first_crop, owner: member)
-        create_list(:planting, 3, crop: second_crop, owner: member)
+        create_list(:planting, 3, crop: crop1, owner: member)
+        create_list(:planting, 3, crop: crop2, owner: member)

-        # but only first_crop has photos
-        first_crop_planting.photos = create_list(:photo, 3, owner: member)
+        # but only crop1 has photos
+        crop1_planting.photos = create_list(:photo, 3, owner: member)
      end

-      it { is_expected.to include first_crop }
-      it { is_expected.not_to include second_crop }
+      it { is_expected.to include crop1 }
+      it { is_expected.not_to include crop2 }
      it { expect(subject.size).to eq 1 }
    end
  end
@@ -554,7 +554,7 @@ 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

--- a/spec/models/harvest_spec.rb
+++ b/spec/models/harvest_spec.rb
@@ -144,7 +144,7 @@ describe Harvest do
    it 'lists most recent harvests first' do
      @h1 = create(:harvest, created_at: 1.day.ago)
      @h2 = create(:harvest, created_at: 1.hour.ago)
-      expect(described_class.order(created_at: :desc)).to eq [@h2, @h1]
+      expect(described_class.all.order(created_at: :desc)).to eq [@h2, @h1]
    end
  end

--- a/spec/models/member_spec.rb
+++ b/spec/models/member_spec.rb
@@ -102,10 +102,10 @@ describe Member do

  context 'newsletter scope' do
    it 'finds newsletter recipients' do
-      regular_member = create(:member)
-      newsletter_member = create(:newsletter_recipient_member)
-      Member.wants_newsletter.should include newsletter_member
-      Member.wants_newsletter.should_not include regular_member
+      member1 = create(:member)
+      member2 = create(:newsletter_recipient_member)
+      Member.wants_newsletter.should include member2
+      Member.wants_newsletter.should_not include member1
    end
  end

@@ -299,31 +299,31 @@ describe Member do
  end

  context 'member who followed another member' do
-    let(:follower) { create(:member) }
-    let(:followed_member) { create(:member) }
-    let(:other_member) { create(:member) }
+    let(:member1) { create(:member) }
+    let(:member2) { create(:member) }
+    let(:member3) { create(:member) }

    before do
-      @follow = follower.follows.create(follower_id: follower.id, followed_id: followed_member.id)
+      @follow = member1.follows.create(follower_id: member1.id, followed_id: member2.id)
    end

    context 'already_following' do
      it 'detects that member is already following a member' do
-        expect(follower.already_following?(followed_member)).to be true
+        expect(member1.already_following?(member2)).to be true
      end

      it 'detects that member is not already following a member' do
-        expect(follower.already_following?(other_member)).to be false
+        expect(member1.already_following?(member3)).to be false
      end
    end

    context 'get_follow' do
      it 'gets the correct follow for a followed member' do
-        expect(follower.get_follow(followed_member).id).to eq @follow.id
+        expect(member1.get_follow(member2).id).to eq @follow.id
      end

      it 'returns nil for a member that is not followed' do
-        expect(follower.get_follow(other_member)).to be_nil
+        expect(member1.get_follow(member3)).to be_nil
      end
    end
  end
--- a/spec/requests/api/v1/activities_request_spec.rb
+++ b/spec/requests/api/v1/activities_request_spec.rb
@@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe 'Activities' do
+RSpec.describe 'Activities', type: :request do
  subject { JSON.parse response.body }

  let(:member) { create(:member) }
@@ -60,7 +60,7 @@ RSpec.describe 'Activities' do
    end
  end

-  describe '#update' do
+  context '#update' do
    let(:params) do
      {
        'data' => {
--- a/spec/requests/api/v1/crop_request_spec.rb
+++ b/spec/requests/api/v1/crop_request_spec.rb
@@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe 'Crops' do
+RSpec.describe 'Crops', type: :request do
  subject { JSON.parse response.body }

  let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
--- a/spec/requests/api/v1/gardens_request_spec.rb
+++ b/spec/requests/api/v1/gardens_request_spec.rb
@@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe 'Gardens' do
+RSpec.describe 'Gardens', type: :request do
  subject { JSON.parse response.body }

  let(:headers) { { 'Accept' => 'application/vnd.api+json' } }
--- a/spec/requests/api/v1/harvests_request_spec.rb
+++ b/spec/requests/api/v1/harvests_request_spec.rb
@@ -2,7 +2,7 @@

 require 'rails_helper'

-RSpec.describe 'Harvests' do
+RSpec.describe 'Harvests', type: :request do
  subject { JSON.parse response.body }

  let(:headers)  { { 'Accept' => 'application/vnd.api+json' } }
--- a/Show More
+++ b/Show More