Merge pull request #44 from payrollhero/master

Support for ruby 3.0
wrozka · Dec 16, 2022 · e0223ac · e0223ac
2 parents 34cd0c3 + 36a411e
commit e0223ac
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 24 deletions.
diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
@@ -16,24 +16,24 @@ jobs:
       fail-fast: false
       matrix:
         gemfile: ["rails-7.0.x"]
-        ruby: [2.7]
+        ruby: [3.2]
         include:
+          - gemfile: rails-7.0.x
+            ruby: '3.1'
+          - gemfile: rails-7.0.x
+            ruby: '3.0'
           - gemfile: rails-7.0.x
             ruby: '2.7'
           - gemfile: rails-6.1.x
-            ruby: 2.7
+            ruby: '3.1'
+          - gemfile: rails-6.1.x
+            ruby: '3.0'
           - gemfile: rails-6.1.x
-            ruby: 2.6
-          - gemfile: rails-6.0.x
             ruby: 2.7
           - gemfile: rails-6.0.x
-            ruby: 2.6
+            ruby: 2.7
           - gemfile: rails-5.2.x
-            ruby: 2.6
-          - gemfile: rails-5.1.x
-            ruby: 2.5
-          - gemfile: rails-5.0.x
-            ruby: 2.5
+            ruby: 2.7
 
     env:
       BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/Gemfile.${{ matrix.gemfile }}

diff --git a/capybara-angular.gemspec b/capybara-angular.gemspec
@@ -17,11 +17,12 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
+  spec.required_ruby_version = ">= 2.7"
 
   spec.add_dependency 'capybara', '>= 2.5.0'
 
   spec.add_development_dependency "bundler", "> 1.17", "< 3"
-  spec.add_development_dependency "rails"
+  spec.add_development_dependency "rails", "> 5.2", "< 7.1"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "poltergeist"

diff --git a/gemfiles/Gemfile.rails-5.0.x b/gemfiles/Gemfile.rails-5.0.x
diff --git a/gemfiles/Gemfile.rails-5.1.x b/gemfiles/Gemfile.rails-5.1.x
diff --git a/lib/capybara/angular/dsl.rb b/lib/capybara/angular/dsl.rb
@@ -4,8 +4,8 @@ module DSL
       include Capybara::DSL
 
       Capybara::Session::DSL_METHODS.each do |method|
-        define_method(method) do |*args, &block|
-          page.send(method, *args, &block)
+        define_method(method) do |*args, **kwargs, &block|
+          page.send(method, *args, **kwargs, &block)
         end
       end
 

diff --git a/lib/capybara/angular/version.rb b/lib/capybara/angular/version.rb
@@ -1,5 +1,5 @@
 module Capybara
   module Angular
-    VERSION = "0.2.6"
+    VERSION = "0.3.0"
   end
 end