Merge pull request #1014 from mathieujobin/add-back-rails7

Test with Rails 7
mileszs · Apr 17, 2022 · dfd990b · dfd990b
2 parents 32096b1 + 4eb8457
commit dfd990b
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -29,6 +29,8 @@ jobs:
             ruby-version: 2.7
           - gemfile: "6.1"
             ruby-version: 3.0
+          - gemfile: "7.0"
+            ruby-version: 3.0
 
     env:
       BUNDLE_GEMFILE: /home/runner/work/wicked_pdf/wicked_pdf/gemfiles/${{ matrix.gemfile }}.gemfile

diff --git a/gemfiles/5.2.gemfile b/gemfiles/5.2.gemfile
@@ -1,7 +1,6 @@
 source 'https://rubygems.org'
 
 gem 'bootsnap' # required to run `rake test` in Rails 5.2
-gem 'mocha', '= 1.3' # newer versions blow up
 gem 'rails', '~> 5.2'
 gem 'rdoc'
 gem 'sprockets', '~>3.0' # v4 strips newlines from assets causing tests to fail

diff --git a/gemfiles/6.0.gemfile b/gemfiles/6.0.gemfile
@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'bootsnap' # required to run `rake test` in Rails 6.0
 gem 'bundler', '~>2'
-gem 'mocha', '= 1.3' # newer versions blow up
 gem 'rails', '~>6.0.1'
 gem 'rdoc'
 gem 'sprockets', '~>3.0'

diff --git a/gemfiles/6.1.gemfile b/gemfiles/6.1.gemfile
@@ -2,7 +2,6 @@ source 'https://rubygems.org'
 
 gem 'bootsnap' # required to run `rake test` in Rails 6.1
 gem 'bundler', '~>2'
-gem 'mocha', '= 1.3' # newer versions blow up
 gem 'rails', '~>6.1.0'
 gem 'webpacker'
 gem 'rdoc'

diff --git a/gemfiles/7.0.gemfile b/gemfiles/7.0.gemfile
@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gem 'bootsnap' # required to run `rake test` in Rails 7.0
+gem 'bundler', '~>2'
+gem 'rails', '~>7.0.0'
+gem 'sprockets-rails'
+gem 'rdoc'
+gem 'sprockets', '~>3.0'
+gem 'sqlite3', '~> 1.4'
+gem 'rubocop', '1.11.0'
+
+gemspec :path => '../'