Merge pull request #124 from jrmhaig/test_refactor_notes

Prepare for refactoring tests

.github/workflows/activerecord_head.yml

@@ -0,0 +1,26 @@
+name: Active Record head
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby_version: [ 3.0, 3.1, 3.2, 3.3, head ]
+    env:
+      BUNDLE_GEMFILE: gemfiles/activerecord_head.gemfile
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby_version }}
+        bundler-cache: true
+    - name: Run tests
+      # Allow tests to run on Active Record head without failing the pipeline
+      run: bundle exec rspec || true

.github/workflows/jruby.yml

@@ -9,8 +9,11 @@ on:
 jobs:
   test:
     runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        gemfile: [ jruby_activerecord_7.0 ]
     env:
-      BUNDLE_GEMFILE: gemfiles/jruby_activerecord_7.0.gemfile
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
       JRUBY_OPTS: --debug
     steps:
     - uses: actions/checkout@v4

.github/workflows/rubocop.yml

@@ -0,0 +1,20 @@
+name: Rubocop
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 3.0
+        bundler-cache: true
+    - name: Run Rubocop
+      run: bundle exec rubocop

.github/workflows/ruby_30.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        gemfile: [ activerecord_6.0, activerecord_6.1, activerecord_7.0, activerecord_head ]
+        gemfile: [ activerecord_6.1, activerecord_7.0, activerecord_7.1 ]
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:

.github/workflows/ruby_31.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        gemfile: [ activerecord_6.0, activerecord_6.1, activerecord_7.0, activerecord_head ]
+        gemfile: [ activerecord_6.1, activerecord_7.0, activerecord_7.1 ]
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:

.github/workflows/ruby_32.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        gemfile: [ activerecord_6.0, activerecord_6.1, activerecord_7.0, activerecord_head ]
+        gemfile: [ activerecord_6.1, activerecord_7.0, activerecord_7.1 ]
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:

.github/workflows/ruby_27.yml → .github/workflows/ruby_33.yml

@@ -1,4 +1,4 @@
-name: Ruby 2.7
+name: Ruby 3.3
 
 on:
   push:
@@ -12,15 +12,15 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        gemfile: [ activerecord_6.0, activerecord_6.1, activerecord_7.0, activerecord_head ]
+        gemfile: [ activerecord_6.1, activerecord_7.0, activerecord_7.1 ]
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
     - uses: actions/checkout@v4
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
+        ruby-version: 3.3
         bundler-cache: true
     - name: Run tests
       run: bundle exec rspec

.github/workflows/ruby_head.yml

@@ -8,11 +8,11 @@ on:
 
 jobs:
   test:
-
     runs-on: ubuntu-latest
+    continue-on-error: true
     strategy:
       matrix:
-        gemfile: [ activerecord_6.0, activerecord_6.1, activerecord_7.0, activerecord_head ]
+        gemfile: [ activerecord_6.1, activerecord_7.0, activerecord_7.1 ]
     env:
       BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
     steps:
@@ -23,8 +23,5 @@ jobs:
         ruby-version: head
         bundler-cache: true
     - name: Run tests
-      run: bundle exec rspec
-    - name: Coveralls
-      uses: coverallsapp/github-action@master
-      with:
-        github-token: ${{ secrets.GITHUB_TOKEN }}
+      # Allow tests to run on Ruby head without failing the pipeline
+      run: bundle exec rspec || true

.gitignore

@@ -7,3 +7,4 @@ coverage
 .idea
 gemfiles/*.lock
 .ruby-version
+tmp/**/*

.rubocop.yml

@@ -5,10 +5,10 @@ require:
 inherit_from: .rubocop_todo.yml
 
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.7
   NewCops: enable
 Layout/LineLength:
-  Max: 99
+  Max: 120
 Naming/FileName:
   Enabled: false
 Style/ModuleFunction:

.rubocop_todo.yml

