Spec restart: Update Ruby version to 3.3.6, remove dummy models and v…

…iews, and add cspell configuration
rails-on-services · Jan 9, 2025 · 247be5e · 247be5e
1 parent 85a5648
commit 247be5e
Show file tree

Hide file tree

Showing 195 changed files with 1,698 additions and 5,573 deletions.
diff --git a/.github/workflows/rspec_mysql_8_0.yml b/.github/workflows/rspec_mysql_8_0.yml
@@ -20,24 +20,12 @@ jobs:
           - 3.1
           - 3.2
           - 3.3
-          - jruby
         rails_version:
-          - 7_0
           - 7_1
           - 7_2
           - 8_0
-          # - master # versions failing
-        exclude:
-          - ruby_version: jruby
-            rails_version: 7_1
-          - ruby_version: jruby
-            rails_version: 7_2
-          - ruby_version: jruby
-            rails_version: 8_0
-          - ruby_version: 3.1
-            rails_version: 8_0
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_mysql.gemfile
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}_mysql.gemfile
       CI: true
       DATABASE_ENGINE: mysql
       RUBY_VERSION: ${{ matrix.ruby_version }}

diff --git a/.github/workflows/rspec_pg_14.yml → ...hub/workflows/rspec_mysql_trilogy_8_0.yml b/.github/workflows/rspec_pg_14.yml → ...hub/workflows/rspec_mysql_trilogy_8_0.yml
@@ -1,4 +1,4 @@
-name: RSpec PostgreSQL 14
+name: RSpec MySQL 8.0 Trilogy Adapter
 on:
   push:
     branches:
@@ -20,49 +20,31 @@ jobs:
           - 3.1
           - 3.2
           - 3.3
-          - jruby
         rails_version:
-          - 7_0
           - 7_1
           - 7_2
           - 8_0
-        exclude:
-          - ruby_version: jruby
-            rails_version: 7_1
-          - ruby_version: jruby
-            rails_version: 7_2
-          - ruby_version: jruby
-            rails_version: 8_0
-          - ruby_version: 3.1
-            rails_version: 8_0
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}_mysql.gemfile
       CI: true
-      DATABASE_ENGINE: postgresql
+      DATABASE_ENGINE: mysql
+      DATABASE_ADAPTER: trilogy
       RUBY_VERSION: ${{ matrix.ruby_version }}
       RAILS_VERSION: ${{ matrix.rails_version }}
     services:
-      postgres:
-        image: postgres:14-alpine
+      mysql:
+        image: mysql:8.0
         env:
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_HOST_AUTH_METHOD: trust
-          POSTGRES_DB: apartment_postgresql_test
+          MYSQL_ALLOW_EMPTY_PASSWORD: true
+          MYSQL_DATABASE: apartment_mysql_test
         options: >-
-          --health-cmd pg_isready
+          --health-cmd "mysqladmin ping"
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
         ports:
-          - 5432:5432
+          - 3306:3306
     steps:
-      - name: Install PostgreSQL client
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install -y --no-install-recommends postgresql-common
-          echo | sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh
-          sudo apt-get update -qq
-          sudo apt-get install -y --no-install-recommends postgresql-client-14
       - uses: actions/checkout@v4
       - name: Set up Ruby ${{ matrix.ruby_version }}
         uses: ruby/setup-ruby@v1

diff --git a/.github/workflows/rspec_pg_15.yml b/.github/workflows/rspec_pg_15.yml
@@ -22,30 +22,21 @@ jobs:
           - 3.3
           - jruby
         rails_version:
-          - 7_0
           - 7_1
           - 7_2
           - 8_0
-        exclude:
-          - ruby_version: jruby
-            rails_version: 7_1
-          - ruby_version: jruby
-            rails_version: 7_2
-          - ruby_version: jruby
-            rails_version: 8_0
-          - ruby_version: 3.1
-            rails_version: 8_0
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}_postgresql.gemfile
       CI: true
       DATABASE_ENGINE: postgresql
       RUBY_VERSION: ${{ matrix.ruby_version }}
       RAILS_VERSION: ${{ matrix.rails_version }}
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
     services:
       postgres:
         image: postgres:15-alpine
         env:
