rspec-core 2.99.0.beta2 → 2.99.0.rc1

data/lib/rspec/core/minitest_assertions_adapter.rb

@@ -0,0 +1,28 @@
+begin
+  # Only the minitest 5.x gem includes the minitest.rb and assertions.rb files
+  require 'minitest'
+  require 'minitest/assertions'
+rescue LoadError => _ignored
+  # We must be using Ruby Core's MiniTest or the Minitest gem 4.x
+  require 'minitest/unit'
+  Minitest = MiniTest
+end
+
+module RSpec
+  module Core
+    # @private
+    module MinitestAssertionsAdapter
+      include ::Minitest::Assertions
+
+      # Minitest 5.x requires this accessor to be available. See
+      # https://github.com/seattlerb/minitest/blob/38f0a5fcbd9c37c3f80a3eaad4ba84d3fc9947a0/lib/minitest/assertions.rb#L8
+      #
+      # It is not required for other extension libraries, and RSpec does not
+      # report or make this information available to formatters.
+      attr_writer :assertions
+      def assertions
+        @assertions ||= 0
+      end
+    end
+  end
+end

data/lib/rspec/core/option_parser.rb

@@ -14,6 +14,7 @@ module RSpec::Core
     def parse!(args)
       return {} if args.empty?
 
+      pre_parse(args)
       convert_deprecated_args(args)
 
       options = args.delete('--tty') ? {:tty => true} : {}
