Merge pull request #2226 from rspec/cleanup-unsupported-ruby-and-rails-4-checks

Drop code related to Rails < 5.0 & Ruby < 2.3.0

Author: JonRowe

.rubocop.yml

@@ -246,12 +246,6 @@ Style/ParallelAssignment:
 Style/ParenthesesAroundCondition:
   Enabled: false
 
-Style/PerlBackrefs:
-  Exclude:
-    # We probably can refactor the backref out, but for now excluding it since
-    # we can't use named matches in 1.8.7
-    - lib/generators/rspec/scaffold/scaffold_generator.rb
-
 Style/PercentLiteralDelimiters:
   PreferredDelimiters:
     '%':  ()      # double-quoted string
@@ -264,12 +258,6 @@ Style/PercentLiteralDelimiters:
     '%W': '[]'    # array of double-quoted strings
     '%x': ()      # a shell command as a string
 
-# On 1.8 `proc` was `lambda`, so we used `Proc.new` to ensure we got real procs
-# on all supported versions.
-# http://batsov.com/articles/2014/02/04/the-elements-of-style-in-ruby-number-12-proc-vs-proc-dot-new/
-Style/Proc:
-  Enabled: false
-
 Style/RegexpLiteral:
   Enabled: false
 

.rubocop_todo.yml

@@ -21,3 +21,14 @@ Style/EachWithObject:
 # the new lambda syntax was not supported in ruby 1.8.7
 Style/Lambda:
   Enabled: false
+
+# we couldn't use named matches in ruby 1.8.7
+Style/PerlBackrefs:
+  Exclude:
+    - lib/generators/rspec/scaffold/scaffold_generator.rb
+
+# On 1.8 `proc` was `lambda`, so we used `Proc.new` to ensure we got real procs
+# on all supported versions.
+# http://batsov.com/articles/2014/02/04/the-elements-of-style-in-ruby-number-12-proc-vs-proc-dot-new/
+Style/Proc:
+  Enabled: false

.travis.yml

@@ -22,11 +22,10 @@ bundler_args: "--binstubs --path ../bundle --retry=3 --jobs=3"
 
 before_install:
   - script/update_rubygems_and_install_bundler
-  - script/downgrade_bundler_on_old_rails
   - script/clone_all_rspec_repos
 
 before_script:
-  # Rails 4.x complains with a bundler rails binstub in PROJECT_ROOT/bin/
+  # Rails 4+ complains with a bundler rails binstub in PROJECT_ROOT/bin/
   - rm -f bin/rails
   - bundle exec rails --version
 

Gemfile

@@ -51,7 +51,7 @@ gem 'mime-types', "~> 3"
 gem 'capybara', '~> 2.13', require: false
 
 if MAJOR < 6
-  gem 'nokogiri', '1.8.5'
+  gem 'nokogiri', '1.9.1'
 else
   gem 'nokogiri', '>= 1.10.4'
 end

Gemfile-custom.sample

@@ -8,12 +8,5 @@ group :development do
   platform :mri do
     gem 'rb-fsevent', '~> 0.9.0'
     gem 'ruby-prof', '~> 0.10.0'
-
-    case RUBY_VERSION
-    when /^1.8/
-      gem 'ruby-debug'
-    when /^1.9/
-      gem 'debugger'
-    end
   end
 end

Gemfile-rails-dependencies

@@ -14,9 +14,7 @@ when /master/
   gem 'puma', "3.12.1"
   gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', platforms: [:jruby]
 when /stable$/
-  gem_list = %w[rails railties actionmailer actionpack activerecord activesupport]
-  gem_list << 'activejob'  if version >= '4-2-stable'
-  gem_list << 'actionview' if version >= '4-2-stable'
+  gem_list = %w[rails railties actionmailer actionpack activerecord activesupport activejob actionview]
   gem 'puma', "3.12.1" if version > '5-0-stable'
   gem 'activerecord-jdbcsqlite3-adapter', git: 'https://github.com/jruby/activerecord-jdbc-adapter', platforms: [:jruby]
 
@@ -29,9 +27,7 @@ when nil, false, ""
 else
   gem "rails", version
 
-  if version >= '5-1-stable' && RUBY_VERSION  >= "2.3"
-    gem "puma"
-  end
+  gem "puma" if version >= '5-1-stable'
 
   if version.gsub(/[^\d\.]/,'').to_f >= 6.0
     gem "activerecord-jdbcsqlite3-adapter", "~> 60.0.rc1", platforms: [:jruby]

README.md

