Allow edit of more attributes

Merge pull request #3797 from Growstuff/bump-raindrops
2026-05-25 09:19:15 -04:00 · 2024-07-14 04:55:26 +00:00 · 2024-07-14 04:55:13 +00:00 · 2024-07-13 17:49:42 +09:30 · 2024-07-13 17:49:31 +09:30 · 2024-07-13 17:20:06 +09:30
90 changed files with 228 additions and 463 deletions
--- a/.devcontainer/.env
+++ b/.devcontainer/.env
@@ -1,2 +1,2 @@
 # Ruby version
-VARIANT=3.2.4
+VARIANT=3.3.4
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/devcontainers/ruby:0-3.2-bullseye
+FROM mcr.microsoft.com/devcontainers/ruby:1-3.3-bullseye

 # Install Rails
 RUN gem install rails:7.0.8
@@ -29,4 +29,5 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
 # Make sure this is writable as https://github.com/rubygems/rubygems/issues/6272 was removed
 RUN su root -c "mkdir -p /usr/local/rvm/gems/default/cache/bundler/"
 RUN su root -c "mkdir -p /usr/local/rvm/gems/default/bundler/gems/"
-RUN su root -c "chmod -R 777 /usr/local/rvm/gems/"
+RUN su root -c "chown -R vscode:rvm /usr/local/rvm/gems/"
+RUN su root -c "chmod -R 0755 /usr/local/rvm/gems/"
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -7,50 +7,6 @@ updates:
    time: "07:00"
  open-pull-requests-limit: 20
  versioning-strategy: lockfile-only
-  ignore:
-  - dependency-name: active_median
-    versions:
-    - "< 0.2.2, >= 0.2.1.a"
-  - dependency-name: rubocop
-    versions:
-    - "< 0.63, >= 0.62.a"
-  - dependency-name: rubocop
-    versions:
-    - "< 0.64, >= 0.63.a"
-  - dependency-name: sidekiq
-    versions:
-    - 5.2.4
-  - dependency-name: oj
-    versions:
-    - 3.11.4
-  - dependency-name: listen
-    versions:
-    - 3.5.0
-  - dependency-name: rspec-rails
-    versions:
-    - 4.1.0
-    - 5.0.0
-  - dependency-name: searchkick
-    versions:
-    - 4.4.3
-  - dependency-name: rswag-api
-    versions:
-    - 2.3.3
-  - dependency-name: rswag-specs
-    versions:
-    - 2.3.3
-  - dependency-name: rswag-ui
-    versions:
-    - 2.3.3
-  - dependency-name: timecop
-    versions:
-    - 0.9.3
-  - dependency-name: puma
-    versions:
-    - 5.2.0
-  - dependency-name: capybara
-    versions:
-    - 3.35.1
 - package-ecosystem: github-actions
  directory: "/"
  schedule:
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -11,7 +11,7 @@ AllCops:
  Exclude:
    - 'db/schema.rb'
    - 'vendor/**/*'
-  TargetRailsVersion: 7.0
+  TargetRailsVersion: 7.1

 Rails:
  Enabled: true
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2024-07-13 05:22:30 UTC using RuboCop version 1.65.0.
+# on 2024-07-13 05:47:38 UTC using RuboCop version 1.65.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
@@ -12,13 +12,6 @@
 Capybara/ClickLinkOrButtonStyle:
  Enabled: false

-# Offense count: 84
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: have_no, not_to
-Capybara/NegationMatcher:
-  Enabled: false
-
 # Offense count: 39
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: DefaultSelector.
@@ -88,125 +81,14 @@ FactoryBot/ExcessiveCreateList:
 FactoryBot/SyntaxMethods:
  Enabled: false

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleAlignWith.
-# SupportedStylesAlignWith: either, start_of_block, start_of_line
-Layout/BlockAlignment:
-  Exclude:
-    - 'spec/factories/activity.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowForAlignment.
-Layout/CommentIndentation:
-  Exclude:
-    - 'config/environments/production.rb'
-
-# Offense count: 6
-# This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'config/initializers/application_controller_renderer.rb'
-    - 'config/initializers/backtrace_silencers.rb'
-    - 'config/initializers/content_security_policy.rb'
-    - 'config/initializers/mime_types.rb'
-    - 'config/initializers/new_framework_defaults_5_2.rb'
-    - 'db/migrate/20240218053122_add_slug_to_activity.rb'
-
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EmptyLineBetweenMethodDefs, EmptyLineBetweenClassDefs, EmptyLineBetweenModuleDefs, DefLikeMacros, AllowAdjacentOneLineDefs, NumberOfEmptyLines.
-Layout/EmptyLineBetweenDefs:
-  Exclude:
-    - 'db/migrate/20171129041341_create_photographings.rb'
-    - 'db/migrate/20190130090437_add_crop_to_photographings.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Layout/EmptyLines:
-  Exclude:
-    - 'spec/models/ability_spec.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, no_empty_lines
-Layout/EmptyLinesAroundBlockBody:
-  Exclude:
-    - 'lib/tasks/gardens.rake'
-    - 'spec/rails_helper.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
-# SupportedHashRocketStyles: key, separator, table
-# SupportedColonStyles: key, separator, table
-# SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
-Layout/HashAlignment:
-  Exclude:
-    - 'app/models/concerns/search_activities.rb'
-    - 'app/models/concerns/search_plantings.rb'
-
-# Offense count: 10
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: space, no_space
-Layout/LineContinuationSpacing:
-  Exclude:
-    - 'app/mailers/notifier_mailer.rb'
-    - 'app/models/seed.rb'
-    - 'lib/tasks/growstuff.rake'
-    - 'spec/features/rss/plantings_spec.rb'
-    - 'spec/features/rss/posts_spec.rb'
-    - 'spec/features/rss/seeds_spec.rb'
-    - 'spec/models/seed_spec.rb'
-
-# Offense count: 9
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented
-Layout/LineEndStringConcatenationIndentation:
-  Exclude:
-    - 'app/mailers/notifier_mailer.rb'
-    - 'app/models/seed.rb'
-    - 'lib/tasks/growstuff.rake'
-    - 'spec/features/rss/plantings_spec.rb'
-    - 'spec/features/rss/posts_spec.rb'
-    - 'spec/features/rss/seeds_spec.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
 # URISchemes: http, https
 Layout/LineLength:
  Exclude:
    - 'app/helpers/crops_helper.rb'
    - 'db/seeds.rb'
-    - 'spec/requests/plantings_spec.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: final_newline, final_blank_line
-Layout/TrailingEmptyLines:
-  Exclude:
-    - 'spec/features/admin/newsletter_spec.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'spec/factories/activity.rb'
-
-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Lint/AmbiguousOperatorPrecedence:
-  Exclude:
-    - 'db/seeds.rb'
-    - 'spec/helpers/gardens_helper_spec.rb'
-    - 'spec/helpers/seeds_helper_spec.rb'

 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
@@ -723,14 +605,6 @@ Style/ClassAndModuleChildren:
    - 'lib/haml/filters/escaped_markdown.rb'
    - 'lib/haml/filters/growstuff_markdown.rb'

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Keywords, RequireColon.
-# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW, NOTE
-Style/CommentAnnotation:
-  Exclude:
-    - 'spec/features/seeds/adding_seeds_spec.rb'
-
 # Offense count: 6
 # This cop supports unsafe autocorrection (--autocorrect-all).
 Style/CommentedKeyword:
@@ -740,12 +614,6 @@ Style/CommentedKeyword:
    - 'spec/models/photo_spec.rb'
    - 'spec/models/planting_spec.rb'

-# Offense count: 37
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowedVars.
-Style/FetchEnvVar:
-  Enabled: false
-
 # Offense count: 3
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle.
@@ -764,33 +632,6 @@ Style/GlobalStdStream:
    - 'lib/tasks/gbif.rake'
    - 'lib/tasks/openfarm.rake'

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: MinBodyLength, AllowConsecutiveConditionals.
-Style/GuardClause:
-  Exclude:
-    - 'app/controllers/activities_controller.rb'
-
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, EnforcedShorthandSyntax, UseHashRocketsWithSymbolValues, PreferHashRocketsForNonAlnumEndingSymbols.
-# SupportedStyles: ruby19, hash_rockets, no_mixed_keys, ruby19_no_mixed_keys
-# SupportedShorthandSyntax: always, never, either, consistent, either_consistent
-Style/HashSyntax:
-  Exclude:
-    - 'app/models/csv_importer.rb'
-    - 'spec/requests/api/v1/gardens_request_spec.rb'
-    - 'spec/requests/api/v1/plantings_request_spec.rb'
-
-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-Style/IfUnlessModifier:
-  Exclude:
-    - 'app/controllers/activities_controller.rb'
-    - 'app/controllers/application_controller.rb'
-    - 'bin/setup'
-    - 'spec/features/shared_examples/crop_suggest.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedMethods.
@@ -819,18 +660,13 @@ Style/MutableConstant:
  Exclude:
    - 'app/models/activity.rb'

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/NegatedIfElseCondition:
-  Exclude:
-    - 'app/helpers/crops_helper.rb'
-
-# Offense count: 4
+# Offense count: 5
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: EnforcedStyle, AllowedMethods, AllowedPatterns.
 # SupportedStyles: predicate, comparison
 Style/NumericPredicate:
  Exclude:
+    - 'app/helpers/crops_helper.rb'
    - 'app/helpers/harvests_helper.rb'
    - 'app/helpers/plantings_helper.rb'
    - 'app/models/concerns/predict_planting.rb'
@@ -847,15 +683,6 @@ Style/OptionalBooleanParameter:
  Exclude:
    - 'app/models/concerns/member_newsletter.rb'

