rspec-core 2.5.2 → 2.6.0.rc2

data/spec/autotest/failed_results_re_spec.rb

@@ -19,7 +19,7 @@ describe "failed_results_re for autotest" do
     it "matches a failure" do
       re = Autotest::Rspec2.new.failed_results_re
       example_output.should =~ re
-      example_output[re, 2].should == __FILE__.sub(File.expand_path('.'),'.')
+      example_output.should include(__FILE__.sub(File.expand_path('.'),'.'))
     end
   end
 
@@ -31,7 +31,7 @@ describe "failed_results_re for autotest" do
     it "matches a failure" do
       re = Autotest::Rspec2.new.failed_results_re
       example_output.should =~ re
-      example_output[re, 2].should == __FILE__.sub(File.expand_path('.'),'.')
+      example_output.should include(__FILE__.sub(File.expand_path('.'),'.'))
     end
   end
 end

data/spec/rspec/core/command_line_spec.rb

@@ -50,8 +50,6 @@ module RSpec::Core
         config.stub(:run_hook)
 
         config.should_receive(:load_spec_files)
-        config.should_receive(:configure_mock_framework)
-        config.should_receive(:configure_expectation_framework)
 
         world.should_receive(:announce_inclusion_filter)
         world.should_receive(:announce_exclusion_filter)

data/spec/rspec/core/configuration_spec.rb

@@ -5,7 +5,7 @@ module RSpec::Core
 
   describe Configuration do
 
-    let(:config) { subject }
+    let(:config) { Configuration.new }
 
     describe "#load_spec_files" do
 
@@ -30,6 +30,17 @@ module RSpec::Core
       end
     end
 
+    describe "#treat_symbols_as_metadata_keys_with_true_values?" do
+      it 'defaults to false' do
+        config.treat_symbols_as_metadata_keys_with_true_values?.should be_false
+      end
+
+      it 'can be set to true' do
+        config.treat_symbols_as_metadata_keys_with_true_values = true
+        config.treat_symbols_as_metadata_keys_with_true_values?.should be_true
+      end
+    end
+
     describe "#mock_framework" do
       it "defaults to :rspec" do
         config.should_receive(:require).with('rspec/core/mocking/with_rspec')
@@ -100,6 +111,38 @@ module RSpec::Core
       end
     end
 
+    describe "#expecting_with_rspec?" do
+      before(:each) do
+        # prevent minitest assertions from being required and included,
+        # as that causes problems in some of our specs.
+        config.stub(:require)
+      end
+
+      it "returns false by default" do
+        config.should_not be_expecting_with_rspec
+      end
+
+      it "returns true when `expect_with :rspec` has been configured" do
+        config.expect_with :rspec
+        config.should be_expecting_with_rspec
+      end
+
+      it "returns true when `expect_with :rspec, :stdlib` has been configured" do
+        config.expect_with :rspec, :stdlib
+        config.should be_expecting_with_rspec
+      end
+
+      it "returns true when `expect_with :stdlib, :rspec` has been configured" do
+        config.expect_with :stdlib, :rspec
+        config.should be_expecting_with_rspec
+      end
+
+      it "returns false when `expect_with :stdlib` has been configured" do
+        config.expect_with :stdlib
+        config.should_not be_expecting_with_rspec
+      end
+    end
+
     context "setting the files to run" do
 
       it "loads files not following pattern if named explicitly" do
@@ -205,6 +248,13 @@ module RSpec::Core
         end
       end
 
+      it_behaves_like "metadata hash builder" do
+        def metadata_hash(*args)
+          config.include(InstanceLevelMethods, *args)
+          config.include_or_extend_modules.last.last
+        end
+      end
+
       context "with no filter" do
         it "includes the given module into each example group" do
           RSpec.configure do |c|
@@ -238,6 +288,13 @@ module RSpec::Core
         end
       end
 
+      it_behaves_like "metadata hash builder" do
+        def metadata_hash(*args)
+          config.extend(ThatThingISentYou, *args)
+          config.include_or_extend_modules.last.last
+        end
+      end
+
       it "extends the given module into each matching example group" do
         RSpec.configure do |c|
           c.extend(ThatThingISentYou, :magic_key => :extend)
@@ -421,6 +478,13 @@ module RSpec::Core
     end
 
     describe "#filter_run" do
+      it_behaves_like "metadata hash builder" do
+        def metadata_hash(*args)
+          config.filter_run *args
+          config.filter
+        end
+      end
+
       it "sets the filter" do
         config.filter_run :focus => true
         config.filter[:focus].should == true
@@ -454,6 +518,13 @@ module RSpec::Core
     end
 
     describe "#filter_run_excluding" do
