From 5a26cebd1d878230fdfc90c3c2043f77ecd09d15 Mon Sep 17 00:00:00 2001
From: "Daniel (dB.) Doubrovkine" <dblock@dblock.org>
Date: Tue, 26 Mar 2024 15:45:06 -0400
Subject: [PATCH] DRY-up test workflow.

---
 .github/workflows/test.yml | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 24fee48873..cb334c72d9 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -24,24 +24,29 @@ jobs:
       fail-fast: false
       matrix:
         ruby: ['2.7', '3.0', '3.1', '3.2', '3.3']
-        gemfile: [rack_2_0, rack_3_0, rails_6_0, rails_6_1, rails_7_0, rails_7_1]
-        integration: [false]
+        gemfile: [Gemfile, gemfiles/rack_2_0.gemfile, gemfiles/rack_3_0.gemfile, gemfiles/rails_6_0.gemfile, gemfiles/rails_6_1.gemfile, gemfiles/rails_7_0.gemfile, gemfiles/rails_7_1.gemfile]
+        specs: ['spec --exclude-pattern=spec/integration/**/*_spec.rb']
         include:
           - ruby: '2.7'
-            gemfile: rack_1_0
+            gemfile: gemfiles/rack_1_0.gemfile
           - ruby: '2.7'
-            integration: multi_json
+            gemfile: gemfiles/multi_json.gemfile
+            specs: 'spec/integration/multi_json'
           - ruby: '2.7'
-            integration: multi_xml
+            gemfile: gemfiles/multi_xml.gemfile
+            specs: 'spec/integration/multi_xml'
           - ruby: '2.7'
-            integration: rack_2_0
+            gemfile: gemfiles/rack_2_0.gemfile
+            specs: 'spec/integration/rack_2_0'
           - ruby: '2.7'
-            integration: rack_3_0
+            gemfile: gemfiles/rack_3_0.gemfile
+            specs: 'spec/integration/rack_3_0'
           - ruby: '3.3'
-            integration: no_dry_validation
+            gemfile: gemfiles/no_dry_validation.gemfile
+            specs: 'spec/integration/no_dry_validation'
     runs-on: ubuntu-latest
     env:
-      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/${{ matrix.integration || matrix.gemfile }}.gemfile
+      BUNDLE_GEMFILE: ${{ github.workspace }}/${{ matrix.gemfile }}
     steps:
     - uses: actions/checkout@v4
 
@@ -51,13 +56,8 @@ jobs:
         ruby-version: ${{ matrix.ruby }}
         bundler-cache: true
 
-    - name: Run tests
-      if: ${{ !matrix.integration }}
-      run: bundle exec rake spec
-
-    - name: Run integration tests (spec/integration/${{ matrix.integration }})
-      if: ${{ matrix.integration }}
-      run: bundle exec rspec spec/integration/${{ matrix.integration }}
+    - name: Run Tests (${{ matrix.specs }})
+      run: bundle exec rspec ${{ matrix.specs }}
 
     - name: Coveralls
       uses: coverallsapp/github-action@master