-# Offense count: 5
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: same_as_string_literals, single_quotes, double_quotes
-Style/QuotedSymbols:
-  Exclude:
-    - 'app/models/seed.rb'
-    - 'spec/controllers/crops_controller_spec.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Methods.
@@ -863,12 +690,6 @@ Style/RedundantArgument:
  Exclude:
    - 'app/helpers/application_helper.rb'

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantConstantBase:
-  Exclude:
-    - 'config.ru'
-
 # Offense count: 4
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: SafeForConstants.
@@ -876,19 +697,6 @@ Style/RedundantFetchBlock:
  Exclude:
    - 'config/puma.rb'

-# Offense count: 3
-# This cop supports safe autocorrection (--autocorrect).
-Style/RedundantRegexpArgument:
-  Exclude:
-    - 'db/migrate/20191119030244_cms_tags.rb'
-
-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowMultipleReturnValues.
-Style/RedundantReturn:
-  Exclude:
-    - 'app/controllers/messages_controller.rb'
-
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowModifier.
@@ -908,13 +716,6 @@ Style/StringConcatenation:
    - 'spec/helpers/gardens_helper_spec.rb'
    - 'spec/helpers/seeds_helper_spec.rb'

-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-Style/SuperArguments:
-  Exclude:
-    - 'app/controllers/omniauth_callbacks_controller.rb'
-    - 'lib/haml/filters/escaped_markdown.rb'
-
 # Offense count: 1
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowMethodsWithArguments, AllowedMethods, AllowedPatterns, AllowComments.
--- a/.ruby-version
+++ b/.ruby-version
@@ -1 +1 @@
-3.2.2
+3.3.4
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -117,8 +117,8 @@ GEM
      minitest (>= 5.1)
      mutex_m
      tzinfo (~> 2.0)
-    addressable (2.8.6)
-      public_suffix (>= 2.0.2, < 6.0)
+    addressable (2.8.7)
+      public_suffix (>= 2.0.2, < 7.0)
    ast (2.4.2)
    autoprefixer-rails (10.4.16.0)
      execjs (~> 2)
@@ -156,7 +156,7 @@ GEM
      actionpack (>= 6.1)
      activemodel (>= 6.1)
    builder (3.3.0)
-    bullet (7.1.6)
+    bullet (7.2.0)
      activesupport (>= 3.0.0)
      uniform_notifier (~> 1.11)
    byebug (11.1.3)
@@ -248,7 +248,7 @@ GEM
    erubis (2.7.0)
    excon (0.110.0)
    execjs (2.9.1)
-    factory_bot (6.4.5)
+    factory_bot (6.4.6)
      activesupport (>= 5.0.0)
    factory_bot_rails (6.4.3)
      factory_bot (~> 6.4)
@@ -307,7 +307,8 @@ GEM
      multi_json (>= 1.9.2)
      webrick
    highline (3.0.1)
-    httparty (0.21.0)
+    httparty (0.22.0)
+      csv
      mini_mime (>= 1.0.0)
      multi_xml (>= 0.5.2)
    i18n (1.14.5)
@@ -349,7 +350,7 @@ GEM
    kramdown (2.4.0)
      rexml
    language_server-protocol (3.17.0.3)
-    launchy (3.0.0)
+    launchy (3.0.1)
      addressable (~> 2.8)
      childprocess (~> 5.0)
    leaflet-rails (1.9.4)
@@ -391,7 +392,8 @@ GEM
    moneta (1.0.0)
    msgpack (1.7.2)
    multi_json (1.15.0)
-    multi_xml (0.6.0)
+    multi_xml (0.7.1)
+      bigdecimal (~> 3.1)
    mutex_m (0.2.0)
    net-http (0.4.1)
      uri
@@ -443,7 +445,7 @@ GEM
      method_source (~> 1.0)
    psych (5.1.2)
      stringio
-    public_suffix (5.0.5)
+    public_suffix (6.0.0)
    puma (6.4.2)
      nio4r (~> 2.0)
    query_diet (0.7.1)
@@ -503,7 +505,7 @@ GEM
      thor (~> 1.0, >= 1.2.2)
      zeitwerk (~> 2.6)
    rainbow (3.1.1)
-    raindrops (0.20.0)
+    raindrops (0.20.1)
    rake (13.2.1)
    rate_throttle_client (0.1.2)
    rb-fsevent (0.11.2)
@@ -586,7 +588,7 @@ GEM
      rubocop-ast (>= 1.31.1, < 2.0)
    rubocop-rake (0.6.0)
      rubocop (~> 1.0)
-    rubocop-rspec (3.0.2)
+    rubocop-rspec (3.0.3)
      rubocop (~> 1.61)
    rubocop-rspec_rails (2.30.0)
      rubocop (~> 1.61)
@@ -650,7 +652,7 @@ GEM
      execjs (>= 0.3.0, < 3)
    thor (1.3.1)
    thread_safe (0.3.6)
-    tilt (2.3.0)
+    tilt (2.4.0)
    timecop (0.9.10)
    timeout (0.4.1)
    trollop (1.16.2)
@@ -677,7 +679,7 @@ GEM
      rack (>= 1.0)
      rack-test (>= 0.5.3)
    webrick (1.8.1)
-    websocket (1.2.10)
+    websocket (1.2.11)
    websocket-driver (0.7.6)
      websocket-extensions (>= 0.1.0)
    websocket-extensions (0.1.5)
@@ -804,7 +806,7 @@ DEPENDENCIES
  xmlrpc

 RUBY VERSION
-   ruby 3.2.2p53
+   ruby 3.3.4p94

 BUNDLED WITH
   2.4.22
--- a/app/controllers/activities_controller.rb
+++ b/app/controllers/activities_controller.rb
@@ -81,8 +81,8 @@ class ActivitiesController < DataController
  end

  def specifics
-    if @owner.present?
-      "#{@owner.to_param}-"
-    end
+    return if @owner.blank?
+
+    "#{@owner.to_param}-"
  end
 end
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,9 +3,7 @@
 class ApplicationController < ActionController::Base
  protect_from_forgery
  # Working from codespaces, we want to turn off validation
-  if Rails.env.development? && ENV['CODESPACE_NAME']
-    skip_before_action :verify_authenticity_token
-  end
+  skip_before_action :verify_authenticity_token if Rails.env.development? && ENV['CODESPACE_NAME']

  include ApplicationHelper

--- a/app/controllers/crops_controller.rb
+++ b/app/controllers/crops_controller.rb
@@ -194,6 +194,7 @@ class CropsController < ApplicationController
    params.require(:crop).permit(
      :name, :en_wikipedia_url,
      :parent_id, :perennial,
+      :sowing_method, :description, :sun_requirements,
      :request_notes, :reason_for_rejection,
      :rejection_notes,
      scientific_names_attributes: %i(scientific_name _destroy id)
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -61,7 +61,7 @@ class MembersController < ApplicationController
  end

  def unsubscribe
-    verifier = ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
+    verifier = ActiveSupport::MessageVerifier.new(ENV.fetch('RAILS_SECRET_TOKEN', nil))
    decrypted_message = verifier.verify(params[:message])

    @member = Member.find(decrypted_message[:member_id])
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -21,7 +21,7 @@ class MessagesController < ApplicationController
    return if params[:recipient_id].blank?

    @recipient = Member.find_by(id: params[:recipient_id])
-    return if @recipient.nil?
+    nil if @recipient.nil?
  end

  def create
--- a/app/controllers/omniauth_callbacks_controller.rb
+++ b/app/controllers/omniauth_callbacks_controller.rb
@@ -41,7 +41,7 @@ class OmniauthCallbacksController < Devise::OmniauthCallbacksController

  def after_sign_in_path_for(resource)
    if resource.tos_agreement
-      super(resource)
+      super
    else
      finish_signup_path(resource)
    end
--- a/app/helpers/crops_helper.rb
+++ b/app/helpers/crops_helper.rb
@@ -7,10 +7,10 @@ module CropsHelper

    return "You don't have any seeds of this crop." if seeds.none?

-    if total_quantity != 0
-      "You have #{total_quantity} #{Seed.model_name.human(count: total_quantity)} of this crop."
-    else
+    if total_quantity == 0
      "You have an unknown quantity of seeds of this crop."
+    else
+      "You have #{total_quantity} #{Seed.model_name.human(count: total_quantity)} of this crop."
    end
  end

--- a/app/mailers/notifier_mailer.rb
+++ b/app/mailers/notifier_mailer.rb
@@ -2,15 +2,15 @@

 class NotifierMailer < ApplicationMailer
  # include NotificationsHelper
-  default from: "Growstuff <#{ENV['GROWSTUFF_EMAIL']}>"
+  default from: "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"

  def verifier
    unless ENV['RAILS_SECRET_TOKEN']
-      raise "RAILS_SECRET_TOKEN environment variable"\
-        "not set - have you created config/application.yml?"
+      raise "RAILS_SECRET_TOKEN environment variable" \
+            "not set - have you created config/application.yml?"
    end

-    ActiveSupport::MessageVerifier.new(ENV['RAILS_SECRET_TOKEN'])
+    ActiveSupport::MessageVerifier.new(ENV.fetch('RAILS_SECRET_TOKEN', nil))
  end

  def notify(notification)
@@ -27,7 +27,7 @@ class NotifierMailer < ApplicationMailer

  def planting_reminder(member)
    @member = member
-    @sitename = ENV['GROWSTUFF_SITE_NAME']
+    @sitename = ENV.fetch('GROWSTUFF_SITE_NAME', nil)

    @late = []
    @super_late = []
--- a/app/models/concerns/member_flickr.rb
+++ b/app/models/concerns/member_flickr.rb
@@ -9,8 +9,8 @@ module MemberFlickr
      if @flickr.nil?
        flickr_auth = auth('flickr')
        if flickr_auth
-          FlickRaw.api_key = ENV['GROWSTUFF_FLICKR_KEY']
-          FlickRaw.shared_secret = ENV['GROWSTUFF_FLICKR_SECRET']
+          FlickRaw.api_key = ENV.fetch('GROWSTUFF_FLICKR_KEY', nil)
+          FlickRaw.shared_secret = ENV.fetch('GROWSTUFF_FLICKR_SECRET', nil)
          @flickr = FlickRaw::Flickr.new
          @flickr.access_token = flickr_auth.token
          @flickr.access_secret = flickr_auth.secret
--- a/app/models/concerns/search_activities.rb
+++ b/app/models/concerns/search_activities.rb
@@ -44,7 +44,7 @@ module SearchActivities
      1..limit.times do
        where = {
          # photos_count: { gt: 0 },
-          owner_id:     { not: owners }
+          owner_id: { not: owners }
        }
        one_record = search('*',
                            limit:    1,
--- a/app/models/concerns/search_plantings.rb
+++ b/app/models/concerns/search_plantings.rb
@@ -30,7 +30,7 @@ module SearchPlantings
        quantity:,
        sunniness:,
        garden_id:,
-        garden_name: garden&.name,
+        garden_name:                garden&.name,
        description:,

        first_harvest_predicted_at:,
--- a/app/models/csv_importer.rb
+++ b/app/models/csv_importer.rb
@@ -59,7 +59,7 @@ class CsvImporter

    alternate_names.split(/,\s*/).each do |name|
      altname = AlternateName.find_by(name:, crop: @crop)
-      altname ||= AlternateName.create! name: name, crop: @crop, creator: cropbot
+      altname ||= AlternateName.create! name:, crop: @crop, creator: cropbot
      @crop.alternate_names << altname
    end
  end
--- a/app/models/follow.rb
+++ b/app/models/follow.rb
@@ -10,7 +10,7 @@ class Follow < ApplicationRecord
      recipient_id: followed_id,
      sender_id:    follower_id,
      subject:      "#{follower.login_name} is now following you",
-      body:         "#{follower.login_name} just followed you on #{ENV['GROWSTUFF_SITE_NAME']}. "
+      body:         "#{follower.login_name} just followed you on #{ENV.fetch('GROWSTUFF_SITE_NAME', nil)}. "
    )
  end
 end
--- a/app/models/seed.rb
+++ b/app/models/seed.rb
@@ -33,17 +33,17 @@ 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: "You may only trade seed nowhere, "\
-                                                "locally, nationally, or internationally" }
+                          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: "You must say whether the seeds "\
-                                             "are organic or not, or that you don't know" }
+                      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: "You must say whether the seeds are "\
-                                                        "genetically modified or not, or that you don't know" }
+                  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: "You must say whether the seeds"\
-                                                                  "are heirloom, hybrid, or unknown" }
+                       inclusion:   { in: HEIRLOOM_VALUES, message: "You must say whether the seeds" \
+                                                                    "are heirloom, hybrid, or unknown" }

  #
  # Delegations