@@ -119,8 +119,7 @@ $ bundle exec rspec --help
 ```
 
 **Optional:** If `bundle exec rspec` is too verbose for you,
-you can generate a binstub at `bin/rspec`
-and use that instead (Rails 4+ only):
+you can generate a binstub at `bin/rspec` and use that instead:
 
  ```sh
  $ bundle binstubs rspec-core

Rakefile

@@ -12,7 +12,7 @@ require 'rspec/core/rake_task'
 require 'cucumber/rake/task'
 
 def rails_template_command
-  require "rails"
+  require "rails/version"
   if Rails.version.to_f >= 5.0
     "app:template"
   else
@@ -27,7 +27,7 @@ RSpec::Core::RakeTask.new(:spec) do |t|
 end
 
 Cucumber::Rake::Task.new(:cucumber) do |t|
-  version = ENV.fetch("RAILS_VERSION", "~> 4.2.0")[/\d[\.-]\d/]
+  version = ENV.fetch("RAILS_VERSION", "~> 5.2.0")[/\d[\.-]\d/]
   if version == "master" || version.nil?
     version = Float::INFINITY
   end
@@ -37,19 +37,10 @@ Cucumber::Rake::Task.new(:cucumber) do |t|
     tags << "~@rails_pre_5.1"
   end
 
-  if version.to_f >= 5.0
-    tags << "~@rails_pre_5"
-  end
-
   if version.to_f == 5.0
     tags << "~@system_test"
   end
 
-  if tags.empty?
-    tags << "~@rails_post_5"
-    tags << "~@system_test"
-  end
-
   if version.to_f >= 6.0
     tags << "~@rails_pre_6"
   end
@@ -69,13 +60,13 @@ namespace :generate do
     unless File.directory?('./tmp/example_app')
       bindir = File.expand_path("bin")
 
-      # Rails 4 cannot use a `rails` binstub generated by Bundler
+      # Rails 4+ cannot use a `rails` binstub generated by Bundler
       sh "rm -f #{bindir}/rails"
       sh "bundle exec rails new ./tmp/example_app --no-rc --skip-javascript --skip-bootsnap -skip-sprockets --skip-git --skip-test-unit --skip-listen --skip-bundle --template=example_app_generator/generate_app.rb"
 
       in_example_app do
         sh "./travis_retry_bundle_install.sh 2>&1"
-        # Rails 4 cannot use a `rails` binstub generated by Bundler
+        # Rails 4+ cannot use a `rails` binstub generated by Bundler
         sh "bundle binstubs bundler rspec-core rake --force"
         sh "bundle binstubs railties" unless File.exist?("bin/rails")
 
@@ -192,13 +183,13 @@ namespace :no_active_record do
       unless File.directory?(example_app_dir)
         bindir = File.expand_path("bin")
 
-        # Rails 4 cannot use a `rails` binstub generated by Bundler
+        # Rails 4+ cannot use a `rails` binstub generated by Bundler
         sh "rm -f #{bindir}/rails"
         sh "bundle exec rails new #{example_app_dir} --no-rc --skip-active-record --skip-javascript --skip-bootsnap --skip-sprockets --skip-git --skip-test-unit --skip-listen --skip-bundle --template=example_app_generator/generate_app.rb"
 
         in_example_app(:app_dir => example_app_dir) do
           sh "./travis_retry_bundle_install.sh 2>&1"
-          # Rails 4 cannot use a `rails` binstub generated by Bundler
+          # Rails 4+ cannot use a `rails` binstub generated by Bundler
           sh "bundle binstubs bundler rspec-core rake --force"
           sh "bundle binstubs railties" unless File.exist?("bin/rails")
 

appveyor.yml

@@ -33,9 +33,6 @@ test_script:
 
 environment:
   matrix:
-    - ruby_version: 200
-    - ruby_version: 21
-    - ruby_version: 22
     - ruby_version: 23-x64
     - ruby_version: 24-x64
     - ruby_version: 25-x64

example_app_generator/generate_action_mailer_specs.rb

@@ -1,12 +1,6 @@
 require 'active_support'
 require 'active_support/core_ext/module'
 
-# We need to copy this method from Thor for older Rails versions
-def comment_lines(path, flag, *args)
-  flag = flag.respond_to?(:source) ? flag.source : flag
-  gsub_file(path, /^(\s*)([^#|\n]*#{flag})/, '\1# \2', *args)
-end
-
 using_source_path(File.expand_path('..', __FILE__)) do
   # Comment out the default mailer stuff
   comment_lines 'config/environments/development.rb', /action_mailer/