From 30fff8c7f37ee9156b605d3522d655cc13992f38 Mon Sep 17 00:00:00 2001 From: Ryunosuke Sato Date: Wed, 27 Sep 2017 01:26:08 +0900 Subject: [PATCH 1/3] Fix testing Rails version "~> 5.0" to "~> 5.0.0" Now 5.1.x was released, but we want to test against 5.0.x. --- Appraisals | 2 +- gemfiles/rails_3.gemfile | 2 +- gemfiles/rails_4.gemfile | 2 +- gemfiles/rails_41.gemfile | 2 +- gemfiles/rails_5.gemfile | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Appraisals b/Appraisals index dc4de30..e759a7e 100644 --- a/Appraisals +++ b/Appraisals @@ -12,6 +12,6 @@ appraise 'rails-41' do end appraise 'rails-5' do - gem 'rails', '~> 5.0' + gem 'rails', '~> 5.0.0' gem 'rails-controller-testing' end diff --git a/gemfiles/rails_3.gemfile b/gemfiles/rails_3.gemfile index bbd9aa2..f37b0d3 100644 --- a/gemfiles/rails_3.gemfile +++ b/gemfiles/rails_3.gemfile @@ -5,4 +5,4 @@ source "https://rubygems.org" gem "rails", "~> 3.2.18" gem "test-unit", "~> 3.0" -gemspec :path => "../" +gemspec path: "../" diff --git a/gemfiles/rails_4.gemfile b/gemfiles/rails_4.gemfile index 39a1bd6..4f47847 100644 --- a/gemfiles/rails_4.gemfile +++ b/gemfiles/rails_4.gemfile @@ -4,4 +4,4 @@ source "https://rubygems.org" gem "rails", "~> 4.0.5" -gemspec :path => "../" +gemspec path: "../" diff --git a/gemfiles/rails_41.gemfile b/gemfiles/rails_41.gemfile index 8dfe1fe..7e4bd92 100644 --- a/gemfiles/rails_41.gemfile +++ b/gemfiles/rails_41.gemfile @@ -4,4 +4,4 @@ source "https://rubygems.org" gem "rails", "~> 4.1.1" -gemspec :path => "../" +gemspec path: "../" diff --git a/gemfiles/rails_5.gemfile b/gemfiles/rails_5.gemfile index 265a9a1..0ab3b69 100644 --- a/gemfiles/rails_5.gemfile +++ b/gemfiles/rails_5.gemfile @@ -2,7 +2,7 @@ source "https://rubygems.org" -gem "rails", "~> 5.0" +gem "rails", "~> 5.0.0" gem "rails-controller-testing" -gemspec :path => "../" +gemspec path: "../" From f25467f57da77b372a20344e4c0a946e82bb96e0 Mon Sep 17 00:00:00 2001 From: Ryunosuke Sato Date: Wed, 27 Sep 2017 01:29:42 +0900 Subject: [PATCH 2/3] Test against Rails 4.2 --- Appraisals | 4 ++++ gemfiles/rails_42.gemfile | 7 +++++++ 2 files changed, 11 insertions(+) create mode 100644 gemfiles/rails_42.gemfile diff --git a/Appraisals b/Appraisals index e759a7e..b1c8577 100644 --- a/Appraisals +++ b/Appraisals @@ -11,6 +11,10 @@ appraise 'rails-41' do gem 'rails', '~> 4.1.1' end +appraise 'rails-42' do + gem 'rails', '~> 4.2.0' +end + appraise 'rails-5' do gem 'rails', '~> 5.0.0' gem 'rails-controller-testing' diff --git a/gemfiles/rails_42.gemfile b/gemfiles/rails_42.gemfile new file mode 100644 index 0000000..6977eb0 --- /dev/null +++ b/gemfiles/rails_42.gemfile @@ -0,0 +1,7 @@ +# This file was generated by Appraisal + +source "https://rubygems.org" + +gem "rails", "~> 4.2.0" + +gemspec path: "../" From f7c178953e0505385c9bfbcd31fb6c7e475f74f5 Mon Sep 17 00:00:00 2001 From: Ryunosuke Sato Date: Wed, 27 Sep 2017 01:51:43 +0900 Subject: [PATCH 3/3] Use `File.exist?` instead of `File.exists?` To suppress deprecation warning from Ruby. --- test/dummy/config/boot.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/dummy/config/boot.rb b/test/dummy/config/boot.rb index ef36047..6266cfc 100644 --- a/test/dummy/config/boot.rb +++ b/test/dummy/config/boot.rb @@ -1,5 +1,5 @@ # Set up gems listed in the Gemfile. ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__) -require 'bundler/setup' if File.exists?(ENV['BUNDLE_GEMFILE']) +require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE']) $LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)