@@ -56,7 +56,7 @@ class Seed < ApplicationRecord
  default_scope { joins(:owner).merge(Member.kept) } # Ensure owner exists
  scope :tradable, -> { where.not(tradable_to: 'nowhere') }
  scope :interesting, -> { tradable.has_location }
-  scope :has_location, -> { joins(:owner).where.not("members.location": nil) }
+  scope :has_location, -> { joins(:owner).where.not('members.location': nil) }
  scope :recent, -> { order(created_at: :desc) }
  scope :active, -> { where('finished <> true').where('finished_at IS NULL OR finished_at < ?', Time.zone.now) }

--- a/app/views/crops/_form.html.haml
+++ b/app/views/crops/_form.html.haml
@@ -47,6 +47,10 @@
      %span.help-block
        Link to the crop's page on the English language Wikipedia (required).

+      = f.text_area :description     
+      = f.text_field :sun_requirements
+      = f.text_field :sowing_method
+
      -# Only crop wranglers see the crop hierarchy (for now)
      - if can? :wrangle, @crop
        = f.collection_select(:parent_id, Crop.all.order(:name), :id, :name,
--- a/bin/setup
+++ b/bin/setup
@@ -23,12 +23,8 @@ FileUtils.chdir APP_ROOT do
  system('bin/yarn')

  puts "\n== Copying sample files =="
-  unless File.exist?('config/database.yml')
-    FileUtils.cp 'config/database.yml.example', 'config/database.yml'
-  end
-  unless File.exist?('.env')
-    FileUtils.cp 'env-example', '.env'
-  end
+  FileUtils.cp 'config/database.yml.example', 'config/database.yml' unless File.exist?('config/database.yml')
+  FileUtils.cp 'env-example', '.env' unless File.exist?('.env')

  puts "\n== Checking for elastic search =="
  system! 'script/check_elasticsearch.sh'
--- a/config.ru
+++ b/config.ru
@@ -2,5 +2,5 @@

 # This file is used by Rack-based servers to start the application.

-require ::File.expand_path('config/environment', __dir__)
+require File.expand_path('config/environment', __dir__)
 run Rails.application
--- a/config/application.rb
+++ b/config/application.rb
@@ -62,7 +62,7 @@ module Growstuff

    # Growstuff-specific configuration variables
    config.currency = 'AUD'
-    config.bot_email = ENV['GROWSTUFF_EMAIL']
+    config.bot_email = ENV.fetch('GROWSTUFF_EMAIL', nil)
    config.user_agent = 'Growstuff'
    config.user_agent_email = "info@growstuff.org"

@@ -70,7 +70,7 @@ module Growstuff
    # API key can't be blank or tests fail
    Gibbon::API.timeout = 10
    Gibbon::API.throws_exceptions = false
-    config.newsletter_list_id = ENV['GROWSTUFF_MAILCHIMP_NEWSLETTER_ID']
+    config.newsletter_list_id = ENV.fetch('GROWSTUFF_MAILCHIMP_NEWSLETTER_ID', nil)

    # config.active_record.raise_in_transactional_callbacks = true
    config.middleware.insert_before 0, Rack::Cors do
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -27,7 +27,7 @@ Rails.application.configure do

  # Compress JavaScripts and CSS.
  config.assets.js_compressor = :terser
-# config.assets.css_compressor = :sass
+  # config.assets.css_compressor = :sass

  # Do not fallback to assets pipeline if a precompiled asset is missed.
  config.assets.compile = false
@@ -59,8 +59,8 @@ Rails.application.configure do
  # Use a different cache store in production.
  config.cache_store = :mem_cache_store,
                       (ENV["MEMCACHIER_SERVERS"] || "").split(","),
-                       { username:             ENV["MEMCACHIER_USERNAME"],
-                         password:             ENV["MEMCACHIER_PASSWORD"],
+                       { username:             ENV.fetch("MEMCACHIER_USERNAME", nil),
+                         password:             ENV.fetch("MEMCACHIER_PASSWORD", nil),
                         failover:             true,
                         socket_timeout:       1.5,
                         socket_failure_delay: 0.2,
@@ -89,20 +89,20 @@ Rails.application.configure do
  config.active_record.dump_schema_after_migration = false

  # Growstuff configuration
-  config.action_mailer.default_url_options = { host: ENV['HOST'] }
+  config.action_mailer.default_url_options = { host: ENV.fetch('HOST', nil) }

  config.action_mailer.smtp_settings = {
-    user_name:            ENV['MAILGUN_SMTP_LOGIN'],
-    password:             ENV['MAILGUN_SMTP_PASSWORD'],
-    domain:               ENV['GROWSTUFF_EMAIL_DOMAIN'],
-    address:              ENV['MAILGUN_SMTP_SERVER'],
+    user_name:            ENV.fetch('MAILGUN_SMTP_LOGIN', nil),
+    password:             ENV.fetch('MAILGUN_SMTP_PASSWORD', nil),
+    domain:               ENV.fetch('GROWSTUFF_EMAIL_DOMAIN', nil),
+    address:              ENV.fetch('MAILGUN_SMTP_SERVER', nil),
    port:                 587,
    authentication:       :plain,
    enable_starttls_auto: true
  }
  ActionMailer::Base.delivery_method = :smtp

-  config.host = ENV['HOST']
+  config.host = ENV.fetch('HOST', nil)
  config.analytics_code = <<-GET_CLICKY_SCRIPT
    <script src="//static.getclicky.com/js" type="text/javascript"></script>
    <script type="text/javascript">try{ clicky.init(100594260); }catch(e){}</script>
--- a/config/factory_bot.rb
+++ b/config/factory_bot.rb
@@ -2,7 +2,7 @@

 ActionDispatch::Callbacks.after do
  # Reload the factories
-  return unless Rails.env.development? || Rails.env.test?
+  return unless Rails.env.local?

  if FactoryBot.factories.present? # first init will load factories, this should only run on subsequent reloads
    FactoryBot.factories.clear
--- a/config/initializers/application_controller_renderer.rb
+++ b/config/initializers/application_controller_renderer.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.

 # ActiveSupport::Reloader.to_prepare do
--- a/config/initializers/backtrace_silencers.rb
+++ b/config/initializers/backtrace_silencers.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.

 # You can add backtrace silencers for libraries that you're using but don't wish to see in your backtraces.
--- a/config/initializers/content_security_policy.rb
+++ b/config/initializers/content_security_policy.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.

 # Define an application-wide content security policy
--- a/config/initializers/devise.rb
+++ b/config/initializers/devise.rb
@@ -6,9 +6,9 @@ Devise.setup do |config|
  # ==> Mailer Configuration
  # Configure the e-mail address which will be shown in Devise::Mailer,
  # note that it will be overwritten if you use your own mailer class with default "from" parameter.
-  config.mailer_sender = "Growstuff <#{ENV['GROWSTUFF_EMAIL']}>"
+  config.mailer_sender = "Growstuff <#{ENV.fetch('GROWSTUFF_EMAIL', nil)}>"

-  config.secret_key = ENV['RAILS_SECRET_TOKEN']
+  config.secret_key = ENV.fetch('RAILS_SECRET_TOKEN', nil)

  # Configure the class responsible to send e-mails.
  # config.mailer = "Devise::Mailer"
--- a/config/initializers/mime_types.rb
+++ b/config/initializers/mime_types.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.

 # Add new mime types for use in respond_to blocks:
--- a/config/initializers/new_framework_defaults_5_2.rb
+++ b/config/initializers/new_framework_defaults_5_2.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # Be sure to restart your server when you modify this file.
 #
 # This file contains migration options to ease your Rails 5.2 upgrade.
--- a/config/initializers/omniauth.rb
+++ b/config/initializers/omniauth.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true

 Rails.application.config.middleware.use OmniAuth::Builder do
-  provider :twitter, ENV['GROWSTUFF_TWITTER_KEY'], ENV['GROWSTUFF_TWITTER_SECRET']
-  provider :flickr, ENV['GROWSTUFF_FLICKR_KEY'], ENV['GROWSTUFF_FLICKR_SECRET'], scope: 'read'
+  provider :twitter, ENV.fetch('GROWSTUFF_TWITTER_KEY', nil), ENV.fetch('GROWSTUFF_TWITTER_SECRET', nil)
+  provider :flickr, ENV.fetch('GROWSTUFF_FLICKR_KEY', nil), ENV.fetch('GROWSTUFF_FLICKR_SECRET', nil), scope: 'read'
 end
--- a/db/migrate/20171129041341_create_photographings.rb
+++ b/db/migrate/20171129041341_create_photographings.rb
@@ -37,18 +37,22 @@ class CreatePhotographings < ActiveRecord::Migration[4.2]
      Photographing.create! photo_id: s.photo_id, photographable_id: s.seed_id, photographable_type: 'Seed'
    end
  end
+
  class GardensPhoto < ApplicationRecord
    belongs_to :photo
    belongs_to :garden
  end
+
  class PhotosPlanting < ApplicationRecord
    belongs_to :photo
    belongs_to :planting
  end
+
  class HarvestsPhoto < ApplicationRecord
    belongs_to :photo
    belongs_to :harvest
  end
+
  class PhotosSeed < ApplicationRecord
    belongs_to :photo
    belongs_to :seed
--- a/db/migrate/20190130090437_add_crop_to_photographings.rb
+++ b/db/migrate/20190130090437_add_crop_to_photographings.rb
@@ -9,6 +9,7 @@ class AddCropToPhotographings < ActiveRecord::Migration[5.2]
      p.set_crop && p.save!
    end
  end
+
  class Photographing < ApplicationRecord
    belongs_to :photo, inverse_of: :photo_associations
    belongs_to :photographable, polymorphic: true
--- a/db/migrate/20191119030244_cms_tags.rb
+++ b/db/migrate/20191119030244_cms_tags.rb
@@ -28,10 +28,10 @@ class CmsTags < ActiveRecord::Migration[5.2]
        layout.content = layout.content.gsub(%r{\{\{ ?cms:(\w+):([\w/-]+):([\w/-]+):([\w/-]+) ?\}\}}, '{{ cms:\1 \2 \3 \4}}')
      end
      layout.content = layout.content.gsub(/\{\{ ?cms:(\w+):(\w+):([^:]*) ?}}/, '{{ cms:\1 \2, "\3" }}') if layout.content.is_a? String
-      layout.content = layout.content.gsub(/cms:rich_text/, 'cms:wysiwyg') if layout.content.is_a? String
-      layout.content = layout.content.gsub(/cms:integer/, 'cms:number') if layout.content.is_a? String
+      layout.content = layout.content.gsub("cms:rich_text", 'cms:wysiwyg') if layout.content.is_a? String
+      layout.content = layout.content.gsub("cms:integer", 'cms:number') if layout.content.is_a? String
      if layout.content.is_a? String
-        layout.content = layout.content.gsub(/cms: string/, 'cms:text')
+        layout.content = layout.content.gsub("cms: string", 'cms:text')
      end # probably a result of goofing one of the more general regexps
      if layout.content.is_a? String
        layout.content = layout.content.gsub(%r{\{\{ ?cms:page_file ([\w/]+) ?\}\}}, '{{ cms:file \1, render: false }}')
--- a/db/migrate/20240218053122_add_slug_to_activity.rb
+++ b/db/migrate/20240218053122_add_slug_to_activity.rb
@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 class AddSlugToActivity < ActiveRecord::Migration[7.1]
  def change
    add_column :activities, :slug, :string
--- a/db/seeds.rb
+++ b/db/seeds.rb
@@ -86,7 +86,7 @@ def load_test_users
        owner_id:     @user.id,
        garden_id:    @user.gardens.first.id,
        planted_at:   (n * 7).days.ago,
-        crop_id:      Crop.find((i + n) % Crop.all.size + 1).id,
+        crop_id:      Crop.find(((i + n) % Crop.all.size) + 1).id,
        sunniness:    select_random_item(Planting::SUNNINESS_VALUES),
        planted_from: select_random_item(Planting::PLANTED_FROM_VALUES)
      )
--- a/lib/haml/filters/escaped_markdown.rb
+++ b/lib/haml/filters/escaped_markdown.rb
@@ -6,7 +6,7 @@ require 'haml/filters/growstuff_markdown'
 class Haml::Filters
  class EscapedMarkdown < Haml::Filters::Markdown
    def compile(node)
-      [:escape, true, super(node)]
+      [:escape, true, super]
    end
  end

--- a/lib/tasks/gardens.rake
+++ b/lib/tasks/gardens.rake
@@ -1,7 +1,6 @@
 # frozen_string_literal: true

 namespace :gardens do
-
  desc "Mark old gardens inactive"
  task archive: :environment do
    Planting.archive!
--- a/lib/tasks/growstuff.rake
+++ b/lib/tasks/growstuff.rake
@@ -5,20 +5,20 @@ namespace :growstuff do
  # usage: rake growstuff:admin_user name=skud

  task admin_user: :environment do
-    add_role_to_member! ENV['name'], 'Admin'
+    add_role_to_member! ENV.fetch('name', nil), 'Admin'
  end

  desc "Add a crop wrangler user, by name"
  # usage: rake growstuff:cropwrangler_user name=skud

  task cropwrangler_user: :environment do
-    add_role_to_member! ENV['name'], 'Crop Wrangler'
+    add_role_to_member! ENV.fetch('name', nil), 'Crop Wrangler'
  end

  def add_role_to_member!(login_name, role_name)
    unless login_name && role_name
-      raise "Usage: rake growstuff:[rolename] name=[username] "\
-        "\n (login name is case-sensitive)\n"
+      raise "Usage: rake growstuff:[rolename] name=[username] " \
+            "\n (login name is case-sensitive)\n"
    end
    member = Member.find_by!(login_name:)
    role = Role.find_by!(name: role_name)
@@ -31,7 +31,7 @@ namespace :growstuff do
  task import_crops: :environment do
    require 'csv'

-    (@file = ENV['file']) || raise("Usage: rake growstuff:import_crops file=file.csv")
+    (@file = ENV.fetch('file', nil)) || raise("Usage: rake growstuff:import_crops file=file.csv")

    puts "Loading crops from #{@file}..."
    CSV.foreach(@file) do |row|
--- a/script/check_contributors_md.rb
+++ b/script/check_contributors_md.rb
@@ -5,12 +5,12 @@ require "English"

 if ENV['CI']
  if ENV['GITHUB_EVENT_NAME'] == 'pull_request'
-    author = ENV['GITHUB_ACTOR']
+    author = ENV.fetch('GITHUB_ACTOR', nil)
    exit 1 unless author

  elsif ENV['TRAVIS_PULL_REQUEST']
    require 'httparty'
-    repo = ENV['TRAVIS_REPO_SLUG']
+    repo = ENV.fetch('TRAVIS_REPO_SLUG', nil)
    pr = ENV['TRAVIS_PULL_REQUEST']
    url = "https://api.github.com/repos/#{repo}/pulls/#{pr}"
    response = HTTParty.get(url).parsed_response
--- a/script/heroku_maintenance.rb
+++ b/script/heroku_maintenance.rb
@@ -4,8 +4,8 @@
 require 'platform-api'
 require 'yaml'

-heroku = PlatformAPI.connect(ENV['HEROKU_API_KEY'])
-branch = ENV['TRAVIS_BRANCH']
+heroku = PlatformAPI.connect(ENV.fetch('HEROKU_API_KEY', nil))
+branch = ENV.fetch('TRAVIS_BRANCH', nil)
 travis_config = YAML.load_file('.travis.yml')
 if travis_config['deploy']['app'].key? branch
  app = travis_config['deploy']['app'][branch]
--- a/spec/controllers/crops_controller_spec.rb
+++ b/spec/controllers/crops_controller_spec.rb
@@ -82,8 +82,8 @@ describe CropsController do
          name:             'aubergine',
          en_wikipedia_url: "https://en.wikipedia.org/wiki/Eggplant"
        },
-        alt_name: { "1": "egg plant", "2": "purple apple" },
-        sci_name: { "1": "fancy sci name", "2": "" }
+        alt_name: { '1': "egg plant", '2': "purple apple" },
+        sci_name: { '1': "fancy sci name", '2': "" }
      }
    end

