Merge pull request #69 from petergoldstein/feature/switch_to_gh_actions

Switch to GitHub Actions and Add Ruby 3.1 / Rails 7

Author: etagwerker

.github/workflows/ci.yml

@@ -0,0 +1,67 @@
+name: Tests
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    name: 'Ruby: ${{ matrix.ruby }}, Rails: ${{ matrix.rails }}'
+    runs-on: 'ubuntu-20.04'
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ['3.1', '3.0', '2.7', '2.6', '2.5']
+        rails: ['5.1', '5.2', '6.0', '6.1', '7.0']
+        exclude:
+          - ruby: '3.1'
+            rails: '5.1'
+          - ruby: '3.1'
+            rails: '5.2'
+          - ruby: '3.1'
+            rails: '6.0'
+          - ruby: '3.0'
+            rails: '5.1'
+          - ruby: '3.0'
+            rails: '5.2'
+          - ruby: '2.6'
+            rails: '7.0'
+          - ruby: '2.5'
+            rails: '7.0'
+    env: # $BUNDLE_GEMFILE must be set at the job level, so it is set for all steps
+      BUNDLE_GEMFILE: gemfiles/rails_${{ matrix.rails }}.gemfile
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby ${{ matrix.ruby }}
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # 'bundle install' and cache
+      - name: Copy config file
+        run: cp spec/support/sample.config.yml spec/support/config.yml
+      - name: Run tests
+        run: bundle exec rake
+
+    services:
+      mysql:
+        image: mysql:5.7
+        env:
+            MYSQL_ALLOW_EMPTY_PASSWORD: yes
+        ports:
+            - 3306:3306
+        options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
+
+      postgres:
+        # Docker Hub image
+        image: postgres
+        # Provide the password for postgres
+        env:
+          POSTGRES_USER: postgres
+          POSTGRES_PASSWORD: postgres
+        ports:
+          - 5432:5432
+        # Set health checks to wait until postgres has started
+        options: >-
+          --health-cmd pg_isready
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
+

Appraisals

@@ -1,15 +1,19 @@
 appraise "rails-5.1" do
-  gem "rails", "~>5.1.0"
+  gem "rails", "~> 5.1.0"
 end
 
 appraise "rails-5.2" do
-  gem "rails", "~>5.2.0"
+  gem "rails", "~> 5.2.0"
 end
 
 appraise "rails-6.0" do
-  gem "rails", "~>6.0.0"
+  gem "rails", "~> 6.0.0"
 end
 
 appraise "rails-6.1" do
-  gem "rails", "~>6.1.0"
+  gem "rails", "~> 6.1.0"
+end
+
+appraise "rails-7.0" do
+  gem "rails", "~> 7.0.0"
 end

Gemfile

@@ -5,7 +5,6 @@ gemspec
 gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
 
 gem "rails", "~>5.2"
-gem "byebug"
 
 group :test do
   gem "simplecov", require: false

gemfiles/rails_5.1.gemfile

@@ -3,8 +3,7 @@
 source "https://rubygems.org"
 
 gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
-gem "rails", "~>5.1.0"
-gem "byebug"
+gem "rails", "~> 5.1.0"
 
 group :test do
   gem "simplecov", require: false

gemfiles/rails_5.2.gemfile

@@ -3,8 +3,7 @@
 source "https://rubygems.org"
 
 gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
-gem "rails", "~>5.2.0"
-gem "byebug"
+gem "rails", "~> 5.2.0"
 
 group :test do
   gem "simplecov", require: false

gemfiles/rails_6.0.gemfile

@@ -3,8 +3,7 @@
 source "https://rubygems.org"
 
 gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
-gem "rails", "~>6.0.0"
-gem "byebug"
+gem "rails", "~> 6.0.0"
 
 group :test do
   gem "simplecov", require: false

gemfiles/rails_6.1.gemfile

@@ -3,12 +3,18 @@
 source "https://rubygems.org"
 
 gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
-gem "rails", "~>6.1.0"
-gem "byebug"
+gem "rails", "~> 6.1.0"
 
 group :test do
   gem "simplecov", require: false
   gem "codecov", require: false
 end
 
+if RUBY_VERSION >= '3.1'
+  gem 'net-smtp', require: false
+  gem 'net-imap', require: false
+  gem 'net-pop', require: false
+end
+
+
 gemspec path: "../"

gemfiles/rails_7.0.gemfile

@@ -0,0 +1,13 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "database_cleaner-core", git: "https://github.com/DatabaseCleaner/database_cleaner"
+gem "rails", "~> 7.0.0"
+
+group :test do
+  gem "simplecov", require: false
+  gem "codecov", require: false
+end
+
+gemspec path: "../"

spec/database_cleaner/active_record/base_spec.rb

@@ -156,7 +156,7 @@ module ActiveRecord
           context "and there are models" do
 
             it "fetches from connection pool" do
-              expect(strategy.connection_class.to_s).to eq "Kernel::User"
+              expect(["Kernel::Agent", "Kernel::User"]).to include(strategy.connection_class.to_s)
             end
           end
         end

spec/spec_helper.rb

@@ -1,5 +1,4 @@
 require "bundler/setup"
-require "byebug"
 
 if ENV['COVERAGE'] == 'true'
   require "simplecov"