+      it_behaves_like "metadata hash builder" do
+        def metadata_hash(*args)
+          config.filter_run_excluding *args
+          config.exclusion_filter
+        end
+      end
+
       it "sets the filter" do
         config.filter_run_excluding :slow => true
         config.exclusion_filter[:slow].should == true
@@ -712,5 +783,17 @@ module RSpec::Core
         group.included_modules.should include(mod2)
       end
     end
+
+    describe "#alias_example_to" do
+      it_behaves_like "metadata hash builder" do
+        def metadata_hash(*args)
+          config.alias_example_to :my_example, *args
+          group = ExampleGroup.describe("group")
+          example = group.my_example("description")
+          example.metadata
+        end
+      end
+    end
+
   end
 end

data/spec/rspec/core/deprecations_spec.rb

@@ -11,6 +11,16 @@ describe "deprecations" do
       RSpec.stub(:warn_deprecation)
       Spec.should == RSpec
     end
+
+    it "doesn't include backward compatibility in const_missing backtrace" do
+      RSpec.stub(:warn_deprecation)
+      exception = nil
+      begin
+        ConstantThatDoesNotExist
+      rescue Exception => exception
+      end
+      exception.backtrace.find { |l| l =~ /lib\/rspec\/core\/backward_compatibility/ }.should be_nil
+    end
   end
 
   describe RSpec::Core::ExampleGroup do
@@ -41,5 +51,16 @@ describe "deprecations" do
       RSpec.should_receive(:deprecate)
       Spec::Rake::SpecTask
     end
+
+    it "doesn't include backward compatibility in const_missing backtrace" do
+      RSpec.stub(:warn_deprecation)
+      exception = nil
+      begin
+        Spec::Rake::ConstantThatDoesNotExist
+      rescue Exception => exception
+      end
+      exception.backtrace.find { |l| l =~ /lib\/rspec\/core\/backward_compatibility/ }.should be_nil
+    end
   end
+
 end

data/spec/rspec/core/drb_command_line_spec.rb

@@ -20,16 +20,8 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
   end
 
   context "without server running" do
-    it "prints error" do
-      run_with []
-
-      err.rewind
-      err.read.should =~ /No DRb server is running/
-    end
-
-    it "returns false" do
-      result = run_with []
-      result.should be_false
+    it "raises an error" do
+      lambda { run_with [] }.should raise_error(DRb::DRbConnError)
     end
   end
 