--- a/spec/factories/activity.rb
+++ b/spec/factories/activity.rb
@@ -3,24 +3,23 @@
 # Read about factories at https://github.com/thoughtbot/factory_bot

 FactoryBot.define do
-    factory :activity do
-      name { "Admire" }
-      description { "Spend 10 minutes admiring your hard work" }
-      category { "General" }
-      owner
-  
-      trait :garden do
-        category { "Soil Cultivation" }
-        description { "Apply compost from winter" }
-        due_date { 3.months.from_now }
-        garden
-      end
+  factory :activity do
+    name { "Admire" }
+    description { "Spend 10 minutes admiring your hard work" }
+    category { "General" }
+    owner

-      trait :planting do
-        category { "Pruning" }
-        description { "Stake tomato" }
-        planting
-      end
+    trait :garden do
+      category { "Soil Cultivation" }
+      description { "Apply compost from winter" }
+      due_date { 3.months.from_now }
+      garden
+    end
+
+    trait :planting do
+      category { "Pruning" }
+      description { "Stake tomato" }
+      planting
    end
  end
-  
+end
--- a/spec/features/admin/newsletter_spec.rb
+++ b/spec/features/admin/newsletter_spec.rb
@@ -19,4 +19,4 @@ describe "newsletter subscribers", :js do
    it { expect(page).to have_current_path admin_newsletter_path, ignore_query: true }
    it { expect(page).to have_content @subscriber.email }
  end
