rspec-core 3.0.0.beta1 → 3.0.0.beta2

data/spec/rspec/core/resources/formatter_specs.rb

@@ -1,40 +1,38 @@
 # Deliberately named _specs.rb to avoid being loaded except when specified
 
-describe "pending spec with no implementation" do
+RSpec.describe "pending spec with no implementation" do
   it "is pending"
 end
 
-describe "pending command with block format" do
+RSpec.describe "pending command with block format" do
   context "with content that would fail" do
     it "is pending" do
-      pending do
-        expect(1).to eq(2)
-      end
+      pending
+      expect(1).to eq(2)
     end
   end
 
   context "with content that would pass" do
     it "fails" do
-      pending do
-        expect(1).to eq(1)
-      end
+      pending
+      expect(1).to eq(1)
     end
   end
 end
 
-describe "passing spec" do
+RSpec.describe "passing spec" do
   it "passes" do
     expect(1).to eq(1)
   end
 end
 
-describe "failing spec" do
+RSpec.describe "failing spec" do
   it "fails" do
     expect(1).to eq(2)
   end
 end
 
-describe "a failing spec with odd backtraces" do
+RSpec.describe "a failing spec with odd backtraces" do
   it "fails with a backtrace that has no file" do
     require 'erb'
 

data/spec/rspec/core/rspec_matchers_spec.rb

@@ -14,7 +14,7 @@ module RSpec::Matchers
     c.include ModThatIncludesMatchers, :include_mod_that_includes_rspec_matchers => true
   end
 
-  describe self do
+  RSpec.describe self do
     shared_examples_for "a normal module with a method that supers" do
       it "raises the expected error (and not SystemStackError)" do
         expect { __method_with_super }.to raise_error(NoMethodError) # there is no __method_with_super in an ancestor

data/spec/rspec/core/ruby_project_spec.rb

@@ -2,20 +2,20 @@ require 'spec_helper'
 
 module RSpec
   module Core
-    describe RubyProject do
+    RSpec.describe RubyProject do
 
       describe "#determine_root" do
 
         context "with ancestor containing spec directory" do
           it "returns ancestor containing the spec directory" do
-            RubyProject.stub(:ascend_until).and_return('foodir')
+            allow(RubyProject).to receive(:ascend_until).and_return('foodir')
             expect(RubyProject.determine_root).to eq("foodir")
           end
         end
 
         context "without ancestor containing spec directory" do
           it "returns current working directory" do
-            RubyProject.stub(:find_first_parent_containing).and_return(nil)
+            allow(RubyProject).to receive(:find_first_parent_containing).and_return(nil)
             expect(RubyProject.determine_root).to eq(".")
           end
         end

data/spec/rspec/core/runner_spec.rb

@@ -2,27 +2,47 @@ require 'spec_helper'
 require 'rspec/core/drb_command_line'
 
 module RSpec::Core
-  describe Runner do
+  RSpec.describe Runner do
+    describe 'invocation' do
+      before do
+        # Simulate invoking the suite like exe/rspec does.
+        allow(RSpec::Core::Runner).to receive(:run)
+        RSpec::Core::Runner.invoke
+      end
+
+      it 'does not autorun after having been invoked' do
+        expect(RSpec::Core::Runner).not_to receive(:at_exit)
+        RSpec::Core::Runner.autorun
+      end
+
+      it 'prints a warning when autorun is attempted' do
+        expect_deprecation_with_call_site(__FILE__, __LINE__ + 1)
+        RSpec::Core::Runner.autorun
+      end
+    end
+
     describe 'at_exit' do
       it 'sets an at_exit hook if none is already set' do
