railties 5.0.4 → 5.0.5.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1647a6c62aa3376c81b7f8a8b9e2dc97f7176f2e
-  data.tar.gz: 8edab02a2158673b708e90b575e1059d345005ba
+  metadata.gz: 5fc8513181d9478eb66b82425938d379d271dd94
+  data.tar.gz: 171241e22916d1cf85d07944acb4476242934531
 SHA512:
-  metadata.gz: 9351e785858fcc8db84f3541533112088fa634ca4e9478b088f90f65f62295f08008b3bfa5de49c2e92042882d003eafd7db85fd674a555eec3fa0ea0c2cd605
-  data.tar.gz: f0a0f5a8a264dc257f7f74a62ac64e925872cd3e9c705a08f189a157572184760afb238d173113533b5c11099011dfe829dc205a3bb662f1fcee1497b36ef3dd
+  metadata.gz: 5ff37e2fb736b9cb9161b091588058a781ba4dbc5465daf11303e6a8a9da222a8df4d4d8e8c1623510f45e1d82226c77fbaa76047414e177259aae3e844cb767
+  data.tar.gz: 4c8b35c7219c6de06e16ced2ca82b972b975152fd0dc42be6a7aa5a17876c4b5dfcbef5dbf6a51991a965b9772e065c013c698c9352a947fc38592f06f29716e

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## Rails 5.0.5.rc1 (July 19, 2017) ##
+
+*   Make Rails' test runner work better with minitest plugins.
+
+    By demoting the Rails test runner to just another minitest plugin —
+    and thereby not eager loading it — we can co-exist much better with
+    other minitest plugins such as pride and minitest-focus.
+
+    *Kasper Timm Hansen*
+
 ## Rails 5.0.4 (June 19, 2017) ##
 
 *   No changes.

data/lib/minitest/rails_plugin.rb

@@ -0,0 +1,49 @@
+require "active_support/core_ext/module/attribute_accessors"
+require "rails/test_unit/reporter"
+
+module Minitest
+  class SuppressedSummaryReporter < SummaryReporter
+    # Disable extra failure output after a run if output is inline.
+    def aggregated_results(*)
+      super unless options[:output_inline]
+    end
+  end
+
+  def self.plugin_rails_options(opts, options)
+    opts.on("-b", "--backtrace", "Show the complete backtrace") do
+      options[:full_backtrace] = true
+    end
+
+    opts.on("-d", "--defer-output", "Output test failures and errors after the test run") do
+      options[:output_inline] = false
+    end
+
+    opts.on("-f", "--fail-fast", "Abort test run on first failure or error") do
+      options[:fail_fast] = true
+    end
+
+    opts.on("-c", "--[no-]color", "Enable color in the output") do |value|
+      options[:color] = value
+    end
+
+    options[:color] = true
+    options[:output_inline] = true
+  end
+
+  # Owes great inspiration to test runner trailblazers like RSpec,
+  # minitest-reporters, maxitest and others.
+  def self.plugin_rails_init(options)
+    unless options[:full_backtrace] || ENV["BACKTRACE"]
+      # Plugin can run without Rails loaded, check before filtering.
+      Minitest.backtrace_filter = ::Rails.backtrace_cleaner if ::Rails.respond_to?(:backtrace_cleaner)
+    end
+
+    # Replace progress reporter for colors.
+    reporter.reporters.delete_if { |reporter| reporter.kind_of?(SummaryReporter) || reporter.kind_of?(ProgressReporter) }
+    reporter << SuppressedSummaryReporter.new(options[:io], options)
+    reporter << ::Rails::TestUnitReporter.new(options[:io], options)
+  end
+
+  # Backwardscompatibility with Rails 5.0 generated plugin test scripts
+  mattr_reader(:run_via) { Hash.new }
+end

data/lib/rails/commands/test.rb

@@ -1,4 +1,4 @@
-require "rails/test_unit/minitest_plugin"
+require "rails/test_unit/runner"
 
 if defined?(ENGINE_ROOT)
   $LOAD_PATH << File.expand_path("test", ENGINE_ROOT)
@@ -6,6 +6,5 @@ else
   $LOAD_PATH << File.expand_path("../../test", APP_PATH)
 end
 
-Minitest.run_via = :rails
-
-require "active_support/testing/autorun"
+Rails::TestUnit::Runner.parse_options(ARGV)
+Rails::TestUnit::Runner.run(ARGV)

data/lib/rails/gem_version.rb

@@ -7,8 +7,8 @@ module Rails
   module VERSION
     MAJOR = 5
     MINOR = 0