-end
+end
--- a/spec/features/conversations/index_spec.rb
+++ b/spec/features/conversations/index_spec.rb
@@ -37,7 +37,7 @@ describe "Conversations", :js do
        describe 'restore conversation' do
          before { click_link class: 'restore' }

-          it { expect(page).not_to have_content 'something i want to say' }
+          it { expect(page).to have_no_content 'something i want to say' }

          describe 'conversation was restored' do
            before { click_link 'inbox' }
@@ -61,8 +61,8 @@ describe "Conversations", :js do
      all('input[type=checkbox]').each(&:click)
      click_button 'Delete'

-      expect(page).not_to have_content 'this is a message'
-      expect(page).not_to have_content 'this is another message'
+      expect(page).to have_no_content 'this is a message'
+      expect(page).to have_no_content 'this is another message'
    end

    it 'deletes multiple conversations from the sentbox' do
@@ -81,8 +81,8 @@ describe "Conversations", :js do

      expect(page).to have_selector('.sent')
      find('.sent').click
-      expect(page).not_to have_content 'this is a message'
-      expect(page).not_to have_content 'this is another message'
+      expect(page).to have_no_content 'this is a message'
+      expect(page).to have_no_content 'this is another message'
    end
  end
 end
--- a/spec/features/crops/alternate_name_spec.rb
+++ b/spec/features/crops/alternate_name_spec.rb
@@ -46,7 +46,7 @@ describe "Alternate names", :js do
      accept_confirm do
        click_link 'Delete'
      end
-      expect(page).not_to have_content alternate_eggplant.name
+      expect(page).to have_no_content alternate_eggplant.name
      expect(page).to have_content 'Alternate name was successfully deleted'
    end

--- a/spec/features/crops/browse_crops_spec.rb
+++ b/spec/features/crops/browse_crops_spec.rb
@@ -19,11 +19,11 @@ describe "browse crops", :search do
    end

    it "pending crops are not listed" do
-      expect(page).not_to have_content pending_crop.name
+      expect(page).to have_no_content pending_crop.name
    end

    it "rejected crops are not listed" do
-      expect(page).not_to have_content rejected_crop.name
+      expect(page).to have_no_content rejected_crop.name
    end
  end

@@ -35,7 +35,7 @@ describe "browse crops", :search do

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

  context 'member' do
--- a/spec/features/crops/crop_detail_page_spec.rb
+++ b/spec/features/crops/crop_detail_page_spec.rb
@@ -22,7 +22,7 @@ describe "crop detail page", :js do
  context "varieties" do
    it "The crop DOES NOT have varieties" do
      visit crop_path(crop)
-      expect(page).not_to have_text 'Varieties'
+      expect(page).to have_no_text 'Varieties'
    end
  end

@@ -92,7 +92,7 @@ describe "crop detail page", :js do

    it "User not signed in" do
      visit crop_path(seed.crop)
-      expect(page).not_to have_content "You have 20 seeds"
+      expect(page).to have_no_content "You have 20 seeds"
    end

    context 'signed in' do
@@ -194,7 +194,7 @@ describe "crop detail page", :js do

      it { expect(page).to have_text 'Annual' }
      it { expect(page).to have_text 'living and reproducing in a single year or less' }
-      it { expect(page).not_to have_text 'Perennial' }
+      it { expect(page).to have_no_text 'Perennial' }
    end

    context 'crop is Perennial' do
@@ -202,14 +202,14 @@ describe "crop detail page", :js do

      it { expect(page).to have_text 'Perennial' }
      it { expect(page).to have_text 'living more than two years' }
-      it { expect(page).not_to have_text 'Annual' }
+      it { expect(page).to have_no_text 'Annual' }
    end

    context 'crop Perennial value is null' do
      let(:crop) { FactoryBot.create(:crop, perennial: nil) }

-      it { expect(page).not_to have_text 'Perennial' }
-      it { expect(page).not_to have_text 'Annual' }
+      it { expect(page).to have_no_text 'Perennial' }
+      it { expect(page).to have_no_text 'Annual' }
    end
  end
 end
--- a/spec/features/crops/crop_wranglers_spec.rb
+++ b/spec/features/crops/crop_wranglers_spec.rb
@@ -75,11 +75,11 @@ context "signed in non-wrangler" do

  it "can't see wrangling page without js", js: false do
    visit root_path
-    expect(page).not_to have_link "Crop Wrangling"
+    expect(page).to have_no_link "Crop Wrangling"
  end

  it "can't see wrangling page with js" do
    visit member_path(member)
-    expect(page).not_to have_link "Crop Wrangling"
+    expect(page).to have_no_link "Crop Wrangling"
  end
 end
--- a/spec/features/crops/crop_wrangling_button_spec.rb
+++ b/spec/features/crops/crop_wrangling_button_spec.rb
@@ -6,14 +6,14 @@ describe "crop wrangling button" do
  context 'not signed in' do
    before { visit crops_path }

-    it { expect(page).not_to have_link "Wrangle Crops", href: wrangle_crops_path }
+    it { expect(page).to have_no_link "Wrangle Crops", href: wrangle_crops_path }
  end

  context "signed in, but not a crop wrangler" do
    include_context 'signed in member'
    before { visit crops_path }

-    it { expect(page).not_to have_link "Wrangle Crops", href: wrangle_crops_path }
+    it { expect(page).to have_no_link "Wrangle Crops", href: wrangle_crops_path }
  end

  context "signed in crop wrangler" do
--- a/spec/features/crops/scientific_name_spec.rb
+++ b/spec/features/crops/scientific_name_spec.rb
@@ -49,7 +49,7 @@ describe "Scientific names", :js do
        end
      end
      # expect(page.status_code).to equal 200
-      expect(page).not_to have_content zea_mays.name
+      expect(page).to have_no_content zea_mays.name
      expect(page).to have_content 'Scientific name was successfully deleted.'
    end

--- a/spec/features/gardens/actions_spec.rb
+++ b/spec/features/gardens/actions_spec.rb
@@ -51,7 +51,7 @@ describe "Gardens" do

        include_examples "has buttons bar at top"
        describe 'does not show actions on other member garden' do
-          it { is_expected.not_to have_link 'Actions' }
+          it { is_expected.to have_no_link 'Actions' }
        end
      end
    end
@@ -73,7 +73,7 @@ describe "Gardens" do
      describe "someone else's garden" do
        before { visit garden_path(other_member_garden) }

-        it { is_expected.not_to have_link 'Actions' }
+        it { is_expected.to have_no_link 'Actions' }
      end
    end
  end
--- a/spec/features/gardens/adding_gardens_spec.rb
+++ b/spec/features/gardens/adding_gardens_spec.rb
@@ -33,7 +33,7 @@ describe "Gardens", :js do
      fill_in "Name", with: "Negative Garden"
      fill_in "Area", with: -5
      click_button "Save"
-      expect(page).not_to have_content "Garden was successfully created"
+      expect(page).to have_no_content "Garden was successfully created"
      expect(page).to have_content "Area must be greater than or equal to 0"
    end
  end
--- a/spec/features/gardens/gardens_spec.rb
+++ b/spec/features/gardens/gardens_spec.rb
@@ -31,7 +31,7 @@ describe "Planting a crop", :js do

      click_link 'Actions'
      expect(page).to have_content "Mark as active"
-      expect(page).not_to have_content "Mark as inactive"
+      expect(page).to have_no_content "Mark as inactive"
    end

    it "List only active gardens" do
@@ -41,7 +41,7 @@ describe "Planting a crop", :js do
        click_link "Mark as inactive"
      end
      visit gardens_path
-      expect(page).not_to have_link garden_path(garden)
+      expect(page).to have_no_link garden_path(garden)
    end

    it "Create new garden" do
@@ -57,7 +57,7 @@ describe "Planting a crop", :js do
      fill_in "Name", with: "Negative Garden"
      fill_in "Area", with: -5
      click_button "Save"
-      expect(page).not_to have_content "Garden was successfully created"
+      expect(page).to have_no_content "Garden was successfully created"
      expect(page).to have_content "Area must be greater than or equal to 0"
    end

@@ -124,7 +124,7 @@ describe "Planting a crop", :js do

    it "List only active plantings on a garden" do
      visit gardens_path
-      expect(page).not_to have_content finished_planting.crop_name
+      expect(page).to have_no_content finished_planting.crop_name
    end
  end

--- a/spec/features/gardens/index_spec.rb
+++ b/spec/features/gardens/index_spec.rb
@@ -40,7 +40,7 @@ describe "Gardens#index", :js do
      end

      it "does not show inactive garden" do
-        expect(page).not_to have_text inactive_garden.name
+        expect(page).to have_no_text inactive_garden.name
      end

      it "links to active garden" do
@@ -48,7 +48,7 @@ describe "Gardens#index", :js do
      end

      it "does not link to inactive gardens" do
-        expect(page).not_to have_link(inactive_garden.name, href: garden_path(inactive_garden))
+        expect(page).to have_no_link(inactive_garden.name, href: garden_path(inactive_garden))
      end
    end

@@ -72,7 +72,7 @@ describe "Gardens#index", :js do
      end

      it "does not show finished planting" do
-        expect(page).not_to have_text(finished_planting.crop.name)
+        expect(page).to have_no_text(finished_planting.crop.name)
      end
    end
  end
@@ -113,7 +113,7 @@ describe "Gardens#index", :js do
      it { expect(page).to have_link href: planting_path(planting) }
      it { expect(page).to have_link href: garden_path(planting.garden) }
      it { expect(page).to have_text '7 weeks' }
