Merge pull request #162 from inertiajs/test-matrix-indentation

Nest exclude entries under the matrix key
inertiajs · Nov 13, 2024 · 4c93bf7 · 4c93bf7
2 parents 7047ba2 + f041979
commit 4c93bf7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
@@ -21,15 +21,15 @@ jobs:
       matrix:
         ruby: ['3.0', '3.1', '3.2', '3.3']
         rails: ['6.1', '7.0', '7.1', '7.2', '8.0']
-      exclude:
-        - ruby: '3.0'
-          rails: '8.0'
-        - ruby: '3.1'
-          rails: '8.0'
-        - ruby: '3.0'
-          rails: '7.2'
-        - ruby: '3.1'
-          rails: '7.2'
+        exclude:
+          - ruby: '3.0'
+            rails: '8.0'
+          - ruby: '3.1'
+            rails: '8.0'
+          - ruby: '3.0'
+            rails: '7.2'
+          - ruby: '3.1'
+            rails: '7.2'
 
     runs-on: ubuntu-latest
     name: Test against Ruby ${{ matrix.ruby }} / Rails ${{ matrix.rails }}
@@ -44,6 +44,9 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
+          # Use the latest version of RubyGems with Ruby 3.0 to avoid:
+          # https://bugs.ruby-lang.org/issues/19371
+          rubygems: ${{ startsWith(matrix.ruby-version, '3.0') && 'latest' || 'default' }}
           bundler-cache: true
         env:
           RAILS_VERSION:  ${{ matrix.rails }}

diff --git a/lib/inertia_rails/configuration.rb b/lib/inertia_rails/configuration.rb
@@ -66,7 +66,7 @@ def with_defaults(config)
     end
 
     def component_path_resolver(path:, action:)
-      @options[:component_path_resolver].call(path:, action:)
+      @options[:component_path_resolver].call(path: path, action: action)
     end
 
     OPTION_NAMES.each do |option|