Rubocop: Layout/HashAlignment

Merge pull request #4536 from Growstuff/Capybara/NegationMatcher
Rubocop: Capybara/NegationMatcher
2026-06-02 05:09:27 -04:00 · 2026-04-23 12:56:58 +00:00 · 2026-04-23 22:15:53 +09:30 · 2026-04-23 22:15:42 +09:30 · 2026-04-23 22:07:41 +09:30 · 2026-04-23 12:30:06 +00:00
36 changed files with 1114 additions and 1409 deletions
--- a/.github/workflows/ci-features-admin.yml
+++ b/.github/workflows/ci-features-admin.yml
@@ -76,7 +76,7 @@ jobs:
      - name: Install NodeJS
        uses: actions/setup-node@v6
        with:
-          node-version: '26'
+          node-version: '24'

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

      - name: Install Ruby (version given by .ruby-version) and Bundler
        uses: ruby/setup-ruby@v1
--- a/.rubocop_todo.yml
+++ b/.rubocop_todo.yml
@@ -13,14 +13,6 @@ Bundler/OrderedGems:
  Exclude:
    - 'Gemfile'

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: have_no, not_to
-Capybara/NegationMatcher:
-  Exclude:
-    - 'spec/features/admin/reverting_crops_spec.rb'
-
 # Offense count: 19
 Capybara/NegationMatcherAfterVisit:
  Exclude:
@@ -99,14 +91,6 @@ FactoryBot/ExcessiveCreateList:
 FactoryBot/SyntaxMethods:
  Enabled: false

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
-Layout/EmptyLinesAroundClassBody:
-  Exclude:
-    - 'db/migrate/20251130035700_create_versions.rb'
-
 # Offense count: 312
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AllowMultipleStyles, EnforcedHashRocketStyle, EnforcedColonStyle, EnforcedLastArgumentHashStyle.
@@ -115,35 +99,9 @@ Layout/EmptyLinesAroundClassBody:
 # SupportedLastArgumentHashStyles: always_inspect, always_ignore, ignore_implicit, ignore_explicit
 Layout/HashAlignment:
  Exclude:
-    - 'app/helpers/application_helper.rb'
-    - 'app/helpers/crops_helper.rb'
-    - 'app/models/concerns/search_harvests.rb'
-    - 'app/models/concerns/search_plantings.rb'
-    - 'app/models/crop.rb'
-    - 'config/sitemap.rb'
-    - 'lib/tasks/import.rake'
    - 'spec/requests/api/v1/activities_request_spec.rb'
    - 'spec/requests/api/v1/members_request_spec.rb'

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

-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: AllowInHeredoc.
-Layout/TrailingWhitespace:
-  Exclude:
-    - 'Gemfile'
-    - 'app/helpers/crops_helper.rb'
-
 # Offense count: 1
 # This cop supports safe autocorrection (--autocorrect).
 Lint/AmbiguousOperatorPrecedence:
@@ -692,12 +642,6 @@ Rails/RakeEnvironment:
    - 'lib/tasks/i18n.rake'
    - 'lib/tasks/testing.rake'

-# Offense count: 1
-# This cop supports safe autocorrection (--autocorrect).
-Rails/RedirectBackOrTo:
-  Exclude:
-    - 'app/controllers/follows_controller.rb'
-
 # Offense count: 9
 # This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: AllowedReceivers.
--- a/app/controllers/follows_controller.rb
+++ b/app/controllers/follows_controller.rb
@@ -17,7 +17,7 @@ class FollowsController < ApplicationController
    else
      flash[:error] = "Already following or error while following."
    end
-    redirect_back fallback_location: root_path
+    redirect_back_or_to(root_path)
  end

  def destroy
--- a/db/migrate/20190712003735_add_like_counter_caches.rb
+++ b/db/migrate/20190712003735_add_like_counter_caches.rb
@@ -14,7 +14,7 @@ class AddLikeCounterCaches < ActiveRecord::Migration[5.2]
  end

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

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

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

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

  def set_counter_value
