rspec-core 2.5.1 → 2.6.0

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,16 +111,46 @@ module RSpec::Core
       end
     end
 
-    context "setting the files to run" do
+    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
+
+    describe "#files_to_run" do
       it "loads files not following pattern if named explicitly" do
         file = "./spec/rspec/core/resources/a_bar.rb"
         config.files_or_directories_to_run = file
         config.files_to_run.should == [file]
       end
 
-      describe "with default --pattern" do
-
+      context "with default pattern" do
         it "loads files named _spec.rb" do
           dir = "./spec/rspec/core/resources"
           config.files_or_directories_to_run = dir
@@ -121,80 +162,70 @@ module RSpec::Core
           config.files_or_directories_to_run = file
           config.files_to_run.should == [file]
         end
-
       end
+    end
 
-      describe "with explicit pattern (single)" do
+    %w[pattern= filename_pattern=].each do |setter|
+      describe "##{setter}" do
+        context "with single pattern" do
+          before { config.send(setter, "**/*_foo.rb") }
+          it "loads files following pattern" do
+            file = File.expand_path(File.dirname(__FILE__) + "/resources/a_foo.rb")
+            config.files_or_directories_to_run = file
+            config.files_to_run.should include(file)
+          end
 
-        before do
-          config.filename_pattern = "**/*_foo.rb"
-        end
+          it "loads files in directories following pattern" do
+            dir = File.expand_path(File.dirname(__FILE__) + "/resources")
+            config.files_or_directories_to_run = dir
+            config.files_to_run.should include("#{dir}/a_foo.rb")
+          end
 
-        it "loads files following pattern" do
-          file = File.expand_path(File.dirname(__FILE__) + "/resources/a_foo.rb")
-          config.files_or_directories_to_run = file
-          config.files_to_run.should include(file)
+          it "does not load files in directories not following pattern" do
+            dir = File.expand_path(File.dirname(__FILE__) + "/resources")
+            config.files_or_directories_to_run = dir
+            config.files_to_run.should_not include("#{dir}/a_bar.rb")
+          end
         end
 
-        it "loads files in directories following pattern" do
-          dir = File.expand_path(File.dirname(__FILE__) + "/resources")
-          config.files_or_directories_to_run = dir
-          config.files_to_run.should include("#{dir}/a_foo.rb")
-        end
+        context "with multiple patterns" do
+          it "supports comma separated values" do
+            config.send(setter, "**/*_foo.rb,**/*_bar.rb")
+            dir = File.expand_path(File.dirname(__FILE__) + "/resources")
+            config.files_or_directories_to_run = dir
+            config.files_to_run.should include("#{dir}/a_foo.rb")
+            config.files_to_run.should include("#{dir}/a_bar.rb")
+          end
 
-        it "does not load files in directories not following pattern" do
-          dir = File.expand_path(File.dirname(__FILE__) + "/resources")
-          config.files_or_directories_to_run = dir
-          config.files_to_run.should_not include("#{dir}/a_bar.rb")
+          it "supports comma separated values with spaces" do
+            config.send(setter, "**/*_foo.rb, **/*_bar.rb")
+            dir = File.expand_path(File.dirname(__FILE__) + "/resources")
+            config.files_or_directories_to_run = dir
+            config.files_to_run.should include("#{dir}/a_foo.rb")
+            config.files_to_run.should include("#{dir}/a_bar.rb")
+          end
         end
-
       end
+    end
 
-      context "with explicit pattern (comma,separated,values)" do
-
-        before do
-          config.filename_pattern = "**/*_foo.rb,**/*_bar.rb"
-        end
-
-        it "supports comma separated values" do
-          dir = File.expand_path(File.dirname(__FILE__) + "/resources")
-          config.files_or_directories_to_run = dir
-          config.files_to_run.should include("#{dir}/a_foo.rb")
-          config.files_to_run.should include("#{dir}/a_bar.rb")
-        end
-
-        it "supports comma separated values with spaces" do
-          dir = File.expand_path(File.dirname(__FILE__) + "/resources")
-          config.files_or_directories_to_run = dir
-          config.files_to_run.should include("#{dir}/a_foo.rb")
-          config.files_to_run.should include("#{dir}/a_bar.rb")
-        end
-
+    describe "path with line number" do
+      it "assigns the line number as the filter" do
+        config.files_or_directories_to_run = "path/to/a_spec.rb:37"
+        config.filter.should == {:line_number => 37}
       end
+    end
 
-      context "with line number" do
-
-        it "assigns the line number as the filter" do
-          config.files_or_directories_to_run = "path/to/a_spec.rb:37"
-          config.filter.should == {:line_number => 37}
-        end
-
+    context "with full_description" do
+      it "overrides :focused" do
+        config.filter_run :focused => true
+        config.full_description = "foo"
+        config.filter.should_not have_key(:focused)
       end
 
-      context "with full_description" do
-        it "overrides :focused" do
-          config.filter_run :focused => true
-          config.full_description = "foo"
-          config.filter.should_not have_key(:focused)
-        end
-
-        it "assigns the example name as the filter on description" do
-          config.full_description = "foo"
-          config.filter.should == {:full_description => /foo/}
-        end
-
+      it "assigns the example name as the filter on description" do
+        config.full_description = "foo"
+        config.filter.should == {:full_description => /foo/}
       end
-
     end
 
     describe "#include" do
@@ -205,6 +236,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 +276,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)
@@ -249,7 +294,7 @@ module RSpec::Core
 
     end
 