@@ -30,9 +31,10 @@ module RSpec::Core
       args.map! { |arg|
         case arg
         when "--formatter"
-          RSpec.deprecate("the --formatter option", :replacement => "-f or --format")
+          RSpec.deprecate("The `--formatter` option", :replacement => "-f or --format", :call_site => nil)
           "--format"
         when "--default_path"
+          RSpec.deprecate("The `--default_path` option", :replacement => "--default-path", :call_site => nil)
           "--default-path"
         when "--line_number"
           "--line-number"
@@ -132,6 +134,11 @@ module RSpec::Core
           options[:formatters].last << o
         end
 
+        parser.on('--deprecation-out FILE', 'Write deprecation warnings to a file instead of $stdout.') do |file|
+          # Handled in `pre_parse` so we can set the deprecation stream as early as
+          # possible in case any other options cause deprecations to be issued.
+        end
+
         parser.on('-b', '--backtrace', 'Enable full backtrace.') do |o|
           options[:full_backtrace] = true
         end
@@ -184,6 +191,10 @@ FILTERING
 
         parser.on('-l', '--line-number LINE', 'Specify line number of an example or group (may be',
                                               '  used more than once).') do |o|
+          Metadata.line_number_filter_deprecation_issued = true
+          RSpec.deprecate("The `--line-number`/`-l` CLI option",
+                          :replacement => "the `path/to/file.rb:num` form",
+                          :call_site => nil)
           (options[:line_numbers] ||= []) << o
         end
 
@@ -220,5 +231,13 @@ FILTERING
 
       end
     end
+
+    def pre_parse(args)
+      args.each_cons(2) do |arg, value|
+        if arg == "--deprecation-out"
+          RSpec.configuration.deprecation_stream = value
+        end
+      end
+    end
   end
 end

data/lib/rspec/core/pending.rb

@@ -1,7 +1,14 @@
 module RSpec
   module Core
     module Pending
-      class PendingDeclaredInExample < StandardError; end
+      class SkipDeclaredInExample < StandardError
+        attr_reader :argument
+
+        def initialize(argument)
+          super(argument.to_s)
+          @argument = argument
+        end
+      end
 
       # If Test::Unit is loaed, we'll use its error as baseclass, so that Test::Unit
       # will report unmet RSpec expectations as failures rather than errors.
@@ -126,11 +133,24 @@ module RSpec
             raise PendingExampleFixedError.new
           end
         end
-        raise PendingDeclaredInExample.new(message)
+        raise SkipDeclaredInExample.new(message)
       end
 
       # Backport from RSpec 3 to aid in upgrading.
-      alias_method :skip, :pending_no_warning
+      #
+      # Not using alias method because we explictly want to discard any block.
+      def skip(*args)
+        pending_no_warning(*args)
+      end
+
+      def self.const_missing(name)
+        return super unless name == :PendingDeclaredInExample
+
+        RSpec.deprecate("RSpec::Core::PendingDeclaredInExample",
+          :replacement => "RSpec::Core::Pending::SkipDeclaredInExample")
+
+        SkipDeclaredInExample
+      end
     end
 
     # Alias the error for compatibility with extension gems (e.g. formatters)
@@ -138,7 +158,9 @@ module RSpec
     def self.const_missing(name)
       return super unless name == :PendingExampleFixedError
 
-      RSpec.deprecate("RSpec::Core::PendingExampleFixedError", :replacement => "RSpec::Core::Pending::PendingExampleFixedError")
+      RSpec.deprecate("RSpec::Core::PendingExampleFixedError",
+        :replacement => "RSpec::Core::Pending::PendingExampleFixedError")
+
       Pending::PendingExampleFixedError
     end
   end

data/lib/rspec/core/reporter.rb

@@ -107,8 +107,8 @@ module RSpec::Core
         notify :start_dump
         notify :dump_pending
         notify :dump_failures
-        notify :dump_summary, @duration, @example_count, @failure_count, @pending_count
         notify :deprecation_summary
+        notify :dump_summary, @duration, @example_count, @failure_count, @pending_count
         notify :seed, seed if seed
       ensure
         notify :close

data/lib/rspec/core/runner.rb

@@ -83,10 +83,10 @@ module RSpec
             DRbCommandLine.new(options).run(err, out)
           rescue DRb::DRbConnError
             err.puts "No DRb server is running. Running in local process instead ..."
-            CommandLine.new(options).run(err, out)
+            new(options).run(err, out)
           end
         else
-          CommandLine.new(options).run(err, out)
+          new(options).run(err, out)
         end
       ensure
         RSpec.reset

data/lib/rspec/core/shared_example_group.rb

@@ -33,9 +33,13 @@ module RSpec
       end
 
       alias_method :shared_context,      :shared_examples
-      alias_method :share_examples_for,  :shared_examples
       alias_method :shared_examples_for, :shared_examples
 
+      def share_examples_for(*args, &block)
+        RSpec.deprecate("`share_examples_for`", :replacement => "`shared_examples` or `shared_examples_for`")
+        shared_examples(*args, &block)
+      end
+
       # @deprecated
       def share_as(name, &block)
         RSpec.deprecate("Rspec::Core::SharedExampleGroup#share_as",
@@ -53,12 +57,15 @@ module RSpec
         end
 
         alias_method :shared_context,      :shared_examples
-        alias_method :share_examples_for,  :shared_examples
         alias_method :shared_examples_for, :shared_examples
 
+        def share_examples_for(*args, &block)
+          RSpec.deprecate("`share_examples_for`", :replacement => "`shared_examples` or `shared_examples_for`")
+          shared_examples(*args, &block)
+        end
+
         def share_as(name, &block)
-          RSpec.deprecate("Rspec::Core::SharedExampleGroup#share_as",
-                          :replacement => "RSpec::SharedContext or shared_examples")
+          RSpec.deprecate("`share_as`", :replacement => "`RSpec::SharedContext` or `shared_examples`")
           SharedExampleGroup.registry.add_const('main', name, &block)
         end
 

data/lib/rspec/core/test_unit_assertions_adapter.rb

@@ -0,0 +1,30 @@
+require 'test/unit/assertions'
+
+module RSpec
+  module Core
+    # @private
+    module TestUnitAssertionsAdapter
+      include ::Test::Unit::Assertions
+
+      # If using test/unit from Ruby core with Ruby 1.9+, it includes
+      # MiniTest::Assertions by default. Note the upcasing of 'Test'.
+      #
+      # If the test/unit gem is being loaded, it will not include any minitest
+      # assertions.
+      #
+      # Only if Minitest 5.x is included / loaded do we need to worry about
+      # adding a shim for the new updates. Thus instead of checking on the
+      # RUBY_VERSION we need to check ancestors.
+      begin
+        # MiniTest is 4.x
+        # Minitest is 5.x
+        if ancestors.include?(::Minitest::Assertions)
+          require 'rspec/core/minitest_assertions_adapter'
+          include ::RSpec::Core::MinitestAssertionsAdapter
+        end
+      rescue NameError => _ignored
+        # No-op. Minitest 5.x was not loaded
+      end
+    end
+  end
+end

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.99.0.beta2'
+      STRING = '2.99.0.rc1'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -86,7 +86,7 @@ module RSpec
           example_groups.clear
           if filter_manager.empty?
             reporter.message("No examples found.")
-          elsif exclusion_filter.empty_without_conditional_filters?
+          elsif exclusion_filter.rules_empty?
             message = everything_filtered_message
             if @configuration.run_all_when_everything_filtered?
               message << "; ignoring #{inclusion_filter.description}"
@@ -109,7 +109,7 @@ module RSpec
       end
 
       def announce_exclusion_filter(announcements)
-        unless exclusion_filter.empty_without_conditional_filters?
+        unless exclusion_filter.rules_empty?
           announcements << "exclude #{exclusion_filter.description}"
         end
       end

data/spec/autotest/discover_spec.rb

@@ -1,19 +1,49 @@
 require "spec_helper"
 
 describe "autotest/discover.rb" do
+  before { File.stub(:exist?).and_call_original }
+
   context "with ./.rspec present" do
-    it "adds 'rspec2' to the list of discoveries" do
-      File.stub(:exist?).with("./.rspec") { true }
-      Autotest.should_receive(:add_discovery)
-      load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
+    before { File.stub(:exist?).with("./.rspec") { true } }
+
+    context "when RSpec::Autotest is defined" do
+      before { stub_const "RSpec::Autotest", Module.new }
+
+      it "does not add 'rspec2' to the list of discoveries" do
+        Autotest.should_not_receive(:add_discovery)
+        load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
+      end
+    end
+
+    context "when RSpec::Autotest is not defined" do
+      before { hide_const "RSpec::Autotest" }
+
+      it "adds 'rspec2' to the list of discoveries" do
+        Autotest.should_receive(:add_discovery)
+        load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
+      end
     end
   end
 
   context "with ./.rspec absent" do
-    it "does not add 'rspec2' to the list of discoveries" do
-      File.stub(:exist?) { false }
-      Autotest.should_not_receive(:add_discovery)
-      load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
+    before { File.stub(:exist?).with("./.rspec") { false } }
+
+    context "when RSpec::Autotest is defined" do
+      before { stub_const "RSpec::Autotest", Module.new }
+
+      it "does not add 'rspec2' to the list of discoveries" do
+        Autotest.should_not_receive(:add_discovery)
+        load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
+      end
+    end
+
+    context "when RSpec::Autotest is not defined" do
+      before { hide_const "RSpec::Autotest" }
+
+      it "does not add 'rspec2' to the list of discoveries" do
+        Autotest.should_not_receive(:add_discovery)
+        load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
+      end
     end
   end
 end

data/spec/rspec/core/command_line_spec.rb

@@ -3,7 +3,7 @@ require "stringio"
 require 'tmpdir'
 
 module RSpec::Core
-  describe CommandLine do
+  describe Runner do
 
     let(:out)    { StringIO.new         }
     let(:err)    { StringIO.new         }
@@ -21,20 +21,14 @@ module RSpec::Core
       config.should_receive(:output_stream=).ordered
       config.should_receive(:force).at_least(:once).ordered
 
-      command_line = build_command_line
-      command_line.run err, out
-    end
-
-    it "assigns ConfigurationOptions built from Array of options to @options" do
-      config_options = ConfigurationOptions.new(%w[--color])
-      command_line   = CommandLine.new(%w[--color])
-      expect(command_line.instance_eval { @options.options }).to eq(config_options.parse_options)
+      runner = build_runner
+      runner.run err, out
     end
 
     it "assigns submitted ConfigurationOptions to @options" do
       config_options = ConfigurationOptions.new(%w[--color])
-      command_line   = CommandLine.new(config_options)
-      expect(command_line.instance_eval { @options }).to be(config_options)
+      runner   = Runner.new(config_options)
+      expect(runner.instance_eval { @options }).to be(config_options)
     end
 
     describe "#run" do
@@ -42,18 +36,18 @@ module RSpec::Core
         include_context "spec files"
 
         it "returns 0 if spec passes" do
-          command_line = build_command_line passing_spec_filename
-          expect(command_line.run(err, out)).to eq 0
+          runner = build_runner passing_spec_filename
+          expect(runner.run(err, out)).to eq 0
         end
 
         it "returns 1 if spec fails" do
-          command_line = build_command_line failing_spec_filename
-          expect(command_line.run(err, out)).to eq 1
+          runner = build_runner failing_spec_filename
+          expect(runner.run(err, out)).to eq 1
         end
 
         it "returns 2 if spec fails and --failure-exit-code is 2" do
-          command_line = build_command_line failing_spec_filename, "--failure-exit-code", "2"
-          expect(command_line.run(err, out)).to eq 2
+          runner = build_runner failing_spec_filename, "--failure-exit-code", "2"
+          expect(runner.run(err, out)).to eq 2
         end
       end
 
@@ -62,22 +56,22 @@ module RSpec::Core
 
         it "runs before suite hooks" do
           config.should_receive(:run_hook).with(:before, :suite)
-          command_line = build_command_line
-          command_line.run err, out
+          runner = build_runner
+          runner.run err, out
         end
 
         it "runs after suite hooks" do
           config.should_receive(:run_hook).with(:after, :suite)
-          command_line = build_command_line
-          command_line.run err, out
+          runner = build_runner
+          runner.run err, out
         end
 
         it "runs after suite hooks even after an error" do
           config.should_receive(:run_hook).with(:before, :suite).and_raise "this error"
           config.should_receive(:run_hook).with(:after , :suite)
           expect do
-            command_line = build_command_line
-            command_line.run err, out
+            runner = build_runner
+            runner.run err, out
           end.to raise_error
         end
       end
@@ -86,18 +80,18 @@ module RSpec::Core
     describe "#run with custom output" do
       before { config.stub :files_to_run => [] }
 
-      let(:output_file) { File.new("#{Dir.tmpdir}/command_line_spec_output.txt", 'w') }
+      let(:output_file) { File.new("#{Dir.tmpdir}/runner_spec_output.txt", 'w') }
 
       it "doesn't override output_stream" do
         config.output_stream = output_file
-        command_line = build_command_line
-        command_line.run err, out
-        expect(command_line.instance_eval { @configuration.output_stream }).to eq output_file
+        runner = build_runner
+        runner.run err, out
+        expect(runner.instance_eval { @configuration.output_stream }).to eq output_file
       end
     end
 
-    def build_command_line *args
-      CommandLine.new build_config_options(*args)
+    def build_runner *args
+      Runner.new build_config_options(*args)
     end
 
     def build_config_options *args
@@ -106,4 +100,28 @@ module RSpec::Core
       options
     end
   end
+
+  describe CommandLine do
+    it 'is a subclass of `Runner` so that it inherits the same behavior' do
+      expect(CommandLine.superclass).to be(Runner)
+    end
+
+    it 'prints a deprecation when instantiated' do
+      expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /RSpec::Core::CommandLine/)
+      CommandLine.new(ConfigurationOptions.new([]))
+    end
+
+    context "when given an array as the first arg" do
+      it 'parses it into configuration options' do
+        cl = CommandLine.new(%w[ --require foo ])
+        options = cl.instance_eval { @options }
+        expect(options.options).to include(:requires => ['foo'])
+      end
+
+      it 'issues a deprecation about the array arg' do
+        expect_deprecation_with_call_site(__FILE__, __LINE__ + 1, /array/)
+        CommandLine.new(%w[ --require foo ])
+      end
+    end
+  end
 end