Skip to content

Update travis.yml to reflect the current state of maintained Ruby/Rails versions #502

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Feb 22, 2021
+43 −1
Merged

Update travis.yml to reflect the current state of maintained Ruby/Rails versions #502

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
993fbc7
Fixes the test suite in Rails 6.1
yuki24 Feb 22, 2021
1b9bba2
Update travis.yml to reflect the current state of Ruby/Rails versions
yuki24 Feb 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions Appraisals
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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")
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This fixes the builds for Rails 6.1 and later.

end

def build_view(options = {})
Expand Down