Merge pull request #502 from yuki24/update-ci-fix-tests

Update travis.yml to reflect the current state of maintained Ruby/Rails versions
rails · Feb 22, 2021 · 770abdb · 770abdb
2 parents 0288a50 + 1b9bba2
commit 770abdb
Show file tree

Hide file tree

Showing 4 changed files with 43 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -12,37 +12,65 @@ rvm:
   - 2.5.8
   - 2.6.6
   - 2.7.1
+  - 3.0.0
   - ruby-head
 
 gemfile:
   - gemfiles/rails_5_0.gemfile
   - gemfiles/rails_5_1.gemfile
   - gemfiles/rails_5_2.gemfile
   - gemfiles/rails_6_0.gemfile
+  - gemfiles/rails_6_1.gemfile
   - gemfiles/rails_head.gemfile
 
 matrix:
   exclude:
     - rvm: 2.7.1
       gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: 3.0.0
+      gemfile: gemfiles/rails_5_0.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_5_0.gemfile
     - rvm: 2.7.1
       gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: 3.0.0
+      gemfile: gemfiles/rails_5_1.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_5_1.gemfile
     - rvm: 2.2.10
       gemfile: gemfiles/rails_5_2.gemfile
     - rvm: 2.7.1
       gemfile: gemfiles/rails_5_2.gemfile
+    - rvm: 3.0.0
+      gemfile: gemfiles/rails_5_2.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_5_2.gemfile
     - rvm: 2.2.10
       gemfile: gemfiles/rails_6_0.gemfile
     - rvm: 2.3.8
       gemfile: gemfiles/rails_6_0.gemfile
     - rvm: 2.4.10
       gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: 3.0.0
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: ruby-head
+      gemfile: gemfiles/rails_6_0.gemfile
+    - rvm: 2.2.10
+      gemfile: gemfiles/rails_6_1.gemfile
+    - rvm: 2.3.8
+      gemfile: gemfiles/rails_6_1.gemfile
+    - rvm: 2.4.10
+      gemfile: gemfiles/rails_6_1.gemfile
     - rvm: 2.2.10
       gemfile: gemfiles/rails_head.gemfile
     - rvm: 2.3.8
       gemfile: gemfiles/rails_head.gemfile
     - rvm: 2.4.10
       gemfile: gemfiles/rails_head.gemfile
+    - rvm: 2.5.8
+      gemfile: gemfiles/rails_head.gemfile
+    - rvm: 2.6.6
+      gemfile: gemfiles/rails_head.gemfile
   allow_failures:
     - rvm: ruby-head
     - gemfile: gemfiles/rails_head.gemfile

diff --git a/Appraisals b/Appraisals
@@ -15,6 +15,10 @@ if RUBY_VERSION >= "2.5.0"
     gem "rails", "~> 6.0.0"
   end
 
+  appraise "rails-6-1" do
+    gem "rails", "~> 6.1.0"
+  end
+
   appraise "rails-head" do
     gem "rails", github: "rails/rails"
   end

diff --git a/gemfiles/rails_6_1.gemfile b/gemfiles/rails_6_1.gemfile
@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "rake"
+gem "mocha", :require => false
+gem "appraisal"
+gem "rails", "~> 6.1.0"
+
+gemspec :path => "../"
diff --git a/test/jbuilder_template_test.rb b/test/jbuilder_template_test.rb
@@ -290,7 +290,7 @@ def render(*args)
 
     def render_without_parsing(source, assigns = {})
       view = build_view(fixtures: PARTIALS.merge("source.json.jbuilder" => source), assigns: assigns)
-      view.render(template: "source.json.jbuilder")
+      view.render(template: "source")
     end
 
     def build_view(options = {})