Merge branch 'gocardless:master' into master

.github/workflows/tests.yml

@@ -2,6 +2,9 @@ name: tests
 
 on:
   push:
+    branches:
+      - "master"
+  pull_request:
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
@@ -21,12 +24,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.7, 3.0, 3.1]
+        ruby-version: ["3.0", "3.1", "3.2", "3.3"]
         rails-version:
-          - "6.1.5"
-          - "7.0.4"
+          - "6.1.7.6"
+          - "7.0.8"
+          - "7.1.1"
           - "main"
-        postgres-version: [9.6, 11, 14]
+        postgres-version: ["12", "13", "14", "15", "16"]
+        exclude:
+          - ruby-version: "3.2"
+            rails-version: "6.1.7.6"
+          - ruby-version: "3.3"
+            rails-version: "6.1.7.6"
     runs-on: ubuntu-latest
     services:
       postgres:
@@ -60,13 +69,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: [2.7, 3.0, 3.1]
+        ruby-version: ["3.0", "3.1", "3.2", "3.3"]
         rails-version:
-          - "6.1.5"
-          - "7.0.4"
+          - "6.1.7.6"
+          - "7.0.8"
+          - "7.1.1"
           - "main"
-        mysql-version:
-          - "5.7"
+        mysql-version: ["8.0", "8.2"]
+        exclude:
+          - ruby-version: "3.2"
+            rails-version: "6.1.7.6"
+          - ruby-version: "3.3"
+            rails-version: "6.1.7.6"
     runs-on: ubuntu-latest
     services:
       mysql:
@@ -78,6 +92,11 @@ jobs:
           MYSQL_DATABASE: statesman_test
         ports:
           - "3306:3306"
+        options: >-
+          --health-cmd "mysqladmin ping"
+          --health-interval 10s
+          --health-timeout 5s
+          --health-retries 5
     env:
       DATABASE_URL: mysql2://foobar:[email protected]/statesman_test
       DATABASE_DEPENDENCY_PORT: "3306"

.gitignore

@@ -55,9 +55,6 @@ Gemfile.lock
 # Used by RuboCop. Remote config files pulled in from inherit_from directive.
 # .rubocop-https?--*
 
-# Project-specific ignores
-.rspec
-
 # VSCode
 .vscode
 

.rspec

@@ -0,0 +1 @@
+--require spec_helper

.rubocop.yml

@@ -5,6 +5,7 @@ inherit_gem:
 
 AllCops:
   TargetRubyVersion: 3.0
+  NewCops: enable
 
 Metrics/AbcSize:
   Max: 60
@@ -14,3 +15,6 @@ Metrics/CyclomaticComplexity:
 
 Metrics/PerceivedComplexity:
   Max: 11
+
+Gemspec/DevelopmentDependencies:
+  Enabled: false

.ruby-version

@@ -1 +1 @@
-3.0.2
+3.3.0