Skip to content

Commit

Permalink
Merge pull request #441 from EmilioCristalli/rails5_2
Browse files Browse the repository at this point in the history
Test with Rails 5.2
  • Loading branch information
FLarra committed Dec 18, 2018
2 parents 65ed644 + c4887e0 commit f196413
Show file tree
Hide file tree
Showing 11 changed files with 20 additions and 8 deletions.
3 changes: 3 additions & 0 deletions .travis.yml
Expand Up @@ -18,12 +18,15 @@ gemfile:
- gemfiles/rails4_2.gemfile
- gemfiles/rails5_0.gemfile
- gemfiles/rails5_1.gemfile
- gemfiles/rails5_2.gemfile
matrix:
exclude:
- rvm: 2.1.10
gemfile: gemfiles/rails5_0.gemfile
- rvm: 2.1.10
gemfile: gemfiles/rails5_1.gemfile
- rvm: 2.1.10
gemfile: gemfiles/rails5_2.gemfile
# rails <=4.1 segfaults with ruby 2.4+
- rvm: 2.4.3
gemfile: gemfiles/rails4_0.gemfile
Expand Down
2 changes: 1 addition & 1 deletion Appraisals
@@ -1,4 +1,4 @@
rails_versions = ['~> 4.0.5', '~> 4.1.1', '~> 4.2.0', '~> 5.0.0', '~> 5.1.0']
rails_versions = ['~> 4.0.5', '~> 4.1.1', '~> 4.2.0', '~> 5.0.0', '~> 5.1.0', '~> 5.2.0']

rails_versions.each do |rails_version|
appraise "rails#{rails_version.slice(/\d+\.\d+/).gsub('.', '_')}" do
Expand Down
2 changes: 1 addition & 1 deletion exception_notification.gemspec
Expand Up @@ -28,7 +28,7 @@ Gem::Specification.new do |s|
s.add_development_dependency "mocha", ">= 0.13.0"
s.add_development_dependency "sqlite3", ">= 1.3.4"
s.add_development_dependency "coveralls", "~> 0.8.2"
s.add_development_dependency "appraisal", "~> 2.0.0"
s.add_development_dependency "appraisal", "~> 2.2.0"
s.add_development_dependency "hipchat", ">= 1.0.0"
s.add_development_dependency "carrier-pigeon", ">= 0.7.0"
s.add_development_dependency "slack-notifier", ">= 1.0.0"
Expand Down
2 changes: 1 addition & 1 deletion gemfiles/rails4_0.gemfile
Expand Up @@ -4,4 +4,4 @@ source "https://rubygems.org"

gem "rails", "~> 4.0.5"

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails4_1.gemfile
Expand Up @@ -4,4 +4,4 @@ source "https://rubygems.org"

gem "rails", "~> 4.1.1"

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails4_2.gemfile
Expand Up @@ -4,4 +4,4 @@ source "https://rubygems.org"

gem "rails", "~> 4.2.0"

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails5_0.gemfile
Expand Up @@ -4,4 +4,4 @@ source "https://rubygems.org"

gem "rails", "~> 5.0.0"

gemspec :path => "../"
gemspec path: "../"
2 changes: 1 addition & 1 deletion gemfiles/rails5_1.gemfile
Expand Up @@ -4,4 +4,4 @@ source "https://rubygems.org"

gem "rails", "~> 5.1.0"

gemspec :path => "../"
gemspec path: "../"
7 changes: 7 additions & 0 deletions gemfiles/rails5_2.gemfile
@@ -0,0 +1,7 @@
# This file was generated by Appraisal

source "https://rubygems.org"

gem "rails", "~> 5.2.0"

gemspec path: "../"
3 changes: 3 additions & 0 deletions test/dummy/config/application.rb
Expand Up @@ -38,5 +38,8 @@ class Application < Rails::Application

# Configure sensitive parameters which will be filtered from the log file.
config.filter_parameters += [:password, :secret]

rails_version = Gem::Version.new(Rails.version)
config.active_record.sqlite3.represent_boolean_as_integer = true if rails_version >= Gem::Version.new("5.2.0")
end
end
1 change: 0 additions & 1 deletion test/dummy/config/initializers/secret_token.rb
Expand Up @@ -4,5 +4,4 @@
# If you change this key, all old signed cookies will become invalid!
# Make sure the secret is at least 30 characters and all random,
# no regular words or you'll be exposed to dictionary attacks.
Dummy::Application.config.secret_token = 'cfdf538142b0b383e722e8e7ea839b8ce6c3dc94a57856b343a2d13be66f5b690a55c991cec6e98ed60ea9b7e58265af23cb40cbadee02f13f1c45c2625f482b'
Dummy::Application.config.secret_key_base = 'my new secret'

0 comments on commit f196413

Please sign in to comment.