-          POSTGRES_PASSWORD: postgres
           POSTGRES_HOST_AUTH_METHOD: trust
           POSTGRES_DB: apartment_postgresql_test
         options: >-

diff --git a/.github/workflows/rspec_pg_16.yml b/.github/workflows/rspec_pg_16.yml
@@ -22,30 +22,21 @@ jobs:
           - 3.3
           - jruby
         rails_version:
-          - 7_0
           - 7_1
           - 7_2
           - 8_0
-        exclude:
-          - ruby_version: jruby
-            rails_version: 7_1
-          - ruby_version: jruby
-            rails_version: 7_2
-          - ruby_version: jruby
-            rails_version: 8_0
-          - ruby_version: 3.1
-            rails_version: 8_0
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}_postgresql.gemfile
       CI: true
       DATABASE_ENGINE: postgresql
       RUBY_VERSION: ${{ matrix.ruby_version }}
       RAILS_VERSION: ${{ matrix.rails_version }}
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
     services:
       postgres:
         image: postgres:16-alpine
         env:
-          POSTGRES_PASSWORD: postgres
           POSTGRES_HOST_AUTH_METHOD: trust
           POSTGRES_DB: apartment_postgresql_test
         options: >-

diff --git a/.github/workflows/rspec_pg_17.yml b/.github/workflows/rspec_pg_17.yml
@@ -22,30 +22,21 @@ jobs:
           - 3.3
           - jruby
         rails_version:
-          - 7_0
           - 7_1
           - 7_2
           - 8_0
-        exclude:
-          - ruby_version: jruby
-            rails_version: 7_1
-          - ruby_version: jruby
-            rails_version: 7_2
-          - ruby_version: jruby
-            rails_version: 8_0
-          - ruby_version: 3.1
-            rails_version: 8_0
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_postgresql.gemfile
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}_postgresql.gemfile
       CI: true
       DATABASE_ENGINE: postgresql
       RUBY_VERSION: ${{ matrix.ruby_version }}
       RAILS_VERSION: ${{ matrix.rails_version }}
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
     services:
       postgres:
         image: postgres:17-alpine
         env:
-          POSTGRES_PASSWORD: postgres
           POSTGRES_HOST_AUTH_METHOD: trust
           POSTGRES_DB: apartment_postgresql_test
         options: >-

diff --git a/.github/workflows/rspec_sqlite_3.yml b/.github/workflows/rspec_sqlite_3.yml
@@ -20,23 +20,13 @@ jobs:
           - 3.1
           - 3.2
           - 3.3
-          # - jruby # We don't support jruby for sqlite yet
         rails_version:
           - 7_0
           - 7_1
           - 7_2
           - 8_0
-        exclude:
-          - ruby_version: jruby
-            rails_version: 7_1
-          - ruby_version: jruby
-            rails_version: 7_2
-          - ruby_version: jruby
-            rails_version: 8_0
-          - ruby_version: 3.1
-            rails_version: 8_0
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}${{ matrix.ruby_version == 'jruby' && '_jdbc' || '' }}_sqlite3.gemfile
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_${{ matrix.rails_version }}_sqlite3.gemfile
       CI: true
       DATABASE_ENGINE: sqlite
       RUBY_VERSION: ${{ matrix.ruby_version }}

diff --git a/.github/workflows/rubocop.yml b/.github/workflows/rubocop.yml
@@ -13,7 +13,7 @@ jobs:
     name: runner / rubocop
     runs-on: ubuntu-latest
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_7_2_postgresql.gemfile
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/rails_8_0_postgresql.gemfile
     steps:
       - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1

diff --git a/.gitignore b/.gitignore
@@ -13,3 +13,4 @@ cookbooks
 tmp
 spec/dummy/db/*.sqlite3
 .DS_Store
+coverage
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -25,6 +25,9 @@ Metrics/BlockLength:
   Exclude:
     - spec/**/*.rb
 
+Metrics/MethodLength:
+  Max: 20
+
 Rails/RakeEnvironment:
   Enabled: false
 

diff --git a/.ruby-version b/.ruby-version
@@ -1 +1 @@
-3.3.5
+3.3.6