-    TINY  = 4
-    PRE   = nil
+    TINY  = 5
+    PRE   = "rc1"
 
     STRING = [MAJOR, MINOR, TINY, PRE].compact.join(".")
   end

data/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults.rb.tt

@@ -8,7 +8,7 @@
 <%- end -%>
 # Read the Guide for Upgrading Ruby on Rails for more info on each option.
 
-Rails.application.config.raise_on_unfiltered_parameters = true
+Rails.application.config.action_controller.raise_on_unfiltered_parameters = true
 <%- unless options[:api] -%>
 
 # Enable per-form CSRF tokens. Previous versions had false.

data/lib/rails/generators/rails/plugin/templates/bin/test.tt

@@ -1,10 +1,10 @@
 $: << File.expand_path(File.expand_path('../../test', __FILE__))
 
 require 'bundler/setup'
-require 'rails/test_unit/minitest_plugin'
+require 'rails/test_unit/runner'
+require 'rails/test_unit/reporter'
 
 Rails::TestUnitReporter.executable = 'bin/test'
 
-Minitest.run_via = :rails
-
-require "active_support/testing/autorun"
+Rails::TestUnit::Runner.parse_options(ARGV)
+Rails::TestUnit::Runner.run(ARGV)

data/lib/rails/test_help.rb

@@ -2,7 +2,6 @@
 # so fixtures aren't loaded into that environment
 abort("Abort testing: Your Rails environment is running in production mode!") if Rails.env.production?
 
-require "rails/test_unit/minitest_plugin"
 require 'active_support/test_case'
 require 'action_controller'
 require 'action_controller/test_case'

data/lib/rails/test_unit/line_filtering.rb

@@ -1,78 +1,12 @@
 require 'method_source'
+require "rails/test_unit/runner"
 
 module Rails
   module LineFiltering # :nodoc:
     def run(reporter, options = {})
-      if options[:patterns] && options[:patterns].any? { |p| p =~ /:\d+/ }
-        options[:filter] = \
-          CompositeFilter.new(self, options[:filter], options[:patterns])
-      end
+      options[:filter] = Rails::TestUnit::Runner.compose_filter(self, options[:filter])
 
       super
     end
   end
-
-  class CompositeFilter # :nodoc:
-    attr_reader :named_filter
-
-    def initialize(runnable, filter, patterns)
-      @runnable = runnable
-      @named_filter = derive_named_filter(filter)
-      @filters = [ @named_filter, *derive_line_filters(patterns) ].compact
-    end
-
-    # Minitest uses === to find matching filters.
-    def ===(method)
-      @filters.any? { |filter| filter === method }
-    end
-
-    private
-      def derive_named_filter(filter)
-        if filter.respond_to?(:named_filter)
-          filter.named_filter
-        elsif filter =~ %r%/(.*)/% # Regexp filtering copied from Minitest.
-          Regexp.new $1
-        elsif filter.is_a?(String)
-          filter
-        end
-      end
-
-      def derive_line_filters(patterns)
-        patterns.flat_map do |file_and_line|
-          file, *lines = file_and_line.split(':')
-
-          if lines.empty?
-            Filter.new(@runnable, file, nil) if file
-          else
-            lines.map { |line| Filter.new(@runnable, file, line) }
-          end
-        end
-      end
-  end
-
-  class Filter # :nodoc:
-    def initialize(runnable, file, line)
-      @runnable, @file = runnable, File.expand_path(file)
-      @line = line.to_i if line
-    end
-
-    def ===(method)
-      return unless @runnable.method_defined?(method)
-
-      if @line
-        test_file, test_range = definition_for(@runnable.instance_method(method))
-        test_file == @file && test_range.include?(@line)
-      else
-        @runnable.instance_method(method).source_location.first == @file
-      end
-    end
-
-    private
-      def definition_for(method)
-        file, start_line = method.source_location
-        end_line = method.source.count("\n") + start_line - 1
-
-        return file, start_line..end_line
-      end
-  end
 end

data/lib/rails/test_unit/reporter.rb

@@ -72,7 +72,12 @@ module Rails
       end
 
       def app_root
-        @app_root ||= defined?(ENGINE_ROOT) ? ENGINE_ROOT : Rails.root
+        @app_root ||=
+          if defined?(ENGINE_ROOT)
+            ENGINE_ROOT
+          elsif Rails.respond_to?(:root)
+            Rails.root
+          end
       end
 
       def colored_output?

data/lib/rails/test_unit/runner.rb