-        RSpec::Core::Runner.stub(:installed_at_exit?).and_return(false)
-        RSpec::Core::Runner.stub(:running_in_drb?).and_return(false)
-        RSpec::Core::Runner.stub(:at_exit_hook_disabled?).and_return(false)
-        RSpec::Core::Runner.stub(:run).and_return(-1)
-        RSpec::Core::Runner.should_receive(:at_exit)
+        allow(RSpec::Core::Runner).to receive(:autorun_disabled?).and_return(false)
+        allow(RSpec::Core::Runner).to receive(:installed_at_exit?).and_return(false)
+        allow(RSpec::Core::Runner).to receive(:running_in_drb?).and_return(false)
+        allow(RSpec::Core::Runner).to receive(:invoke)
+        expect(RSpec::Core::Runner).to receive(:at_exit)
         RSpec::Core::Runner.autorun
       end
 
       it 'does not set the at_exit hook if it is already set' do
-        RSpec::Core::Runner.stub(:installed_at_exit?).and_return(true)
-        RSpec::Core::Runner.stub(:running_in_drb?).and_return(false)
-        RSpec::Core::Runner.stub(:at_exit_hook_disabled?).and_return(false)
-        RSpec::Core::Runner.should_receive(:at_exit).never
+        allow(RSpec::Core::Runner).to receive(:autorun_disabled?).and_return(false)
+        allow(RSpec::Core::Runner).to receive(:installed_at_exit?).and_return(true)
+        allow(RSpec::Core::Runner).to receive(:running_in_drb?).and_return(false)
+        expect(RSpec::Core::Runner).to receive(:at_exit).never
         RSpec::Core::Runner.autorun
       end
     end
 
-    describe "#running_in_drb?" do
+    # This is intermittently slow because this method calls out to the network
+    # interface.
+    describe "#running_in_drb?", :slow do
       it "returns true if drb server is started with 127.0.0.1" do
         allow(::DRb).to receive(:current_server).and_return(double(:uri => "druby://127.0.0.1:0000/"))
 
@@ -43,27 +63,49 @@ module RSpec::Core
       end
 
       it "returns false if no drb server is running" do
-        ::DRb.stub(:current_server).and_raise(::DRb::DRbServerNotFound)
+        allow(::DRb).to receive(:current_server).and_raise(::DRb::DRbServerNotFound)
 
         expect(RSpec::Core::Runner.running_in_drb?).to be_falsey
       end
     end
 
+    describe "#invoke" do
+      let(:runner) { RSpec::Core::Runner }
+
+      it "runs the specs via #run" do
+        allow(runner).to receive(:exit)
+        expect(runner).to receive(:run)
+        runner.invoke
+      end
+
+      it "doesn't exit on success" do
+        allow(runner).to receive(:run) { 0 }
+        expect(runner).to_not receive(:exit)
+        runner.invoke
+      end
+
+      it "exits with #run's status on failure" do
+        allow(runner).to receive(:run) { 123 }
+        expect(runner).to receive(:exit).with(123)
+        runner.invoke
+      end
+    end
+
     describe "#run" do
       let(:err) { StringIO.new }
       let(:out) { StringIO.new }
 
       it "tells RSpec to reset" do
-        CommandLine.stub(:new => double.as_null_object)
-        RSpec.configuration.stub(:files_to_run => [], :warn => nil)
-        RSpec.should_receive(:reset)
+        allow(CommandLine).to receive_messages(:new => double.as_null_object)
+        allow(RSpec.configuration).to receive_messages(:files_to_run => [], :warn => nil)
+        expect(RSpec).to receive(:reset)
         RSpec::Core::Runner.run([], err, out)
       end
 
       context "with --drb or -X" do
         before(:each) do
           @options = RSpec::Core::ConfigurationOptions.new(%w[--drb --drb-port 8181 --color])
-          RSpec::Core::ConfigurationOptions.stub(:new) { @options }
+          allow(RSpec::Core::ConfigurationOptions).to receive(:new) { @options }
         end
 
         def run_specs
@@ -73,9 +115,9 @@ module RSpec::Core
         context 'and a DRb server is running' do
           it "builds a DRbCommandLine and runs the specs" do
             drb_proxy = double(RSpec::Core::DRbCommandLine, :run => true)
-            drb_proxy.should_receive(:run).with(err, out)
+            expect(drb_proxy).to receive(:run).with(err, out)
 