-    describe "run_all_when_everything_filtered?" do
+    describe "#run_all_when_everything_filtered?" do
 
       it "defaults to false" do
         config.run_all_when_everything_filtered?.should be_false
@@ -350,14 +395,14 @@ module RSpec::Core
       end
     end
 
-    describe 'formatter=' do
+    describe '#formatter=' do
       it "delegates to add_formatter (better API for user-facing configuration)" do
         config.should_receive(:add_formatter).with('these','options')
         config.add_formatter('these','options')
       end
     end
 
-    describe "add_formatter" do
+    describe "#add_formatter" do
 
       it "adds to the list of formatters" do
         config.add_formatter :documentation
@@ -421,6 +466,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 +506,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
@@ -502,7 +561,7 @@ module RSpec::Core
       end
     end
 
-    describe "line_number=" do
+    describe "#line_number=" do
       before { config.stub(:warn) }
 
       it "sets the line number" do
@@ -524,9 +583,18 @@ module RSpec::Core
     end
 
     describe "#full_backtrace=" do
-      it "clears the backtrace clean patterns" do
-        config.full_backtrace = true
-        config.backtrace_clean_patterns.should == []
+      context "given true" do
+        it "clears the backtrace clean patterns" do
+          config.full_backtrace = true
+          config.backtrace_clean_patterns.should == []
+        end
+      end
+
+      context "given false" do
+        it "restores backtrace clean patterns" do
+          config.full_backtrace = false
+          config.backtrace_clean_patterns.should == RSpec::Core::Configuration::DEFAULT_BACKTRACE_PATTERNS
+        end
       end
 
       it "doesn't impact other instances of config" do
@@ -712,5 +780,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

@@ -5,31 +5,25 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
   let(:out)    { StringIO.new }
   let(:err)    { StringIO.new }
 
+  include_context "spec files"
+
+  def command_line(args)
+    RSpec::Core::DRbCommandLine.new(config_options(args))
+  end
+
   def config_options(argv=[])
     options = RSpec::Core::ConfigurationOptions.new(argv)
     options.parse_options
     options
   end
 
-  def drb_command_line(args)
-    RSpec::Core::DRbCommandLine.new(config_options(args))
-  end
-
   def run_with(args)
-    drb_command_line(args).run(err, out)
+    command_line(args).run(err, out)
   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
 
@@ -47,14 +41,14 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
     context "without RSPEC_DRB environment variable set" do
       it "defaults to 8989" do
         with_RSPEC_DRB_set_to(nil) do
-          drb_command_line([]).drb_port.should == 8989
+          command_line([]).drb_port.should == 8989
         end
       end
 
       it "sets the DRb port" do
         with_RSPEC_DRB_set_to(nil) do
-          drb_command_line(["--drb-port", "1234"]).drb_port.should == 1234
-          drb_command_line(["--drb-port", "5678"]).drb_port.should == 5678
+          command_line(["--drb-port", "1234"]).drb_port.should == 1234
+          command_line(["--drb-port", "5678"]).drb_port.should == 5678
         end
       end
     end
@@ -64,7 +58,7 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       context "without config variable set" do
         it "uses RSPEC_DRB value" do
           with_RSPEC_DRB_set_to('9000') do
-            drb_command_line([]).drb_port.should == "9000"
+            command_line([]).drb_port.should == "9000"
           end
         end
       end
@@ -72,7 +66,7 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       context "and config variable set" do
         it "uses configured value" do
           with_RSPEC_DRB_set_to('9000') do
-            drb_command_line(%w[--drb-port 5678]).drb_port.should == 5678
+            command_line(%w[--drb-port 5678]).drb_port.should == 5678
           end
         end
       end
@@ -88,59 +82,30 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       end
     end
 
-    def dummy_spec_filename
-      @dummy_spec_filename ||= File.expand_path(File.dirname(__FILE__)) + "/_dummy_spec#{@drb_example_file_counter}.rb"
-    end
-
     before(:all) do
       @drb_port = 8990
       @drb_example_file_counter = 0
       DRb::start_service("druby://127.0.0.1:#{@drb_port}", ::FakeDrbSpecServer)
     end
 
-    before(:each) do
-      @drb_example_file_counter += 1
-      create_dummy_spec_file
-    end
-
-    after(:each) do
-      File.delete(dummy_spec_filename)
-    end
-
     after(:all) do
       DRb::stop_service
     end
 
-    def create_dummy_spec_file
-      File.open(dummy_spec_filename, 'w') do |f|
-        f.write %q{
-          describe "DUMMY CONTEXT for 'DrbCommandLine with -c option'" do
-            it "should be output with green bar" do
-              true.should be_true
-            end
-
-            it "should be output with red bar" do
-              raise("I want to see a red bar!")
-            end
-          end
-        }
-      end
-    end
-
-    it "returns true" do
+    it "returns 0 if spec passes" do
       err, out = StringIO.new, StringIO.new
-      result = drb_command_line(["--drb-port", @drb_port.to_s]).run(err, out)
-      result.should be_true
+      result = command_line(["--drb-port", @drb_port.to_s, passing_spec_filename]).run(err, out)
+      result.should be(0)
     end
 
-    it "integrates via Runner.new.run" do
+    it "returns 1 if spec passes" 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 = command_line(["--drb-port", @drb_port.to_s, failing_spec_filename]).run(err, out)
+      result.should be(1)
     end
 
     def run_spec_via_druby
-      run_with([dummy_spec_filename, "--colour", "--drb-port", @drb_port.to_s])
+      run_with([failing_spec_filename, "--colour", "--drb-port", @drb_port.to_s])
       out.rewind
       out.read
     end