@@ -1,64 +1,84 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2021-07-10 17:38:28 UTC using RuboCop version 1.16.1.
+# on 2023-10-02 15:42:47 UTC using RuboCop version 1.56.3.
 # 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
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 10
-# Cop supports --auto-correct.
-# Configuration parameters: AutoCorrect, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Layout/LineLength:
-  Max: 110
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Severity, Include.
+# Include: **/*.gemspec
+Gemspec/DeprecatedAttributeAssignment:
+  Exclude:
+    - 'amoeba.gemspec'
+
+# Offense count: 7
+# Configuration parameters: EnforcedStyle, AllowedGems, Include.
+# SupportedStyles: Gemfile, gems.rb, gemspec
+# Include: **/*.gemspec, **/Gemfile, **/gems.rb
+Gemspec/DevelopmentDependencies:
+  Exclude:
+    - 'amoeba.gemspec'
 
 # Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Severity, Include.
+# Include: **/*.gemspec
+Gemspec/RequireMFA:
+  Exclude:
+    - 'amoeba.gemspec'
+
+# Offense count: 1
+# Configuration parameters: Severity, Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
+  Exclude:
+    - 'amoeba.gemspec'
+
+# Offense count: 1
+# Configuration parameters: AllowedParentClasses.
 Lint/MissingSuper:
   Exclude:
     - 'lib/amoeba/macros/base.rb'
 
 # Offense count: 17
+# This cop supports unsafe autocorrection (--autocorrect-all).
 Lint/UselessAssignment:
   Exclude:
     - 'spec/support/data.rb'
 
-# Offense count: 8
-# Configuration parameters: CountComments, CountAsOne, ExcludedMethods, IgnoredMethods.
-# IgnoredMethods: refine
-Metrics/BlockLength:
-  Max: 339
-
 # Offense count: 2
 # Configuration parameters: CountComments, CountAsOne.
 Metrics/ClassLength:
-  Max: 141
+  Max: 128
 
 # Offense count: 3
 # Configuration parameters: ForbiddenDelimiters.
-# ForbiddenDelimiters: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
+# ForbiddenDelimiters: (?i-mx:(^|\s)(EO[A-Z]{1}|END)(\s|$))
 Naming/HeredocDelimiterNaming:
   Exclude:
     - 'lib/amoeba/config.rb'
 
 # Offense count: 2
-# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers.
+# Configuration parameters: EnforcedStyle, CheckMethodNames, CheckSymbols, AllowedIdentifiers, AllowedPatterns.
 # SupportedStyles: snake_case, normalcase, non_integer
-# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339
+# AllowedIdentifiers: capture3, iso8601, rfc1123_date, rfc822, rfc2822, rfc3339, x86_64
 Naming/VariableNumber:
   Exclude:
     - 'spec/support/data.rb'
 
 # Offense count: 1
 RSpec/BeforeAfterAll:
   Exclude:
-    - 'spec/spec_helper.rb'
-    - 'spec/rails_helper.rb'
-    - 'spec/support/**/*.rb'
+    - '**/spec/spec_helper.rb'
+    - '**/spec/rails_helper.rb'
+    - '**/spec/support/**/*.rb'
     - 'spec/lib/amoeba_spec.rb'
 
 # Offense count: 12
-# Configuration parameters: Prefixes.
+# Configuration parameters: Prefixes, AllowedPatterns.
 # Prefixes: when, with, without
 RSpec/ContextWording:
   Exclude:
@@ -68,6 +88,11 @@ RSpec/ContextWording:
 # Configuration parameters: IgnoredMetadata.
 RSpec/DescribeClass:
   Exclude:
+    - '**/spec/features/**/*'
+    - '**/spec/requests/**/*'
+    - '**/spec/routing/**/*'
+    - '**/spec/system/**/*'
+    - '**/spec/views/**/*'
     - 'spec/lib/amoeba_spec.rb'
 
 # Offense count: 3