@@ -136,7 +128,7 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
     it "integrates via Runner.new.run" do
       err, out = StringIO.new, StringIO.new
       result = RSpec::Core::Runner.run(%W[ --drb --drb-port #{@drb_port} #{dummy_spec_filename}], err, out)
-      result.should be_true
+      result.should be_false
     end
 
     def run_spec_via_druby

data/spec/rspec/core/example_group_spec.rb

@@ -13,6 +13,44 @@ end
 module RSpec::Core
 
   describe ExampleGroup do
+    it_behaves_like "metadata hash builder" do
+      def metadata_hash(*args)
+        group = ExampleGroup.describe('example description', *args)
+        group.metadata
+      end
+    end
+
+    context 'when RSpec.configuration.treat_symbols_as_metadata_keys_with_true_values is set to false' do
+      before(:each) do
+        RSpec.configure { |c| c.treat_symbols_as_metadata_keys_with_true_values = false }
+        Kernel.stub(:warn)
+      end
+
+      it 'processes string args as part of the description' do
+        group = ExampleGroup.describe("some", "separate", "strings")
+        group.description.should == "some separate strings"
+      end
+
+      it 'processes symbol args as part of the description' do
+        group = ExampleGroup.describe(:some, :separate, :symbols)
+        group.description.should == "some separate symbols"
+      end
+    end
+
+    context 'when RSpec.configuration.treat_symbols_as_metadata_keys_with_true_values is set to true' do
+      let(:group) { ExampleGroup.describe(:symbol) }
+      before(:each) do
+        RSpec.configure { |c| c.treat_symbols_as_metadata_keys_with_true_values = true }
+      end
+
+      it 'does not treat the first argument as a metadata key even if it is a symbol' do
+        group.metadata.should_not include(:symbol)
+      end
+
+      it 'treats the first argument as part of the description when it is a symbol' do
+        group.description.should == "symbol"
+      end
+    end
 
     describe "top level group" do
       it "runs its children" do
@@ -81,49 +119,119 @@ module RSpec::Core
     describe "filtering" do
       let(:world) { World.new }
 
-      it "includes all examples in an explicitly included group" do
-        world.stub(:inclusion_filter).and_return({ :awesome => true })
-        group = ExampleGroup.describe("does something", :awesome => true)
-        group.stub(:world) { world }
+      shared_examples "matching filters" do
+        context "inclusion" do
+          before { world.stub(:inclusion_filter).and_return(filter_metadata) }
 
-        examples = [
-          group.example("first"),
-          group.example("second")
-        ]
-        group.filtered_examples.should == examples
+          it "includes examples in groups matching filter" do
+            group = ExampleGroup.describe("does something", spec_metadata)
+            group.stub(:world) { world }
+            all_examples = [ group.example("first"), group.example("second") ]
+
+            group.filtered_examples.should == all_examples
+          end
+
+          it "includes examples directly matching filter" do
+            group = ExampleGroup.describe("does something")
+            group.stub(:world) { world }
+            filtered_examples = [
+              group.example("first", spec_metadata),
+              group.example("second", spec_metadata)
+            ]
+            group.example("third (not-filtered)")
+
+            group.filtered_examples.should == filtered_examples
+          end
+        end
+
+        context "exclusion" do
+          before { world.stub(:exclusion_filter).and_return(filter_metadata) }
+          it "excludes examples in groups matching filter" do
+            group = ExampleGroup.describe("does something", spec_metadata)
+            group.stub(:world) { world }
+            all_examples = [ group.example("first"), group.example("second") ]
+
+            group.filtered_examples.should be_empty
+          end
+
+          it "excludes examples directly matching filter" do
+            group = ExampleGroup.describe("does something")
+            group.stub(:world) { world }
+            filtered_examples = [
+              group.example("first", spec_metadata),
+              group.example("second", spec_metadata)
+            ]
+            unfiltered_example = group.example("third (not-filtered)")
+
+            group.filtered_examples.should == [unfiltered_example]
+          end
+        end
       end
 
-      it "includes explicitly included examples" do
-        world.stub(:inclusion_filter).and_return({ :include_me => true })
-        group = ExampleGroup.describe
-        group.stub(:world) { world }
-        example = group.example("does something", :include_me => true)
-        group.example("don't run me")
-        group.filtered_examples.should == [example]
+      context "matching false" do
+        let(:spec_metadata)    { { :awesome => false }}
+
+        context "against false" do
+          let(:filter_metadata)  { { :awesome => false }}
+          include_examples "matching filters"
+        end
+
+        context "against 'false'" do
+          let(:filter_metadata)  { { :awesome => 'false' }}
+          include_examples "matching filters"
+        end
+
+        context "against :false" do
+          let(:filter_metadata)  { { :awesome => :false }}
+          include_examples "matching filters"
+        end
       end
 
-      it "excludes all examples in an excluded group" do
-        world.stub(:exclusion_filter).and_return({ :include_me => false })
-        group = ExampleGroup.describe("does something", :include_me => false)
-        group.stub(:world) { world }
+      context "matching true" do
+        let(:spec_metadata)    { { :awesome => true }}
 
-        examples = [
-          group.example("first"),
-          group.example("second")
-        ]
-        group.filtered_examples.should == []
+        context "against true" do
+          let(:filter_metadata)  { { :awesome => true }}
+          include_examples "matching filters"
+        end
+
+        context "against 'true'" do
+          let(:filter_metadata)  { { :awesome => 'true' }}
+          include_examples "matching filters"
+        end
+
+        context "against :true" do
+          let(:filter_metadata)  { { :awesome => :true }}
+          include_examples "matching filters"
+        end
       end
 
-      it "filters out excluded examples" do
-        world.stub(:exclusion_filter).and_return({ :exclude_me => true })
-        group = ExampleGroup.describe("does something")
-        group.stub(:world) { world }
+      context "matching a string" do
+        let(:spec_metadata)    { { :type => 'special' }}
 
-        examples = [
-          group.example("first", :exclude_me => true),
-          group.example("second")
-        ]
-        group.filtered_examples.should == [examples[1]]
+        context "against a string" do
+          let(:filter_metadata)  { { :type => 'special' }}
+          include_examples "matching filters"
+        end
+
+        context "against a symbol" do
+          let(:filter_metadata)  { { :type => :special }}
+          include_examples "matching filters"
+        end
+      end
+
+      context "matching a symbol" do
+        let(:spec_metadata)    { { :type => :special }}
+
+        context "against a string" do
+          let(:filter_metadata)  { { :type => 'special' }}
+          include_examples "matching filters"
+        end
+
+        context "against a symbol" do
+          let(:filter_metadata)  { { :type => :special }}
+          include_examples "matching filters"
+        end
       end
 
       context "with no filters" do
@@ -189,8 +297,6 @@ module RSpec::Core
           group.run.should be_true, "expected examples in group to pass"
         end
       end
-
-
     end
 
     describe '#described_class' do
@@ -200,16 +306,13 @@ module RSpec::Core
     end
 
     describe '#description' do
-
       it "grabs the description from the metadata" do
         group = ExampleGroup.describe(Object, "my desc") { }
         group.description.should == group.metadata[:example_group][:description]
       end
-
     end
 
     describe '#metadata' do
-
       it "adds the third parameter to the metadata" do
         ExampleGroup.describe(Object, nil, 'foo' => 'bar') { }.metadata.should include({ "foo" => 'bar' })
       end
@@ -225,7 +328,6 @@ module RSpec::Core
       it "adds the line_number to metadata" do
         ExampleGroup.describe(Object) { }.metadata[:example_group][:line_number].should == __LINE__
       end
-
     end
 
     [:focus, :focused].each do |example_alias|
@@ -244,7 +346,6 @@ module RSpec::Core
     end
 
     describe "#before, after, and around hooks" do
-
       it "runs the before alls in order" do
         group = ExampleGroup.describe
         order = []
@@ -255,7 +356,7 @@ module RSpec::Core
 
         group.run
 
-        order.should == [1,2,3]
+        order.should eq([1,2,3])
       end
 
       it "runs the before eachs in order" do
@@ -268,7 +369,7 @@ module RSpec::Core
 
         group.run
 
-        order.should == [1,2,3]
+        order.should eq([1,2,3])
       end
 
       it "runs the after eachs in reverse order" do
@@ -281,7 +382,7 @@ module RSpec::Core
 
         group.run
 
-        order.should == [3,2,1]
+        order.should eq([3,2,1])
       end
 
       it "runs the after alls in reverse order" do
@@ -294,7 +395,7 @@ module RSpec::Core
 
         group.run
 
-        order.should == [3,2,1]
+        order.should eq([3,2,1])
       end
 
       it "only runs before/after(:all) hooks from example groups that have specs that run" do
@@ -325,7 +426,7 @@ module RSpec::Core
         unfiltered_group.run
         filtered_group.run
 
-        hooks_run.should == [:filtered_before_all, :filtered_after_all]
+        hooks_run.should eq([:filtered_before_all, :filtered_after_all])
       end
 
       it "runs before_all_defined_in_config, before all, before each, example, after each, after all, after_all_defined_in_config in that order" do
@@ -372,22 +473,44 @@ module RSpec::Core
         ]
       end
 
-      it "accesses before(:all) state in after(:all)" do
-        group = ExampleGroup.describe
-        group.before(:all) { @ivar = "value" }
-        group.after(:all)  { @ivar.should eq("value") }
-        group.example("ignore") {  }
+      context "after(:all)" do
+        let(:outer) { ExampleGroup.describe }
+        let(:inner) { outer.describe }
 
-        expect do
-          group.run
-        end.to_not raise_error
+        it "has access to state defined before(:all)" do
+          outer.before(:all) { @outer = "outer" }
+          inner.before(:all) { @inner = "inner" }
+
+          outer.after(:all) do
+            @outer.should eq("outer")
+            @inner.should eq("inner")
+          end
+          inner.after(:all) do
+            @inner.should eq("inner")
+            @outer.should eq("outer")
+          end
+
+          outer.run
+        end
+
+        it "cleans up ivars in after(:all)" do
+          outer.before(:all) { @outer = "outer" }
+          inner.before(:all) { @inner = "inner" }
+
+          outer.run
+
+          inner.before_all_ivars[:@inner].should be_nil
+          inner.before_all_ivars[:@outer].should be_nil
+          outer.before_all_ivars[:@inner].should be_nil
+          outer.before_all_ivars[:@outer].should be_nil
+        end
       end
 
       it "treats an error in before(:each) as a failure" do
         group = ExampleGroup.describe
         group.before(:each) { raise "error in before each" }
         example = group.example("equality") { 1.should == 2}
-        group.run
+        group.run.should == false
 
         example.metadata[:execution_result][:exception].message.should == "error in before each"
       end
@@ -396,7 +519,7 @@ module RSpec::Core
         group = ExampleGroup.describe
         group.before(:all) { raise "error in before all" }
         example = group.example("equality") { 1.should == 2}
-        group.run
+        group.run.should == false
 
         example.metadata.should_not be_nil
         example.metadata[:execution_result].should_not be_nil
@@ -749,5 +872,39 @@ module RSpec::Core
       end
     end
 
+    describe "#include_context" do
+      before do
+        shared_context "named this" do
+          def foo; 'foo'; end
+        end
+      end
+
+      it "includes the named context" do
+        group = ExampleGroup.describe do
+          include_context "named this"
+          it "accesses foo" do
+            foo.should eq('foo')
+          end
+        end
+        group.run.should be_true
+      end
+    end
+
+    describe "#include_examples" do
+      before do
+        shared_examples "named this" do
+          example("does something") do
+          end
+        end
+      end
+
+      it "includes the named examples" do
+        group = ExampleGroup.describe do
+          include_examples "named this"
+        end
+        group.examples.first.description.should eq("does something")
+      end
+    end
+
   end
 end