Skip to content

Commit

Permalink
Merge pull request #22 from muryoimpl/2.3.2
Browse files Browse the repository at this point in the history
Add 2.3.2 and 2.2.6 to .travis.yml
  • Loading branch information
muryoimpl authored Nov 16, 2016
2 parents eca232a + 51c5267 commit 623a13e
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 5 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ language: ruby
sudo: false
rvm:
- 2.1.10
- 2.2.5
- 2.3.1
- 2.2.6
- 2.3.2
- ruby-head

gemfile:
Expand Down
2 changes: 1 addition & 1 deletion test/dummy/config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Application < Rails::Application
config.i18n.default_locale = :en

# Do not swallow errors in after_commit/after_rollback callbacks.
if Gem::Version.new(Rails.version) >= Gem::Version.new("4.2.0")
if Gem::Version.new(Rails.version) >= Gem::Version.new("4.2.0") && Gem::Version.new(Rails.version) <= Gem::Version.new("5.0.0")
config.active_record.raise_in_transactional_callbacks = true
end
end
Expand Down
9 changes: 7 additions & 2 deletions test/dummy/config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,13 @@
config.eager_load = false

# Configure static file server for tests with Cache-Control for performance.
config.serve_static_files = true
config.static_cache_control = 'public, max-age=3600'
if Gem::Version.new(Rails.version) >= Gem::Version.new('5.0.0')
config.public_file_server.enabled = true
config.public_file_server.headers = { 'Cache-Control' => 'public, max-age=3600' }
else
config.serve_static_files = true
config.static_cache_control = 'public, max-age=3600'
end

# Show full error reports and disable caching.
config.consider_all_requests_local = true
Expand Down

0 comments on commit 623a13e

Please sign in to comment.