-      it { expect(page).not_to have_text 'harvesting now' }
+      it { expect(page).to have_no_text 'harvesting now' }
    end

    describe 'harvesting now' do
@@ -128,7 +128,7 @@ describe "Gardens#index", :js do
      it { expect(crop.median_lifespan).to eq 90 }

      it { expect(page).to have_text 'harvesting now' }
-      it { expect(page).not_to have_text 'Predicted weeks until harvest' }
+      it { expect(page).to have_no_text 'Predicted weeks until harvest' }
    end

    describe 'super late' do
@@ -139,9 +139,9 @@ describe "Gardens#index", :js do
      end

      it { expect(page).to have_text 'super late' }
-      it { expect(page).not_to have_text 'harvesting now' }
-      it { expect(page).not_to have_text 'Predicted weeks until harvest' }
-      it { expect(page).not_to have_text 'Predicted weeks until planting is finished' }
+      it { expect(page).to have_no_text 'harvesting now' }
+      it { expect(page).to have_no_text 'Predicted weeks until harvest' }
+      it { expect(page).to have_no_text 'Predicted weeks until planting is finished' }
    end
  end
 end
--- a/spec/features/harvests/browse_harvests_spec.rb
+++ b/spec/features/harvests/browse_harvests_spec.rb
@@ -19,7 +19,7 @@ describe "browse harvests", :search do
      end

      it 'read more' do
-        expect(subject).not_to have_link "Read more"
+        expect(subject).to have_no_link "Read more"
      end
    end

--- a/spec/features/home/home_spec.rb
+++ b/spec/features/home/home_spec.rb
@@ -104,7 +104,7 @@ describe "home page", :search do
    describe 'should say welcome' do
      before { visit root_path }

-      it { expect(page).to have_content "Welcome to #{ENV['GROWSTUFF_SITE_NAME']}, #{member.login_name}" }
+      it { expect(page).to have_content "Welcome to #{ENV.fetch('GROWSTUFF_SITE_NAME', nil)}, #{member.login_name}" }
    end
  end
 end
--- a/spec/features/members/ban_spec.rb
+++ b/spec/features/members/ban_spec.rb
@@ -18,7 +18,7 @@ describe "members list" do
      end

      it { expect(page).to have_link admin.login_name }
-      it { expect(page).not_to have_link spammer.login_name }
+      it { expect(page).to have_no_link spammer.login_name }
    end
  end
 end
--- a/spec/features/members/deletion_spec.rb
+++ b/spec/features/members/deletion_spec.rb
@@ -117,9 +117,9 @@ describe "member deletion" do

      it "removes members from following" do
        visit member_follows_path(other_member)
-        expect(page).not_to have_content member.login_name.to_s
+        expect(page).to have_no_content member.login_name.to_s
        visit member_followers_path(other_member)
-        expect(page).not_to have_content member.login_name.to_s
+        expect(page).to have_no_content member.login_name.to_s
      end

      it "replaces posts with deletion note" do
@@ -131,7 +131,7 @@ describe "member deletion" do
        FactoryBot.create(:comment, post: othermemberpost, author: member, body: 'i am deleting my account')

        visit post_path(othermemberpost)
-        expect(page).not_to have_content member.login_name
+        expect(page).to have_no_content member.login_name
        expect(page).to have_content other_member.login_name
        expect(page).to have_content "Member Deleted"
      end
@@ -166,7 +166,7 @@ describe "member deletion" do
      login_as(otherwrangler)
      visit edit_crop_path(crop)
      expect(page).to have_content member.login_name
-      expect(page).not_to have_content "cropbot"
+      expect(page).to have_no_content "cropbot"
      logout
      login_as(member)
      visit member_path(member)
@@ -176,7 +176,7 @@ describe "member deletion" do
      click_button "Delete"
      login_as(otherwrangler)
      visit edit_crop_path(crop)
-      expect(page).not_to have_content member.login_name
+      expect(page).to have_no_content member.login_name
    end
  end
 end
--- a/spec/features/members/following_spec.rb
+++ b/spec/features/members/following_spec.rb
@@ -8,8 +8,8 @@ describe "follows", :js do

    it "follow buttons on member profile page" do
      visit member_path(member)
-      expect(page).not_to have_link "Follow"
-      expect(page).not_to have_link "Unfollow"
+      expect(page).to have_no_link "Follow"
+      expect(page).to have_no_link "Unfollow"
    end
  end

@@ -19,8 +19,8 @@ describe "follows", :js do

    it "your profile doesn't have a follow button" do
      visit member_path(member)
-      expect(page).not_to have_link "Follow"
-      expect(page).not_to have_link "Unfollow"
+      expect(page).to have_no_link "Follow"
+      expect(page).to have_no_link "Unfollow"
    end

    context "following another member" do
@@ -66,7 +66,7 @@ describe "follows", :js do
        click_link 'Follow'
        click_link 'Unfollow'
        visit member_follows_path(member)
-        expect(page).not_to have_content other_member.login_name
+        expect(page).to have_no_content other_member.login_name
        visit member_followers_path(other_member)
        expect(page).to have_content member.login_name
      end
--- a/spec/features/members/profile_spec.rb
+++ b/spec/features/members/profile_spec.rb
@@ -32,9 +32,9 @@ describe "member profile", :js do

      it "member has not set location" do
        visit member_path(member)
-        expect(page).not_to have_css("h1>small")
-        expect(page).not_to have_css("#membermap")
-        expect(page).not_to have_content "See other members"
+        expect(page).to have_no_css("h1>small")
+        expect(page).to have_no_css("#membermap")
+        expect(page).to have_no_content "See other members"
      end
    end

@@ -47,7 +47,7 @@ describe "member profile", :js do

      it "private email address" do
        visit member_path(member)
-        expect(page).not_to have_content member.email
+        expect(page).to have_no_content member.email
      end
    end

@@ -55,10 +55,10 @@ describe "member profile", :js do
      it "with no activity" do
        visit member_path(member)
        expect(page).to have_content "Stats"
-        expect(page).not_to have_content "0 plantings"
-        expect(page).not_to have_content "0 harvests"
-        expect(page).not_to have_content "0 seeds"
-        expect(page).not_to have_content "0 posts"
+        expect(page).to have_no_content "0 plantings"
+        expect(page).to have_no_content "0 harvests"
+        expect(page).to have_no_content "0 seeds"
+        expect(page).to have_no_content "0 posts"
      end

      context "with some activity" do
@@ -102,8 +102,8 @@ describe "member profile", :js do

      it "ordinary user's page" do
        visit member_path(other_member)
-        expect(page).not_to have_text "Crop Wrangler"
-        expect(page).not_to have_text "Admin"
+        expect(page).to have_no_text "Crop Wrangler"
+        expect(page).to have_no_text "Admin"
      end
    end
  end
@@ -120,7 +120,7 @@ describe "member profile", :js do
      it { expect(page).to have_link href: planting_path(new_planting) }
      it { expect(page).to have_link href: planting_path(old_planting) }
      it { expect(page).to have_link href: planting_path(finished_planting) }
-      it { expect(page).not_to have_link href: planting_path(no_planted_at_planting) }
+      it { expect(page).to have_no_link href: planting_path(no_planted_at_planting) }
    end

    context 'member has activities' do
@@ -257,7 +257,7 @@ describe "member profile", :js do
        expect(page).to have_link "Send message", href: new_message_path(recipient_id: other_member.id)
      end

-      it { expect(page).not_to have_link "Edit profile", href: edit_member_registration_path }
+      it { expect(page).to have_no_link "Edit profile", href: edit_member_registration_path }
    end
  end
 end
--- a/spec/features/places/searching_a_place_spec.rb
+++ b/spec/features/places/searching_a_place_spec.rb
@@ -18,7 +18,7 @@ describe "User searches" do
    it { expect(page).to have_content "community near Philippines" }
    it { expect(page).to have_button "search_button" }
    it { expect(page).to have_content "Nearby members" }
-    it { expect(page).not_to have_content "No results found" }
+    it { expect(page).to have_no_content "No results found" }
  end

  it "with a blank search string" do
--- a/spec/features/planting_reminder_spec.rb
+++ b/spec/features/planting_reminder_spec.rb
@@ -23,7 +23,7 @@ describe "Planting reminder email", :js do
    end

    it "doesn't list plantings" do
-      expect(mail).not_to have_content "Progress report"
+      expect(mail).to have_no_content "Progress report"
    end
  end

@@ -43,7 +43,7 @@ describe "Planting reminder email", :js do

  context "when member has no harvests" do
    it "doesn't list plantings" do
-      expect(mail).not_to have_content "Ready to harvest"
+      expect(mail).to have_no_content "Ready to harvest"
    end
  end

--- a/spec/features/plantings/planting_a_crop_spec.rb
+++ b/spec/features/plantings/planting_a_crop_spec.rb
@@ -102,8 +102,8 @@ describe "Planting a crop", :js, :search do
        end

        expect(page).to have_content "planting was successfully created"
-        expect(page).not_to have_content "Finished"
-        expect(page).not_to have_content "Finishes"
+        expect(page).to have_no_content "Finished"
+        expect(page).to have_no_content "Finishes"
      end

      it "shows that planting is in progress" do
@@ -122,9 +122,9 @@ describe "Planting a crop", :js, :search do
        end

        expect(page).to have_content "planting was successfully created"
-        expect(page).not_to have_content "0%"
-        expect(page).not_to have_content "Finish expected"
-        expect(page).not_to have_content "Finishes"
+        expect(page).to have_no_content "0%"
+        expect(page).to have_no_content "Finish expected"
+        expect(page).to have_no_content "Finishes"
      end

      it "shows that planting is 100% complete (no date specified)" do
@@ -184,7 +184,7 @@ describe "Planting a crop", :js, :search do

    it "Editing a planting to fill in the finished date" do
      visit planting_path(planting)