-    execute <<-SQL.squish
+    execute <<~SQL.squish
      UPDATE posts
         SET comments_count = (
           SELECT count(1)
--- a/db/migrate/20250824085224_add_photos_comment_count.rb
+++ b/db/migrate/20250824085224_add_photos_comment_count.rb
@@ -11,7 +11,7 @@ class AddPhotosCommentCount < ActiveRecord::Migration[7.2]
  end

  def set_counter_value
-    execute <<-SQL.squish
+    execute <<~SQL.squish
      UPDATE photos
         SET comments_count = (
           SELECT count(1)
--- a/db/migrate/20251130035700_create_versions.rb
+++ b/db/migrate/20251130035700_create_versions.rb
@@ -1,7 +1,6 @@
 # This migration creates the `versions` table for the Version class.
 # All other migrations PT provides are optional.
 class CreateVersions < ActiveRecord::Migration[7.2]
-
  # The largest text column available in all supported RDBMS is
  # 1024^3 - 1 bytes, roughly one gibibyte.  We specify a size
  # so that MySQL will use `longtext` instead of `text`.  Otherwise,
--- a/package.json
+++ b/package.json
@@ -14,9 +14,8 @@
    "@coffeelint/cli": "^3.0.0",
    "@percy/cli": "^1.0.0-beta.76",
    "csslint": "^1.0.5",
-    "eslint": "^5.0.0",
-    "eslint-config-google": "^0.9.1",
-    "jshint": "^2.9.4"
+    "eslint": "^10.0.0",
+    "eslint-config-google": "^0.9.1"
  },
  "repository": {
    "type": "git",
--- a/spec/features/admin/reverting_crops_spec.rb
+++ b/spec/features/admin/reverting_crops_spec.rb
@@ -32,7 +32,7 @@ RSpec.feature 'Reverting crops' do

    scenario 'Member cannot revert a crop' do
      visit admin_crops_path
-      expect(page).not_to have_link('Revert')
+      expect(page).to have_no_link('Revert')
    end
  end
 end
--- a/yarn.lock
+++ b/yarn.lock
Author	SHA1	Message	Date
Daniel O'Connor	d443ae6154	Rubocop: Layout/HashAlignment	2026-04-23 12:56:58 +00:00
Daniel O'Connor	c0edfb9eed	Merge pull request #4536 from Growstuff/Capybara/NegationMatcher Rubocop: Capybara/NegationMatcher	2026-04-23 22:15:53 +09:30
Daniel O'Connor	a8d0c6e32e	Rubocop: Layout/TrailingWhitespace (#4535 )	2026-04-23 22:15:42 +09:30
Daniel O'Connor	f381ba29cc	Merge pull request #4534 from Growstuff/Layout/HeredocIndentation Rubocop: Layout/HeredocIndentation	2026-04-23 22:07:41 +09:30
Daniel O'Connor	c1f171b09e	Rubocop: Capybara/NegationMatcher	2026-04-23 12:30:06 +00:00
Daniel O'Connor	b9dcd95c00	Rubocop: Layout/TrailingWhitespace	2026-04-23 12:27:06 +00:00
Daniel O'Connor	400db178e4	Merge pull request #4533 from Growstuff/Rails/RedirectBackOrTo Rubocop: Rails/RedirectBackOrTo	2026-04-23 21:54:19 +09:30
Daniel O'Connor	aecde837cc	Merge pull request #4459 from Growstuff/dependabot/github_actions/actions/upload-artifact-7 Bump actions/upload-artifact from 5 to 7	2026-04-23 21:52:13 +09:30
Daniel O'Connor	316351fb1c	Merge pull request #4532 from Growstuff/Layout/IndentationWidth Rubocop: Layout/IndentationWidth	2026-04-23 21:51:15 +09:30
Daniel O'Connor	34ce4e216f	Merge pull request #4531 from Growstuff/EmptyLinesAroundClassBody Rubocop: Layout/EmptyLinesAroundClassBody	2026-04-23 21:49:49 +09:30
Daniel O'Connor	7b8c7f4ff5	Rubocop: Rails/RedirectBackOrTo	2026-04-23 12:15:30 +00:00
Daniel O'Connor	6fe9f7f5d3	Merge pull request #4530 from Growstuff/drop-jshint Drop jshint	2026-04-23 21:40:46 +09:30
Daniel O'Connor	ae5c125a96	Rubocop: Layout/IndentationWidth	2026-04-23 12:10:09 +00:00
Daniel O'Connor	8a70156b61	Rubocop: Layout/EmptyLinesAroundClassBody	2026-04-23 12:07:56 +00:00
dependabot[bot]	f1fde20500	Bump actions/upload-artifact from 5 to 7 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 5 to 7. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/v5...v7) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-version: '7' dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <support@github.com>	2026-04-23 12:05:35 +00:00
Daniel O'Connor	d32d28c5de	Merge branch 'dev' of https://github.com/Growstuff/growstuff into drop-jshint	2026-04-23 11:59:08 +00:00
Daniel O'Connor	ed884c5ac6	Merge pull request #4527 from Growstuff/eslint-10 ESLint 10	2026-04-23 21:26:35 +09:30
Daniel O'Connor	84d61a7596	Merge pull request #4529 from Growstuff/eslint-9 ESLint 9	2026-04-23 21:26:22 +09:30
Daniel O'Connor	181431ce94	Merge pull request #4528 from Growstuff/eslint-8 ESLint 8	2026-04-23 21:26:14 +09:30
Daniel O'Connor	da73548695	Drop jshint	2026-04-23 11:48:07 +00:00
Daniel O'Connor	3e95581c06	Merge pull request #4526 from Growstuff/eslint Eslint 7	2026-04-23 21:14:09 +09:30
Daniel O'Connor	37ce3d28aa	ESLint 10	2026-04-23 11:42:44 +00:00
Daniel O'Connor	b7bf5d932a	ESLint 9	2026-04-23 11:41:27 +00:00
Daniel O'Connor	247106d10f	ESLint 8	2026-04-23 11:40:03 +00:00
Daniel O'Connor	39534eab02	eslint 7	2026-04-23 11:36:16 +00:00
Daniel O'Connor	076ba9844a	Merge pull request #4525 from Growstuff/eslint Upgrade eslint	2026-04-23 21:00:29 +09:30
Daniel O'Connor	727c754499	Upgrade eslint	2026-04-23 11:23:16 +00:00
Daniel O'Connor	ce17ec1620	Merge pull request #4522 from Growstuff/node-24 Node 24	2026-04-23 20:13:50 +09:30
Daniel O'Connor	9500de3815	Merge pull request #4521 from Growstuff/node-22 Node 22	2026-04-23 20:10:20 +09:30
Daniel O'Connor	d89e284c3a	Merge pull request #4516 from Growstuff/upgrade-eslint Bump eslint	2026-04-23 20:09:46 +09:30
Daniel O'Connor	4e7a719787	Merge pull request #4520 from Growstuff/node-20 Node 20	2026-04-23 20:04:37 +09:30
Daniel O'Connor	40e402d06a	Merge pull request #4519 from Growstuff/node-18 Node 18	2026-04-23 20:04:25 +09:30
Daniel O'Connor	b1c1955ed3	Merge branch 'dev' into upgrade-eslint	2026-04-23 19:59:27 +09:30
Daniel O'Connor	4fbdd2a92b	Merge pull request #4518 from Growstuff/node-16 Node 16	2026-04-23 19:58:16 +09:30
Daniel O'Connor	410ee0050f	Merge branch 'dev' into upgrade-eslint	2026-04-23 19:47:15 +09:30
Daniel O'Connor	a24548defb	Bump eslint	2026-04-23 09:59:45 +00:00