@@ -86,33 +111,37 @@ RSpec/MultipleExpectations:
   Max: 55
 
 # Offense count: 18
-# Configuration parameters: IgnoreSharedExamples.
+# Configuration parameters: EnforcedStyle, IgnoreSharedExamples.
+# SupportedStyles: always, named_only
 RSpec/NamedSubject:
   Exclude:
     - 'spec/lib/amoeba_spec.rb'
 
 # Offense count: 1
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
 # Configuration parameters: Strict, EnforcedStyle, AllowedExplicitMatchers.
 # SupportedStyles: inflected, explicit
 RSpec/PredicateMatcher:
   Exclude:
     - 'spec/lib/amoeba_spec.rb'
 
-# Offense count: 5
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: always, always_true, never
-Style/FrozenStringLiteralComment:
+# Offense count: 25
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantConstantBase:
   Exclude:
     - 'spec/lib/amoeba_spec.rb'
     - 'spec/spec_helper.rb'
-    - 'spec/support/data.rb'
     - 'spec/support/models.rb'
-    - 'spec/support/schema.rb'
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+Style/RedundantRegexpArgument:
+  Exclude:
+    - 'spec/lib/amoeba_spec.rb'
 
 # Offense count: 5
-# Cop supports --auto-correct.
+# This cop supports unsafe autocorrection (--autocorrect-all).
+# Configuration parameters: Mode.
 Style/StringConcatenation:
   Exclude:
     - 'spec/lib/amoeba_spec.rb'

Appraisals

@@ -1,41 +1,25 @@
 # frozen_string_literal: true
 
-appraise 'activerecord-6.0' do
-  gem 'activerecord', '~> 6.0.0'
-  group :development, :test do
-    gem 'sqlite3', '~> 1.6.0'
-  end
-end
-
 appraise 'activerecord-6.1' do
   gem 'activerecord', '~> 6.1.0'
-  group :development, :test do
-    gem 'sqlite3', '~> 1.6.0'
-  end
 end
 
 appraise 'activerecord-7.0' do
   gem 'activerecord', '~> 7.0.0'
-  group :development, :test do
-    gem 'sqlite3', '~> 1.6.0'
-  end
+end
+
+appraise 'activerecord-7.1' do
+  gem 'activerecord', '~> 7.1.0'
 end
 
 appraise 'jruby-activerecord-7.0' do
   gem 'activerecord', '~> 7.0.0'
-  group :development, :test do
-    gem 'activerecord-jdbc-adapter', '~> 70.1'
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 70.1'
-  end
 end
 
 appraise 'activerecord-head' do
   git 'https://github.com/rails/rails.git', branch: 'main' do
     gem 'activerecord'
   end
-  group :development, :test do
-    gem 'sqlite3', '~> 1.6.0'
-  end
 end
 
 appraise 'jruby-activerecord-head' do

CHANGELOG.md

@@ -1,7 +1,7 @@
 ### Unreleased
 
-* Drop support for Rails 5.2.
-* Drop support for Ruby 2.5 and 2.6.
+* Drop support for Rails 5.2, Ruby 2.5 and 2.6. [https://github.com/amoeba-rb/amoeba/pull/120]
+* Notes on contributing. Github Actions for automate tests. [https://github.com/amoeba-rb/amoeba/pull/124]
 
 ### 3.3.0
 

README.md

@@ -6,6 +6,10 @@ Easy cloning of active_record objects including associations and several operati
 [![Gem Version](https://badge.fury.io/rb/amoeba.svg)](http://badge.fury.io/rb/amoeba)
 [![Build Status](https://travis-ci.org/amoeba-rb/amoeba.svg?branch=master)](https://travis-ci.org/amoeba-rb/amoeba)
 
+## Interested in contributing?
+
+See [here.](docs/contributing.md)
+
 ## What?
 
 The goal was to be able to easily and quickly reproduce ActiveRecord objects including their children, for example copying a blog post maintaining its associated tags or categories.