-      expect(page).not_to have_content "Finishes"
+      expect(page).to have_no_content "Finishes"
      # click_link(id: 'planting-actions-button')
      click_link 'Actions'
      click_link "Edit"
@@ -230,7 +230,7 @@ describe "Planting a crop", :js, :search do

      # shouldn't be on the page
      visit plantings_path
-      expect(page).not_to have_content "maize"
+      expect(page).to have_no_content "maize"

      # show all plantings to see this finished planting
      visit plantings_path(all: 1)
--- a/spec/features/plantings/show_spec.rb
+++ b/spec/features/plantings/show_spec.rb
@@ -22,7 +22,7 @@ describe "Display a planting", :js do
    context 'Annual no predictions' do
      let(:planting) { FactoryBot.create(:annual_planting) }

-      it { expect(page).not_to have_text 'Finish expected' }
+      it { expect(page).to have_no_text 'Finish expected' }
    end

    context 'Annual with predicted finish' do
--- a/spec/features/rss/comments_spec.rb
+++ b/spec/features/rss/comments_spec.rb
@@ -10,6 +10,6 @@ describe 'Comments RSS feed' do

  it 'The index title is what we expect' do
    visit comments_path(format: 'rss')
-    expect(page).to have_content "Recent comments on all posts (#{ENV['GROWSTUFF_SITE_NAME']})"
+    expect(page).to have_content "Recent comments on all posts (#{ENV.fetch('GROWSTUFF_SITE_NAME', nil)})"
  end
 end
--- a/spec/features/rss/crops_spec.rb
+++ b/spec/features/rss/crops_spec.rb
@@ -12,6 +12,6 @@ describe 'Crops RSS feed' do
  it 'The index title is what we expect' do
    Crop.reindex
    visit crops_path(format: 'rss')
-    expect(page).to have_content "Recently added crops (#{ENV['GROWSTUFF_SITE_NAME']})"
+    expect(page).to have_content "Recently added crops (#{ENV.fetch('GROWSTUFF_SITE_NAME', nil)})"
  end
 end
--- a/spec/features/rss/members_spec.rb
+++ b/spec/features/rss/members_spec.rb
@@ -8,6 +8,6 @@ describe 'Members RSS feed' do
  before { visit member_path(member, format: 'rss') }

  it 'The show action title is what we expect' do
-    expect(page).to have_content "#{member.login_name}'s recent posts (#{ENV['GROWSTUFF_SITE_NAME']})"
+    expect(page).to have_content "#{member.login_name}'s recent posts (#{ENV.fetch('GROWSTUFF_SITE_NAME', nil)})"
  end
 end
--- a/spec/features/rss/plantings_spec.rb
+++ b/spec/features/rss/plantings_spec.rb
@@ -11,7 +11,7 @@ describe 'Plantings RSS feed' do
  it 'The index title is what we expect' do
    Planting.reindex
    visit plantings_path(format: 'rss')
-    expect(page).to have_content "Recent plantings from "\
-      "#{@owner || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
+    expect(page).to have_content "Recent plantings from " \
+                                 "#{@owner || 'all members'} (#{ENV.fetch('GROWSTUFF_SITE_NAME', nil)})"
  end
 end
--- a/spec/features/rss/posts_spec.rb
+++ b/spec/features/rss/posts_spec.rb
@@ -10,7 +10,7 @@ describe 'Posts RSS feed' do

  it 'The index title is what we expect' do
    visit posts_path(format: 'rss')
-    expect(page).to have_content "Recent posts from "\
-      "#{@author || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
+    expect(page).to have_content "Recent posts from " \
+                                 "#{@author || 'all members'} (#{ENV.fetch('GROWSTUFF_SITE_NAME', nil)})"
  end
 end
--- a/spec/features/rss/seeds_spec.rb
+++ b/spec/features/rss/seeds_spec.rb
@@ -10,7 +10,7 @@ describe 'Seeds RSS feed' do

  it 'The index title is what we expect' do
    visit seeds_path(format: 'rss')
-    expect(page).to have_content "Recent seeds from "\
-      "#{@owner || 'all members'} (#{ENV['GROWSTUFF_SITE_NAME']})"
+    expect(page).to have_content "Recent seeds from " \
+                                 "#{@owner || 'all members'} (#{ENV.fetch('GROWSTUFF_SITE_NAME', nil)})"
  end
 end
--- a/spec/features/seeds/adding_seeds_spec.rb
+++ b/spec/features/seeds/adding_seeds_spec.rb
@@ -17,7 +17,7 @@ describe "Seeds", :js, :search do
    end

    describe "displays required and optional fields properly" do
-      # Note: The required behaviour is pushed down to the control itself, not the form-group as of rails 7.1.
+      # NOTE: The required behaviour is pushed down to the control itself, not the form-group as of rails 7.1.
      # Modern browsers enforce the required behaviour better than us doing it ourselves.
      it { expect(page).to have_selector "label", text: "Crop" }
      it { expect(page).to have_selector 'input#seed_quantity' }
--- a/spec/features/shared_examples/crop_suggest.rb
+++ b/spec/features/shared_examples/crop_suggest.rb
@@ -17,8 +17,8 @@ shared_examples "crop suggest" do |resource|
      fill_autocomplete "crop", with: "pe"
    end

-    expect(page).not_to have_content("pear")
-    expect(page).not_to have_content("pea")
+    expect(page).to have_no_content("pear")
+    expect(page).to have_no_content("pea")

    within "form#new_#{resource}" do
      fill_autocomplete "crop", with: "pea"
@@ -66,9 +66,7 @@ shared_examples "crop suggest" do |resource|
    within "form#new_#{resource}" do
      fill_autocomplete "crop", with: "Ryan Gosling"
      # Some forms require additional selections before submission.
-      if resource == "harvest"
-        choose plant_part.name
-      end
+      choose plant_part.name if resource == "harvest"
      click_button "Save"
    end

--- a/spec/features/timeline/index_spec.rb
+++ b/spec/features/timeline/index_spec.rb
@@ -27,7 +27,7 @@ describe "timeline", :js do
      it { expect(page).to have_link href: planting_path(friend_planting) }
      it { expect(page).to have_link href: planting_path(friend_harvest) }
      it { expect(page).to have_link href: planting_path(finished_planting) }
-      it { expect(page).not_to have_link href: planting_path(no_planted_at_planting) }
+      it { expect(page).to have_no_link href: planting_path(no_planted_at_planting) }
    end

    describe 'shows the friends you follow' do
--- a/spec/helpers/gardens_helper_spec.rb
+++ b/spec/helpers/gardens_helper_spec.rb
@@ -29,7 +29,7 @@ describe GardensHelper do
      garden = FactoryBot.create(:garden,
                                 description: 'a' * 140)
      result = helper.display_garden_description(garden)
-      expect(result).to eq 'a' * 126 + '...' + ' ' + link_to("Read more", garden_path(garden))
+      expect(result).to eq ('a' * 126) + '...' + ' ' + link_to("Read more", garden_path(garden))
    end
  end

--- a/spec/helpers/seeds_helper_spec.rb
+++ b/spec/helpers/seeds_helper_spec.rb
@@ -29,7 +29,7 @@ describe SeedsHelper do
      seed = FactoryBot.create(:seed,
                               description: 'a' * 140)
      result = helper.display_seed_description(seed)
-      expect(result).to eq 'a' * 126 + '...' + ' ' + link_to("Read more", seed_path(seed))
+      expect(result).to eq ('a' * 126) + '...' + ' ' + link_to("Read more", seed_path(seed))
    end
  end
 end
--- a/spec/models/ability_spec.rb
+++ b/spec/models/ability_spec.rb
@@ -119,7 +119,6 @@ describe Ability do
    end
  end

-
  context 'members' do
    context 'ordinary member' do
      it "can't manage members" do
--- a/spec/models/seed_spec.rb
+++ b/spec/models/seed_spec.rb
@@ -51,7 +51,7 @@ describe Seed do
      @seed = FactoryBot.build(:seed, tradable_to: 'not valid')
      @seed.should_not be_valid
      @seed.errors[:tradable_to].should include(
-        "You may only trade seed nowhere, locally, "\
+        "You may only trade seed nowhere, locally, " \
        "nationally, or internationally"
      )
    end
--- a/spec/rails_helper.rb
+++ b/spec/rails_helper.rb
@@ -127,7 +127,6 @@ RSpec.configure do |config|

  # Prevent Poltergeist from fetching external URLs during feature tests
  config.before(:each, :js) do
-
    # TODO: Why are we setting this page size then straight afterwards, maximising?
    width = 1280
    height = 1280
--- a/spec/requests/api/v1/gardens_request_spec.rb
+++ b/spec/requests/api/v1/gardens_request_spec.rb
@@ -41,12 +41,12 @@ RSpec.describe 'Gardens', type: :request do
  end

  it '#index' do
-    get '/api/v1/gardens', params: {}, headers: headers
+    get('/api/v1/gardens', params: {}, headers:)
    expect(subject['data']).to include(garden_encoded_as_json_api)
  end

  it '#show' do
-    get "/api/v1/gardens/#{garden.id}", params: {}, headers: headers
+    get("/api/v1/gardens/#{garden.id}", params: {}, headers:)
    expect(subject['data']).to include(garden_encoded_as_json_api)
  end

--- a/spec/requests/api/v1/plantings_request_spec.rb
+++ b/spec/requests/api/v1/plantings_request_spec.rb
@@ -78,14 +78,14 @@ RSpec.describe 'Plantings', type: :request do
  end

  it '#index' do
-    get '/api/v1/plantings', params: {}, headers: headers
+    get('/api/v1/plantings', params: {}, headers:)
    expect(subject['data'][0].keys).to eq(planting_encoded_as_json_api.keys)
    expect(subject['data'][0]['attributes'].keys.sort!).to eq(planting_encoded_as_json_api['attributes'].keys.sort!)
    expect(subject['data']).to include(planting_encoded_as_json_api)
  end

  it '#show' do
