Merge remote-tracking branch 'origin/master' into HEAD

.github/workflows/test-suite.yml

@@ -0,0 +1,46 @@
+# This workflow uses actions that are not certified by GitHub.
+# They are provided by a third-party and are governed by
+# separate terms of service, privacy policy, and support
+# documentation.
+# This workflow will download a prebuilt Ruby version, install dependencies and run tests with Rake
+# For more information see: https://github.com/marketplace/actions/setup-ruby-jruby-and-truffleruby
+
+name: test-suite
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-20.04
+    strategy:
+      fail-fast: false
+      matrix:
+        gemfile: ["rails-7.0.x"]
+        ruby: [2.7]
+        include:
+          - gemfile: rails-7.0.x
+            ruby: '2.7'
+          - gemfile: rails-6.1.x
+            ruby: 2.7
+          - gemfile: rails-6.1.x
+            ruby: 2.6
+          - gemfile: rails-6.0.x
+            ruby: 2.7
+          - gemfile: rails-6.0.x
+            ruby: 2.6
+          - gemfile: rails-5.2.x
+            ruby: 2.6
+          - gemfile: rails-5.1.x
+            ruby: 2.5
+          - gemfile: rails-5.0.x
+            ruby: 2.5
+
+    env:
+      BUNDLE_GEMFILE: ${{ github.workspace }}/gemfiles/Gemfile.${{ matrix.gemfile }}
+    steps:
+    - uses: actions/checkout@v2
+    - uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby }}
+        bundler-cache: true
+    - run: bundle exec rspec

.gitignore

@@ -5,6 +5,7 @@
 .yardoc
 .rvmrc
 Gemfile.lock
+gemfiles/*.lock
 InstalledFiles
 _yardoc
 coverage

capybara-angular.gemspec

@@ -20,9 +20,10 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency 'capybara', '>= 2.5.0'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler", "> 1.17", "< 3"
+  spec.add_development_dependency "rails"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "poltergeist"
-  spec.add_development_dependency "puma"
+  spec.add_development_dependency "puma", "< 6"
 end

gemfiles/Gemfile.rails-5.0.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 5.0.0'

gemfiles/Gemfile.rails-5.1.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 5.1.0'

gemfiles/Gemfile.rails-5.2.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 5.2.0'

gemfiles/Gemfile.rails-6.0.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 6.0.0'

gemfiles/Gemfile.rails-6.1.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 6.1.0'

gemfiles/Gemfile.rails-7.0.x

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', '~> 7.0.0'

gemfiles/Gemfile.rails-edge

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec path: '../'
+
+gem 'activerecord', github: 'rails/rails'

spec/capybara/angular_spec.rb

@@ -1,4 +1,6 @@
 require 'rack'
+require 'puma'
+require 'rack/handler/puma'
 require 'capybara'
 require 'capybara/rspec'
 require 'capybara/poltergeist'