-            RSpec::Core::DRbCommandLine.should_receive(:new).and_return(drb_proxy)
+            expect(RSpec::Core::DRbCommandLine).to receive(:new).and_return(drb_proxy)
 
             run_specs
           end
@@ -83,12 +125,12 @@ module RSpec::Core
 
         context 'and a DRb server is not running' do
           before(:each) do
-            RSpec::Core::DRbCommandLine.should_receive(:new).and_raise(DRb::DRbConnError)
+            expect(RSpec::Core::DRbCommandLine).to receive(:new).and_raise(DRb::DRbConnError)
           end
 
           it "outputs a message" do
-            RSpec.configuration.stub(:files_to_run) { [] }
-            err.should_receive(:puts).with(
+            allow(RSpec.configuration).to receive(:files_to_run) { [] }
+            expect(err).to receive(:puts).with(
               "No DRb server is running. Running in local process instead ..."
             )
             run_specs
@@ -96,9 +138,9 @@ module RSpec::Core
 
           it "builds a CommandLine and runs the specs" do
             process_proxy = double(RSpec::Core::CommandLine, :run => 0)
-            process_proxy.should_receive(:run).with(err, out)
+            expect(process_proxy).to receive(:run).with(err, out)
 
-            RSpec::Core::CommandLine.should_receive(:new).and_return(process_proxy)
+            expect(RSpec::Core::CommandLine).to receive(:new).and_return(process_proxy)
 
             run_specs
           end

data/spec/rspec/core/shared_context_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe RSpec::SharedContext do
+RSpec.describe RSpec::SharedContext do
   it "is accessible as RSpec::Core::SharedContext" do
     RSpec::Core::SharedContext
   end
@@ -42,11 +42,11 @@ describe RSpec::SharedContext do
       c.before(:each) { ordered_hooks << "config" }
     end
 
-    shared_context("before each stuff", :example => :before_each_hook_order) do
+    RSpec.shared_context("before each stuff", :example => :before_each_hook_order) do
       before(:each) { ordered_hooks << "shared_context"}
     end
 
-    group = RSpec::Core::ExampleGroup.describe :example => :before_each_hook_order do
+    group = RSpec.describe :example => :before_each_hook_order do
       before(:each) { ordered_hooks << "example_group" }
       example {}
     end
@@ -61,7 +61,7 @@ describe RSpec::SharedContext do
       extend RSpec::SharedContext
       let(:foo) { 'foo' }
     end
-    group = RSpec::Core::ExampleGroup.describe do
+    group = RSpec.describe do
       include shared
     end
 

data/spec/rspec/core/shared_example_group/collection_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 module RSpec::Core::SharedExampleGroup
-  describe Collection do
+  RSpec.describe Collection do
 
     # this represents:
     #

data/spec/rspec/core/shared_example_group_spec.rb

@@ -1,13 +1,15 @@
 require 'spec_helper'
+require 'rspec/support/spec/in_sub_process'
 
 module RandomTopLevelModule
   def self.setup!
-    shared_examples_for("top level in module") {}
+    RSpec.shared_examples_for("top level in module") {}
   end
 end
 
 module RSpec::Core
-  describe SharedExampleGroup do
+  RSpec.describe SharedExampleGroup do
+    include RSpec::Support::InSubProcess
 
     ExampleModule = Module.new
     ExampleClass = Class.new
@@ -18,7 +20,7 @@ module RSpec::Core
     end
 
     module SharedExampleGroup
-      describe Registry do
+      RSpec.describe Registry do
         it "can safely be reset when there aren't any shared groups" do
           expect { Registry.new.clear }.to_not raise_error
         end
@@ -38,8 +40,15 @@ module RSpec::Core
           group.send(shared_method_name, *args, &block)
         end
 
-        it "is exposed to the global namespace" do
-          expect(Kernel).to respond_to(shared_method_name)
+        it "is exposed to the global namespace when expose_dsl_globally is enabled" do
+          in_sub_process do
+            RSpec.configuration.expose_dsl_globally = true
+            expect(Kernel).to respond_to(shared_method_name)
+          end
+        end
+
+        it "is not exposed to the global namespace when monkey patching is disabled" do
+          expect(Kernel).to_not respond_to(shared_method_name)
         end
 
         it "displays a warning when adding a second shared example group with the same name" do
@@ -72,12 +81,12 @@ module RSpec::Core
         end
 
         context "given a hash" do
-          it "delegates extend on configuration" do
+          it "delegates include on configuration" do
             implementation = Proc.new { def bar; 'bar'; end }
             define_shared_group(:foo => :bar, &implementation)
             a = RSpec.configuration.include_or_extend_modules.first
-            expect(a[0]).to eq(:extend)
-            expect(Class.new.extend(a[1]).new.bar).to eq('bar')
+            expect(a[0]).to eq(:include)
+            expect(Class.new.send(:include, a[1]).new.bar).to eq('bar')
             expect(a[2]).to eq(:foo => :bar)
           end
         end
@@ -89,12 +98,12 @@ module RSpec::Core
             expect(SharedExampleGroup.registry.shared_example_groups[group]["name"]).to eq implementation
           end
 
-          it "delegates extend on configuration" do
+          it "delegates include on configuration" do
             implementation = Proc.new { def bar; 'bar'; end }
             define_shared_group("name", :foo => :bar, &implementation)
             a = RSpec.configuration.include_or_extend_modules.first
-            expect(a[0]).to eq(:extend)
-            expect(Class.new.extend(a[1]).new.bar).to eq('bar')
+            expect(a[0]).to eq(:include)
+            expect(Class.new.send(:include, a[1]).new.bar).to eq('bar')
             expect(a[2]).to eq(:foo => :bar)
           end
         end

data/spec/rspec/core/warnings_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe "RSpec deprecations and warnings" do
+RSpec.describe "rspec warnings and deprecations" do
 
   describe "#deprecate" do
     it "passes the hash to the reporter" do

data/spec/rspec/core/world_spec.rb

@@ -5,7 +5,7 @@ class Foo; end
 
 module RSpec::Core
 
-  describe RSpec::Core::World do
+  RSpec.describe RSpec::Core::World do
     let(:configuration) { RSpec::Core::Configuration.new }
     let(:world) { RSpec::Core::World.new(configuration) }
 
@@ -85,14 +85,14 @@ module RSpec::Core
 
     describe "#announce_filters" do
       let(:reporter) { double('reporter').as_null_object }
-      before { world.stub(:reporter) { reporter } }
+      before { allow(world).to receive(:reporter) { reporter } }
 
       context "with no examples" do
-        before { world.stub(:example_count) { 0 } }
+        before { allow(world).to receive(:example_count) { 0 } }
 
         context "with no filters" do
           it "announces" do
-            reporter.should_receive(:message).
+            expect(reporter).to receive(:message).
               with("No examples found.")
             world.announce_filters
           end
@@ -101,7 +101,7 @@ module RSpec::Core
         context "with an inclusion filter" do
           it "announces" do
             configuration.filter_run_including :foo => 'bar'
-            reporter.should_receive(:message).
+            expect(reporter).to receive(:message).
               with(/All examples were filtered out/)
             world.announce_filters
           end
@@ -109,9 +109,9 @@ module RSpec::Core
 
         context "with an inclusion filter and run_all_when_everything_filtered" do
           it "announces" do
-            configuration.stub(:run_all_when_everything_filtered?) { true }
+            allow(configuration).to receive(:run_all_when_everything_filtered?) { true }
             configuration.filter_run_including :foo => 'bar'
-            reporter.should_receive(:message).
+            expect(reporter).to receive(:message).
               with(/All examples were filtered out/)
             world.announce_filters
           end
@@ -120,7 +120,7 @@ module RSpec::Core
         context "with an exclusion filter" do
           it "announces" do
             configuration.filter_run_excluding :foo => 'bar'
-            reporter.should_receive(:message).
+            expect(reporter).to receive(:message).
               with(/All examples were filtered out/)
             world.announce_filters
           end
@@ -128,11 +128,11 @@ module RSpec::Core
       end
 
       context "with examples" do
-        before { world.stub(:example_count) { 1 } }
+        before { allow(world).to receive(:example_count) { 1 } }
 
         context "with no filters" do
           it "does not announce" do
-            reporter.should_not_receive(:message)
+            expect(reporter).not_to receive(:message)
             world.announce_filters
           end
         end

data/spec/rspec/core_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe RSpec do
+RSpec.describe RSpec do
   describe "::configuration" do
     it "returns the same object every time" do
       expect(RSpec.configuration).to equal(RSpec.configuration)
@@ -72,7 +72,7 @@ describe RSpec do
 
   # This is hard to test :(. Best way I could come up with was starting
   # fresh ruby process w/o this stuff already loaded.
-  it "loads mocks and expectations when the constants are referenced" do
+  it "loads mocks and expectations when the constants are referenced", :slow do
     code = "$LOAD_PATH.replace(#{$LOAD_PATH.inspect}); " +
            'require "rspec"; ' +
            "puts RSpec::Mocks.name; " +

data/spec/spec_helper.rb

@@ -15,18 +15,14 @@ rescue LoadError
 end
 
 Spork.prefork do
-  old_verbose, $VERBOSE = $VERBOSE, false
-  if ENV['TRAVIS'] && !ENV['NO_COVERALLS']
-    require 'simplecov' if RUBY_VERSION.to_f > 1.8
-    require 'coveralls'
-    Coveralls.wear! do
-      add_filter '/bundle/'
-      add_filter '/spec/'
-      add_filter '/tmp/'
+  require 'rspec/support/spec'
+
+  module ArubaLoader
+    extend RSpec::Support::WithIsolatedStdErr
+    with_isolated_stderr do
+      require 'aruba/api'
     end
   end
-  require 'aruba/api'
-  $VERBOSE = old_verbose
 
   if RUBY_PLATFORM == 'java'
     # Works around https://jira.codehaus.org/browse/JRUBY-5678
@@ -49,8 +45,6 @@ Spork.prefork do
 
   Dir['./spec/support/**/*.rb'].map {|f| require f}
 
-  $stderr = RSpec::StdErrSplitter.new
-
   class NullObject
     private
     def method_missing(method, *args, &block)
@@ -64,6 +58,7 @@ Spork.prefork do
       @orig_world  = RSpec.world
       @orig_example = RSpec.current_example
       new_config = RSpec::Core::Configuration.new
+      new_config.expose_dsl_globally = false
       new_world  = RSpec::Core::World.new(new_config)
       RSpec.configuration = new_config
       RSpec.world = new_world
@@ -78,7 +73,7 @@ Spork.prefork do
         end
       end
 
-      RSpec::Core::SandboxedMockSpace.sandboxed do
+      RSpec::Mocks.with_temporary_scope do
         object.instance_eval(&block)
       end
     ensure
@@ -122,8 +117,6 @@ Spork.prefork do
     end
   end
 
-  require 'rspec/support/spec'
-
   RSpec.configure do |c|
     # structural
     c.alias_it_behaves_like_to 'it_has_behavior'
@@ -133,22 +126,17 @@ Spork.prefork do
       :file_path => /spec\/command_line/
     }
 
-    # Use the doc formatter when running individual files.
-    # This is too verbose when running all spec files but
-    # is nice for a single file.
-    if c.files_to_run.one? && c.formatters.none?
-      c.formatter = 'doc'
-    end
-
     c.expect_with :rspec do |expectations|
       expectations.syntax = :expect
     end
 
+    c.mock_with :rspec do |mocks|
+      mocks.syntax = :expect
+    end
+
     # runtime options
     c.color = !in_editor?
-    c.filter_run :focus
     c.include EnvHelpers
-    c.run_all_when_everything_filtered = true
     c.filter_run_excluding :ruby => lambda {|version|
       case version.to_s
       when "!jruby"