-    get "/api/v1/plantings/#{planting.id}", params: {}, headers: headers
+    get("/api/v1/plantings/#{planting.id}", params: {}, headers:)
    expect(subject['data']['relationships']).to include("garden" => garden_as_json_api)
    expect(subject['data']['relationships']).to include("crop" => crop_as_json_api)
    expect(subject['data']['relationships']).to include("owner" => owner_as_json_api)
--- a/spec/requests/plantings_spec.rb
+++ b/spec/requests/plantings_spec.rb
@@ -15,7 +15,8 @@ describe "Plantings" do
    before do
      @member = create(:interesting_member)

-      @predictable_planting = create(:predictable_planting, owner: @member, planted_at: 1.days.ago, days_to_first_harvest: 10, days_to_last_harvest: 20)
+      @predictable_planting = create(:predictable_planting, owner: @member, planted_at: 1.days.ago, days_to_first_harvest: 10,
+days_to_last_harvest: 20)
      @predictable_planting.crop.update(median_days_to_first_harvest: 10)

      @seedling_planting = create(:seedling_planting, owner: @member)
--- a/spec/views/crops/show.html.haml_spec.rb
+++ b/spec/views/crops/show.html.haml_spec.rb
@@ -16,7 +16,7 @@ describe "crops/show" do

  it "hides sunniness block if no sunniness" do
    render
-    expect(rendered).not_to have_content "Sunniness"
+    expect(rendered).to have_no_content "Sunniness"
  end

  it "has sunniness block if sunny planting" do
@@ -27,7 +27,7 @@ describe "crops/show" do

  it "hides planted from block if no planted_from" do
    render
-    expect(rendered).not_to have_content "Planted from"
+    expect(rendered).to have_no_content "Planted from"
  end

  it "has planted from block if seed planting" do
@@ -38,7 +38,7 @@ describe "crops/show" do

  it "hides harvested block if no harvests" do
    render
-    expect(rendered).not_to have_content "Harvested for"
+    expect(rendered).to have_no_content "Harvested for"
  end

  it "has harvested block if harvest" do
--- a/spec/views/plantings/show.html.haml_spec.rb
+++ b/spec/views/plantings/show.html.haml_spec.rb
@@ -46,7 +46,7 @@ describe "plantings/show" do
        render
      end

-      it { expect(rendered).not_to have_content 'Planted from' }
+      it { expect(rendered).to have_no_content 'Planted from' }
    end
  end

@@ -82,7 +82,7 @@ describe "plantings/show" do
    end

    it "doesn't contain a () if no location is set" do
-      expect(rendered).not_to have_content "()"
+      expect(rendered).to have_no_content "()"
    end
  end

--- a/spec/views/posts/new.html.haml_spec.rb
+++ b/spec/views/posts/new.html.haml_spec.rb
@@ -25,7 +25,7 @@ describe "posts/new" do
  end

  it 'no forum mentioned' do
-    expect(rendered).not_to have_content "This post will be posted in the forum"
+    expect(rendered).to have_no_content "This post will be posted in the forum"
  end

  it "asks what's going on in your garden" do
--- a/spec/views/posts/show.html.haml_spec.rb
+++ b/spec/views/posts/show.html.haml_spec.rb
@@ -24,7 +24,7 @@ describe "posts/show" do
      it { is_expected.to have_text('hello there') }
      # shouldn't show the subject on a single post page
      # (it appears in the title/h1 via the layout, not via this view)
-      it { is_expected.not_to have_text('An Update') }
+      it { is_expected.to have_no_text('An Update') }
    end

    describe "should parse markdown into html" do
@@ -37,19 +37,19 @@ describe "posts/show" do
      let(:post) { FactoryBot.create(:post, author:, body: '<a href="http://evil.com">EVIL</a>') }

      it { is_expected.to have_content('EVIL') }
-      it { is_expected.not_to have_link("http://evil.com") }
+      it { is_expected.to have_no_link("http://evil.com") }
    end

    describe 'script tag in post body' do
      let(:post) { FactoryBot.create(:post, author:, body: "<script>alert('hakker!')</script>") }

-      it { is_expected.not_to have_selector('script') }
+      it { is_expected.to have_no_selector('script') }
    end

    describe 'script tag in post title' do
      let(:post) { FactoryBot.create(:post, author:, subject: "<script>alert('hakker!')</script>") }

-      it { is_expected.not_to have_selector('script') }
+      it { is_expected.to have_no_selector('script') }
    end

    describe 'has an anchor to the comments' do
--- a/spec/views/seeds/index.rss.haml_spec.rb
+++ b/spec/views/seeds/index.rss.haml_spec.rb
@@ -42,7 +42,7 @@ describe 'seeds/index.rss.haml', :search do
    end

    it "does not offer untradable seed as tradeable" do
-      expect(rendered).not_to have_content "Will trade #{seed.tradable_to} from #{seed.owner.location}"
+      expect(rendered).to have_no_content "Will trade #{seed.tradable_to} from #{seed.owner.location}"
    end
  end
Author	SHA1	Message	Date
Daniel O'Connor	bb8014a231	Allow edit of more attributes	2024-07-14 04:55:26 +00:00
Daniel O'Connor	c189fa94a7	Allow edit of more attributes	2024-07-14 04:55:13 +00:00
Daniel O'Connor	aba09679e0	Merge pull request #3797 from Growstuff/bump-raindrops Bump raindrops, fix permissions on container start	2024-07-13 17:49:42 +09:30
Daniel O'Connor	9eff9150f6	Merge pull request #3796 from Growstuff/bump-http-party Bump http party	2024-07-13 17:49:31 +09:30
Daniel O'Connor	10a32686c6	Merge branch 'dev' into bump-http-party	2024-07-13 17:20:06 +09:30
Daniel O'Connor	8fe65768d0	Bump raindrops, fix permissions on container start	2024-07-13 07:48:56 +00:00
Daniel O'Connor	470e2d554e	Merge pull request #3795 from Growstuff/bump-launchy Bump launchy	2024-07-13 17:09:09 +09:30
Daniel O'Connor	e952ca6c4c	Merge pull request #3794 from Growstuff/bump-factory-bot Bump Factory Bot	2024-07-13 17:06:35 +09:30
Daniel O'Connor	ee1c4fc79c	Bump http party	2024-07-13 07:32:00 +00:00
dependabot[bot]	c80c1c4758	Merge pull request #3792 from Growstuff/dependabot/bundler/rubocop-rspec-3.0.3	2024-07-13 07:22:34 +00:00
Daniel O'Connor	3d3f97f0bf	Bump launchy	2024-07-13 07:22:24 +00:00
Daniel O'Connor	961d36c57d	Bump	2024-07-13 07:19:43 +00:00
dependabot[bot]	6a2d21d80b	Bump rubocop-rspec from 3.0.2 to 3.0.3 Bumps [rubocop-rspec](https://github.com/rubocop/rubocop-rspec) from 3.0.2 to 3.0.3. - [Release notes](https://github.com/rubocop/rubocop-rspec/releases) - [Changelog](https://github.com/rubocop/rubocop-rspec/blob/master/CHANGELOG.md) - [Commits](https://github.com/rubocop/rubocop-rspec/compare/v3.0.2...v3.0.3) --- updated-dependencies: - dependency-name: rubocop-rspec dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com>	2024-07-13 07:07:52 +00:00
Daniel O'Connor	93b63284b7	Merge pull request #3791 from Growstuff/bump-bullet Bump bullet	2024-07-13 16:36:48 +09:30
Daniel O'Connor	7cd1f503f2	Merge pull request #3790 from Growstuff/websocket Bump websocket	2024-07-13 16:33:07 +09:30
Daniel O'Connor	25f63a7708	Merge pull request #3788 from Growstuff/rails-71 Rubocop: Rails 7.1	2024-07-13 16:24:33 +09:30
Daniel O'Connor	e46b3f8d19	Update dependabot.yml	2024-07-13 16:22:45 +09:30
Daniel O'Connor	f04f8a9201	Bump bullet	2024-07-13 06:48:09 +00:00
Daniel O'Connor	10e456a18d	Bump websocket	2024-07-13 06:44:10 +00:00
Daniel O'Connor	7e2be8efd9	Rubocop Rails 7.1	2024-07-13 06:29:08 +00:00
Daniel O'Connor	5ba25b8e76	Rubocop Rails 7.1	2024-07-13 06:28:30 +00:00
Daniel O'Connor	826f92691a	Trial Ruby 3.3.* (#3778 ) * Ruby 3.3 * Upgrade.	2024-07-13 15:42:51 +09:30
Daniel O'Connor	81060cccf7	Ruby 3.2: Rubocop - Lint/* and Style/* (#3786 ) * Rubocop - Layout/* * Rubocop - Lint and Style	2024-07-13 15:38:37 +09:30
Daniel O'Connor	8b4f0771c5	Ruby 3.2: Rubocop - Fix Negation matcher (#3780 ) * Ruby 3.2/Bundler 2.4 * Fix creation * Upgrade to js-routes 2. Put all js routes into a global namespace. * Remove js-routes * Remove * Adjust ownership * Appease codeclimate for the nth time * Fix deprecation warning by explicitly calling to_fs * Fix deprecation warning by explicitly calling to_fs * Fix deprecation warning by explicitly calling to_fs * Swap to will paginate successor for bootstrap * Update app/views/members/show.html.haml * Update app/views/plantings/index.rss.haml * Update .env * Update .devcontainer/.env * Fix spec * Update spec * Fix spec * Pin to 2.4.22 * 3 space indent * Regenerate * Update rubocop * Rubocop * More rubocop * Regenerate * Fix Capybara/NegationMatcher	2024-07-13 15:20:11 +09:30
Daniel O'Connor	4f5c47ba58	Ruby 3.2: Rubocop - Layout/* (#3785 ) * Rubocop - Layout/* * Regenerate	2024-07-13 15:19:09 +09:30
@@ -1 +1 @@
 .2.2
 .3.4