Skip to content

Commit

Permalink
Fixes the test suite in Rails 6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
yuki24 committed Feb 22, 2021
1 parent c0813f4 commit 993fbc7
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 1 deletion.
4 changes: 4 additions & 0 deletions Appraisals
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 10 additions & 0 deletions gemfiles/rails_6_1.gemfile
Original file line number Diff line number Diff line change
@@ -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 => "../"
2 changes: 1 addition & 1 deletion test/jbuilder_template_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {})
Expand Down

0 comments on commit 993fbc7

Please sign in to comment.