@@ -0,0 +1,138 @@
+require "shellwords"
+require "method_source"
+require "rake/file_list"
+require "active_support/core_ext/module/attribute_accessors"
+
+module Rails
+  module TestUnit
+    class Runner
+      mattr_reader(:filters) { [] }
+
+      class << self
+        def options(opts)
+          opts.on("--warnings", "-w", "Run with Ruby warnings enabled") {}
+          opts.on("--environment", "-e", "Run tests in the ENV environment") {}
+        end
+
+        def parse_options(argv)
+          # Perform manual parsing and cleanup since option parser raises on unknown options.
+          env_index = argv.index("--environment") || argv.index("-e")
+          if env_index
+            argv.delete_at(env_index)
+            environment = argv.delete_at(env_index).strip
+          end
+          ENV["RAILS_ENV"] = environment || "test"
+
+          w_index = argv.index("--warnings") || argv.index("-w")
+          $VERBOSE = argv.delete_at(w_index) if w_index
+        end
+
+        def rake_run(argv = [])
+          ARGV.replace Shellwords.split(ENV["TESTOPTS"] || "")
+
+          run(argv)
+        end
+
+        def run(argv = [])
+          load_tests(argv)
+
+          require "active_support/testing/autorun"
+        end
+
+        def load_tests(argv)
+          patterns = extract_filters(argv)
+
+          tests = Rake::FileList[patterns.any? ? patterns : "test/**/*_test.rb"]
+          tests.to_a.each { |path| require File.expand_path(path) }
+        end
+
+        def compose_filter(runnable, filter)
+          if filters.any? { |_, lines| lines.any? }
+            CompositeFilter.new(runnable, filter, filters)
+          else
+            filter
+          end
+        end
+
+        private
+          def extract_filters(argv)
+            argv.select { |arg| arg =~ /^\w+\// }.map do |path|
+              case
+              when path =~ /(:\d+)+$/
+                file, *lines = path.split(":")
+                filters << [ file, lines ]
+                file
+              when Dir.exist?(path)
+                "#{path}/**/*_test.rb"
+              else
+                filters << [ path, [] ]
+                path
+              end
+            end
+          end
+      end
+    end
+
+    class CompositeFilter # :nodoc:
+      attr_reader :named_filter
+
+      def initialize(runnable, filter, patterns)
+        @runnable = runnable
+        @named_filter = derive_named_filter(filter)
+        @filters = [ @named_filter, *derive_line_filters(patterns) ].compact
+      end
+
+      # Minitest uses === to find matching filters.
+      def ===(method)
+        @filters.any? { |filter| filter === method }
+      end
+
+      private
+        def derive_named_filter(filter)
+          if filter.respond_to?(:named_filter)
+            filter.named_filter
+          elsif filter =~ %r%/(.*)/% # Regexp filtering copied from Minitest.
+            Regexp.new $1
+          elsif filter.is_a?(String)
+            filter
+          end
+        end
+
+        def derive_line_filters(patterns)
+          patterns.flat_map do |file, lines|
+            if lines.empty?
+              Filter.new(@runnable, file, nil) if file
+            else
+              lines.map { |line| Filter.new(@runnable, file, line) }
+            end
+          end
+        end
+    end
+
+    class Filter # :nodoc:
+      def initialize(runnable, file, line)
+        @runnable, @file = runnable, File.expand_path(file)
+        @line = line.to_i if line
+      end
+
+      def ===(method)
+        return unless @runnable.method_defined?(method)
+
+        if @line
+          test_file, test_range = definition_for(@runnable.instance_method(method))
+          test_file == @file && test_range.include?(@line)
+        else
+          @runnable.instance_method(method).source_location.first == @file
+        end
+      end
+
+      private
+        def definition_for(method)
+          file, start_line = method.source_location
+          end_line = method.source.count("\n") + start_line - 1
+
+          return file, start_line..end_line
+        end
+    end
+  end
+end

data/lib/rails/test_unit/testing.rake

@@ -1,18 +1,18 @@
-gem 'minitest'
-require 'minitest'
-require 'rails/test_unit/minitest_plugin'
+gem "minitest"
+require "minitest"
+require_relative "runner"
 
 task default: :test
 
 desc "Runs all tests in test folder"
 task :test do
   $: << "test"
-  pattern = if ENV.key?('TEST')
-               ENV['TEST']
-             else
-               "test"
-             end
-  Minitest.rake_run([pattern])
+
+  if ENV.key?("TEST")
+    Rails::TestUnit::Runner.rake_run([ENV["TEST"]])
+  else
+    Rails::TestUnit::Runner.rake_run
+  end
 end
 
 namespace :test do
@@ -29,22 +29,22 @@ namespace :test do
   ["models", "helpers", "controllers", "mailers", "integration", "jobs"].each do |name|
     task name => "test:prepare" do
       $: << "test"
-      Minitest.rake_run(["test/#{name}"])
+      Rails::TestUnit::Runner.rake_run(["test/#{name}"])
     end
   end
 
   task :generators => "test:prepare" do
     $: << "test"
-    Minitest.rake_run(["test/lib/generators"])
+    Rails::TestUnit::Runner.rake_run(["test/lib/generators"])
   end
 
   task :units => "test:prepare" do
     $: << "test"
-    Minitest.rake_run(["test/models", "test/helpers", "test/unit"])
+    Rails::TestUnit::Runner.rake_run(["test/models", "test/helpers", "test/unit"])
   end
 
   task :functionals => "test:prepare" do
     $: << "test"
-    Minitest.rake_run(["test/controllers", "test/mailers", "test/functional"])
+    Rails::TestUnit::Runner.rake_run(["test/controllers", "test/mailers", "test/functional"])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: railties
 version: !ruby/object:Gem::Version
-  version: 5.0.4
+  version: 5.0.5.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.5.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.5.rc1
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.5.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.5.rc1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -92,14 +92,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.5.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.0.4
+        version: 5.0.5.rc1
 description: 'Rails internals: application bootup, plugins, generators, and rake tasks.'
 email: david@loudthinking.com
 executables:
@@ -112,7 +112,9 @@ files:
 - RDOC_MAIN.rdoc
 - README.rdoc
 - exe/rails
+- lib/minitest/rails_plugin.rb
 - lib/rails.rb
+- lib/rails/.DS_Store
 - lib/rails/all.rb
 - lib/rails/api/task.rb
 - lib/rails/app_loader.rb
@@ -127,7 +129,9 @@ files:
 - lib/rails/cli.rb
 - lib/rails/code_statistics.rb
 - lib/rails/code_statistics_calculator.rb
+- lib/rails/command/.DS_Store
 - lib/rails/commands.rb
+- lib/rails/commands/.DS_Store
 - lib/rails/commands/application.rb
 - lib/rails/commands/commands_tasks.rb
 - lib/rails/commands/console.rb
@@ -135,6 +139,7 @@ files:
 - lib/rails/commands/dbconsole.rb
 - lib/rails/commands/destroy.rb
 - lib/rails/commands/generate.rb
+- lib/rails/commands/generate/.DS_Store
 - lib/rails/commands/plugin.rb
 - lib/rails/commands/rake_proxy.rb
 - lib/rails/commands/runner.rb
@@ -145,6 +150,7 @@ files:
 - lib/rails/console/helpers.rb
 - lib/rails/dev_caching.rb
 - lib/rails/engine.rb
+- lib/rails/engine/.DS_Store
 - lib/rails/engine/commands.rb
 - lib/rails/engine/commands_tasks.rb
 - lib/rails/engine/configuration.rb
@@ -375,10 +381,9 @@ files:
 - lib/rails/templates/rails/welcome/index.html.erb
 - lib/rails/test_help.rb
 - lib/rails/test_unit/line_filtering.rb
-- lib/rails/test_unit/minitest_plugin.rb
 - lib/rails/test_unit/railtie.rb
 - lib/rails/test_unit/reporter.rb
-- lib/rails/test_unit/test_requirer.rb
+- lib/rails/test_unit/runner.rb
 - lib/rails/test_unit/testing.rake
 - lib/rails/version.rb
 - lib/rails/welcome_controller.rb
@@ -399,9 +404,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.12

data/lib/rails/test_unit/minitest_plugin.rb

@@ -1,134 +0,0 @@
-require "active_support/core_ext/module/attribute_accessors"
-require "rails/test_unit/reporter"
-require "rails/test_unit/test_requirer"
-require 'shellwords'
-
-module Minitest
-  class SuppressedSummaryReporter < SummaryReporter
-    # Disable extra failure output after a run if output is inline.
-    def aggregated_results(*)
-      super unless options[:output_inline]
-    end
-  end
-
-  def self.plugin_rails_options(opts, options)
-    executable = ::Rails::TestUnitReporter.executable
-    opts.separator ""
-    opts.separator "Usage: #{executable} [options] [files or directories]"
-    opts.separator "You can run a single test by appending a line number to a filename:"
-    opts.separator ""
-    opts.separator "    #{executable} test/models/user_test.rb:27"
-    opts.separator ""
-    opts.separator "You can run multiple files and directories at the same time:"
-    opts.separator ""
-    opts.separator "    #{executable} test/controllers test/integration/login_test.rb"
-    opts.separator ""
-    opts.separator "By default test failures and errors are reported inline during a run."
-    opts.separator ""
-
-    opts.separator "Rails options:"
-    opts.on("-e", "--environment ENV",
-            "Run tests in the ENV environment") do |env|
-      options[:environment] = env.strip
-    end
-
-    opts.on("-b", "--backtrace",
-            "Show the complete backtrace") do
-      options[:full_backtrace] = true
-    end
-
-    opts.on("-d", "--defer-output",
-            "Output test failures and errors after the test run") do
-      options[:output_inline] = false
-    end
-
-    opts.on("-f", "--fail-fast",
-            "Abort test run on first failure or error") do
-      options[:fail_fast] = true
-    end
-
-    opts.on("-c", "--[no-]color",
-            "Enable color in the output") do |value|
-      options[:color] = value
-    end
-
-    options[:color] = true
-    options[:output_inline] = true
-    options[:patterns] = opts.order! unless run_via.rake?
-  end
-
-  def self.rake_run(patterns) # :nodoc:
-    self.run_via = :rake unless run_via.set?
-    ::Rails::TestRequirer.require_files(patterns)
-    autorun
-  end
-
-  module RunRespectingRakeTestopts
-    def run(args = [])
-      if run_via.rake?
-        args = Shellwords.split(ENV["TESTOPTS"] || "")
-      end
-
-      super
-    end
-  end
-
-  singleton_class.prepend RunRespectingRakeTestopts
-
-  # Owes great inspiration to test runner trailblazers like RSpec,
-  # minitest-reporters, maxitest and others.
-  def self.plugin_rails_init(options)
-    ENV["RAILS_ENV"] = options[:environment] || "test"
-
-    # If run via `ruby` we've been passed the files to run directly, or if run
-    # via `rake` then they have already been eagerly required.
-    unless run_via.ruby? || run_via.rake?
-      ::Rails::TestRequirer.require_files(options[:patterns])
-    end
-
-    unless options[:full_backtrace] || ENV["BACKTRACE"]
-      # Plugin can run without Rails loaded, check before filtering.
-      Minitest.backtrace_filter = ::Rails.backtrace_cleaner if ::Rails.respond_to?(:backtrace_cleaner)
-    end
-
-    # Replace progress reporter for colors.
-    reporter.reporters.delete_if { |reporter| reporter.kind_of?(SummaryReporter) || reporter.kind_of?(ProgressReporter) }
-    reporter << SuppressedSummaryReporter.new(options[:io], options)
-    reporter << ::Rails::TestUnitReporter.new(options[:io], options)
-  end
-
-  def self.run_via=(runner)
-    if run_via.set?
-      raise ArgumentError, "run_via already assigned"
-    else
-      run_via.runner = runner
-    end
-  end
-
-  class RunVia
-    attr_accessor :runner
-    alias set? runner
-
-    # Backwardscompatibility with Rails 5.0 generated plugin test scripts.
-    def []=(runner, *)
-      @runner = runner
-    end
-
-    def ruby?
-      runner == :ruby
-    end
-
-    def rake?
-      runner == :rake
-    end
-  end
-
-  mattr_reader(:run_via) { RunVia.new }
-end
-
-# Put Rails as the first plugin minitest initializes so other plugins
-# can override or replace our default reporter setup.
-# Since minitest only loads plugins if its extensions are empty we have
-# to call `load_plugins` first.
-Minitest.load_plugins
-Minitest.extensions.unshift 'rails'

data/lib/rails/test_unit/test_requirer.rb

@@ -1,28 +0,0 @@
-require 'active_support/core_ext/object/blank'
-require 'rake/file_list'
-
-module Rails
-  class TestRequirer # :nodoc:
-    class << self
-      def require_files(patterns)
-        patterns = expand_patterns(patterns)
-
-        Rake::FileList[patterns.compact.presence || 'test/**/*_test.rb'].to_a.each do |file|
-          require File.expand_path(file)
-        end
-      end
-
-      private
-        def expand_patterns(patterns)
-          patterns.map do |arg|
-            arg = arg.gsub(/(:\d+)+?$/, '')
-            if Dir.exist?(arg)
-              "#{arg}/**/*_test.rb"
-            else
-              arg
-            end
-          end
-        end
-    end
-  end
-end