Merge pull request #1790 from rspec/rails-5.1-compat

Rails 5.1 compatibility

Author: Sam Phippen

.travis.yml

@@ -60,14 +60,20 @@ matrix:
       env: RAILS_VERSION=master
     - rvm: 2.2.2
       env: RAILS_VERSION=5-0-stable
+    - rvm: 2.2.2
+      env: RAILS_VERSION=5.1.0.rc1
     - rvm: 2.3.3
       env: RAILS_VERSION=master
     - rvm: 2.3.3
       env: RAILS_VERSION=5-0-stable
+    - rvm: 2.3.3
+      env: RAILS_VERSION=5.1.0.rc1
     - rvm: 2.4.0
       env: RAILS_VERSION=master
     - rvm: 2.4.0
       env: RAILS_VERSION=5-0-stable
+    - rvm: 2.4.0
+      env: RAILS_VERSION=5.1.0.rc1
   exclude:
     # 3.0.x is not supported on MRI 2.0+
     - rvm: 2.0.0

Rakefile

@@ -11,6 +11,15 @@ require 'rspec'
 require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
+def rails_template_command
+  require "rails"
+  if Rails.version.to_f >= 5.0
+    "app:template"
+  else
+    "rails:template"
+  end
+end
+
 desc "Run all examples"
 RSpec::Core::RakeTask.new(:spec) do |t|
   t.ruby_opts = %w[-w]
@@ -20,11 +29,21 @@ end
 Cucumber::Rake::Task.new(:cucumber) do |t|
   version = ENV.fetch("RAILS_VERSION", "~> 4.2.0")
   cucumber_flag = "--tags ~@rails_post_5"
-  p version
-  if /(^| )5(\.|-)0/ === version || version == "master"
-    cucumber_flag = "--tags ~@rails_pre_5"
+  tags = []
+  if version.to_f >= 5.1
+    tags << "~@rails_pre_5.1"
   end
 
+  if version.to_f >= 5.0
+    tags << "~@rails_pre_5"
+  end
+
+  if tags.empty?
+    tags << "~@rails_post_5"
+  end
+
+  cucumber_flag = tags.map { |tag| "--tag #{tag}" }
+
   t.cucumber_opts = cucumber_flag
 end
 
@@ -58,7 +77,7 @@ namespace :generate do
 
   desc "generate a bunch of stuff with generators"
   task :stuff do
-    in_example_app "bin/rake rails:template LOCATION='../../example_app_generator/generate_stuff.rb'"
+    in_example_app "bin/rake #{rails_template_command} LOCATION='../../example_app_generator/generate_stuff.rb'"
   end
 end
 
@@ -90,7 +109,7 @@ end
 
 desc "run a variety of specs against the generated app"
 task :smoke do
-  in_example_app "LOCATION='../../example_app_generator/run_specs.rb' bin/rake rails:template --backtrace"
+  in_example_app "LOCATION='../../example_app_generator/run_specs.rb' bin/rake #{rails_template_command} --backtrace"
 end
 
 namespace :smoke do
@@ -131,7 +150,7 @@ namespace :no_active_record do
 
   desc "run a variety of specs against a non-ActiveRecord generated app"
   task :smoke do
-    in_example_app "LOCATION='../../example_app_generator/run_specs.rb' bin/rake rails:template --backtrace",
+    in_example_app "LOCATION='../../example_app_generator/run_specs.rb' bin/rake #{rails_template_command} --backtrace",
                    :app_dir => example_app_dir
   end
 
@@ -180,8 +199,7 @@ namespace :no_active_record do
 
     desc "generate a bunch of stuff with generators"
     task :stuff do
-      in_example_app "bin/rake rails:template LOCATION='../../example_app_generator/generate_stuff.rb'",
-                     :app_dir => example_app_dir
+      in_example_app "bin/rake #{rails_template_command} LOCATION='../../example_app_generator/generate_stuff.rb'", :app_dir => example_app_dir
     end
   end
 end