diff --git a/Appraisals b/Appraisals index b8606bc..dc4de30 100644 --- a/Appraisals +++ b/Appraisals @@ -10,3 +10,8 @@ end appraise 'rails-41' do gem 'rails', '~> 4.1.1' end + +appraise 'rails-5' do + gem 'rails', '~> 5.0' + gem 'rails-controller-testing' +end diff --git a/fastly-rails.gemspec b/fastly-rails.gemspec index 7b7128a..598f6fa 100644 --- a/fastly-rails.gemspec +++ b/fastly-rails.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |s| s.files = Dir["{app,config,db,lib}/**/*", "MIT-LICENSE", "Rakefile", "README.rdoc"] s.test_files = Dir["test/**/*"] - s.add_dependency "railties", '< 5' + s.add_dependency "railties", '> 2', '< 6' s.add_dependency 'fastly', '~> 1.6' s.add_runtime_dependency('mime-types', ['>= 1.16', '< 3']) diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile new file mode 100644 index 0000000..265a9a1 --- /dev/null +++ b/gemfiles/rails_5.gemfile @@ -0,0 +1,8 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 5.0" +gem "rails-controller-testing" + +gemspec :path => "../" diff --git a/test/test_helper.rb b/test/test_helper.rb index 6caa46f..0b99bd0 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -9,6 +9,11 @@ require 'factory_girl_rails' require 'webmock/minitest' +begin + require 'rails-controller-testing' +rescue LoadError +end + Rails.backtrace_cleaner.remove_silencers! #include factories