Merge pull request #2191 from rspec/fix-other-builds

Update the default version of rails used in builds

Author: JonRowe

Gemfile

@@ -21,13 +21,19 @@ platforms :jruby do
 end
 
 RAILS_VERSION ||= ""
-match = /(\d+)(\.|-)(\d+)/.match(RAILS_VERSION)
-if match.nil?
-  # will be nil if master
+case RAILS_VERSION
+when /master/
   MAJOR = 6
   MINOR = 0
+when /stable/
+  MAJOR = 6
+  MINOR = 0
+when nil, false, ""
+  MAJOR = 5
+  MINOR = 1
 else
-  MAJOR,MINOR = match.captures.map(&:to_i).compact
+  match = /(\d+)(\.|-)(\d+)/.match(RAILS_VERSION)
+  MAJOR, MINOR = match.captures.map(&:to_i).compact
 end
 
 if MAJOR >= 6

Gemfile-rails-dependencies

@@ -25,7 +25,7 @@ when /stable$/
     gem rails_gem, :git => "https://github.com/rails/rails.git", :branch => version
   end
 when nil, false, ""
-  gem "rails", "~> 5.0.0"
+  gem "rails", "~> 5.1.0"
   gem 'activerecord-jdbcsqlite3-adapter', platforms: [:jruby]
 else
   gem "rails", version