rspec-core 2.7.1 → 2.8.0.rc1

data/spec/rspec/core/drb_options_spec.rb

@@ -0,0 +1,131 @@
+require "spec_helper"
+
+describe RSpec::Core::DrbOptions do
+  include ConfigOptionsHelper
+
+  # TODO ensure all options are output
+  describe "#drb_argv" do
+    it "preserves extra arguments" do
+      File.stub(:exist?) { false }
+      config_options_object(*%w[ a --drb b --color c ]).drb_argv.should =~ %w[ --color a b c ]
+    end
+
+    it "includes --fail-fast" do
+      config_options_object(*%w[--fail-fast]).drb_argv.should include("--fail-fast")
+    end
+
+    it "includes --options" do
+      config_options_object(*%w[--options custom.opts]).drb_argv.should include("--options", "custom.opts")
+    end
+
+    it "includes --order" do
+      config_options_object(*%w[--order random]).drb_argv.should include('--order', 'random')
+    end
+
+    context "with --example" do
+      it "includes --example" do
+        config_options_object(*%w[--example foo]).drb_argv.should include("--example", "foo")
+      end
+
+      it "unescapes characters which were escaped upon storing --example originally" do
+        config_options_object("--example", "foo\\ bar").drb_argv.should include("--example", "foo bar")
+      end
+    end
+
+    context "with tags" do
+      it "includes the inclusion tags" do
+        coo = config_options_object("--tag", "tag")
+        coo.drb_argv.should eq(["--tag", "tag"])
+      end
+
+      it "includes the inclusion tags with values" do
+        coo = config_options_object("--tag", "tag:foo")
+        coo.drb_argv.should eq(["--tag", "tag:foo"])
+      end
+
+      it "leaves inclusion tags intact" do
+        coo = config_options_object("--tag", "tag")
+        coo.drb_argv
+        coo.filter_manager.inclusions.should eq( {:tag=>true} )
+      end
+
+      it "leaves inclusion tags with values intact" do
+        coo = config_options_object("--tag", "tag:foo")
+        coo.drb_argv
+        coo.filter_manager.inclusions.should eq( {:tag=>'foo'} )
+      end
+
+      it "includes the exclusion tags" do
+        coo = config_options_object("--tag", "~tag")
+        coo.drb_argv.should eq(["--tag", "~tag"])
+      end
+
+      it "includes the exclusion tags with values" do
+        coo = config_options_object("--tag", "~tag:foo")
+        coo.drb_argv.should eq(["--tag", "~tag:foo"])
+      end
+
+      it "leaves exclusion tags intact" do
+        coo = config_options_object("--tag", "~tag")
+        coo.drb_argv
+        coo.filter_manager.exclusions.should include(:tag=>true)
+      end
+
+      it "leaves exclusion tags with values intact" do
+        coo = config_options_object("--tag", "~tag:foo")
+        coo.drb_argv
+        coo.filter_manager.exclusions.should include(:tag=>'foo')
+      end
+    end
+
+    context "with formatters" do
+      it "includes the formatters" do
+        coo = config_options_object("--format", "d")
+        coo.drb_argv.should eq(["--format", "d"])
+      end
+
+      it "leaves formatters intact" do
+        coo = config_options_object("--format", "d")
+        coo.drb_argv
+        coo.options[:formatters].should eq([["d"]])
+      end
+
+      it "leaves output intact" do
+        coo = config_options_object("--format", "p", "--out", "foo.txt", "--format", "d")
+        coo.drb_argv
+        coo.options[:formatters].should eq([["p","foo.txt"],["d"]])
+      end
+    end
+
+    context "--drb specified in ARGV" do
+      it "renders all the original arguments except --drb" do
+        config_options_object(*%w[ --drb --color --format s --example pattern --line_number 1 --profile --backtrace -I path/a -I path/b --require path/c --require path/d]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --example pattern --line_number 1 --format s -I path/a -I path/b --require path/c --require path/d])
+      end
+    end
+
+    context "--drb specified in the options file" do
+      it "renders all the original arguments except --drb" do
+        File.open("./.rspec", "w") {|f| f << "--drb --color"}
+        config_options_object(*%w[ --tty --format s --example pattern --line_number 1 --profile --backtrace ]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --tty --example pattern --line_number 1 --format s])
+      end
+    end
+
+    context "--drb specified in ARGV and the options file" do
+      it "renders all the original arguments except --drb" do
+        File.open("./.rspec", "w") {|f| f << "--drb --color"}
+        config_options_object(*%w[ --drb --format s --example pattern --line_number 1 --profile --backtrace]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --example pattern --line_number 1 --format s])
+      end
+    end
+
+    context "--drb specified in ARGV and in as ARGV-specified --options file" do
+      it "renders all the original arguments except --drb and --options" do
+        File.open("./.rspec", "w") {|f| f << "--drb --color"}
+        config_options_object(*%w[ --drb --format s --example pattern --line_number 1 --profile --backtrace]).
+          drb_argv.should eq(%w[ --color --profile --backtrace --example pattern --line_number 1 --format s ])
+      end
+    end
+  end
+end

data/spec/rspec/core/example_group_spec.rb

@@ -111,7 +111,7 @@ module RSpec::Core
         world = RSpec::Core::World.new
         parent = ExampleGroup.describe
         world.register(parent)
-        child = parent.describe
+        parent.describe
         world.example_groups.should eq([parent])
       end
     end
@@ -121,7 +121,11 @@ module RSpec::Core
 
       shared_examples "matching filters" do
         context "inclusion" do
-          before { world.stub(:inclusion_filter).and_return(filter_metadata) }
+          before do
+            filter_manager = FilterManager.new
+            filter_manager.include filter_metadata
+            world.stub(:filter_manager => filter_manager)
+          end
 
           it "includes examples in groups matching filter" do
             group = ExampleGroup.describe("does something", spec_metadata)
@@ -145,11 +149,16 @@ module RSpec::Core
         end
 
         context "exclusion" do
-          before { world.stub(:exclusion_filter).and_return(filter_metadata) }
+          before do
+            filter_manager = FilterManager.new
+            filter_manager.exclude filter_metadata
+            world.stub(:filter_manager => filter_manager)
+          end
+
           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.example("first"), group.example("second") ]
 
             group.filtered_examples.should be_empty
           end
@@ -157,7 +166,7 @@ module RSpec::Core
           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)
             ]
@@ -245,10 +254,12 @@ module RSpec::Core
 
       context "with no examples or groups that match filters" do
         it "returns none" do
-          world.stub(:inclusion_filter).and_return({ :awesome => false })
+          filter_manager = FilterManager.new
+          filter_manager.include :awesome => false
+          world.stub(:filter_manager => filter_manager)
           group = ExampleGroup.describe
           group.stub(:world) { world }
-          example = group.example("does something")
+          group.example("does something")
           group.filtered_examples.should eq([])
         end
       end
@@ -683,7 +694,7 @@ module RSpec::Core
           example('ex 1') { 1.should eq(1) }
           example('ex 2') { 1.should eq(1) }
         end
-        group.stub(:filtered_examples) { group.examples }
+        group.stub(:filtered_examples) { group.examples.extend(Extensions::Ordered) }
         group.run(reporter).should be_true
       end
 
@@ -692,7 +703,7 @@ module RSpec::Core
           example('ex 1') { 1.should eq(1) }
           example('ex 2') { 1.should eq(2) }
         end
-        group.stub(:filtered_examples) { group.examples }
+        group.stub(:filtered_examples) { group.examples.extend(Extensions::Ordered) }
         group.run(reporter).should be_false
       end
 
@@ -701,7 +712,7 @@ module RSpec::Core
           example('ex 1') { 1.should eq(2) }
           example('ex 2') { 1.should eq(1) }
         end
-        group.stub(:filtered_examples) { group.examples }
+        group.stub(:filtered_examples) { group.examples.extend(Extensions::Ordered) }
         group.filtered_examples.each do |example|
           example.should_receive(:run)
         end
@@ -1008,7 +1019,7 @@ module RSpec::Core
           eval_count = 0
           shared_examples_for("thing") { |p| eval_count += 1 }
           group = ExampleGroup.describe('fake group')
-          shared_group = group.it_should_behave_like("thing", :a)
+          group.it_should_behave_like("thing", :a)
           eval_count.should eq(1)
         end
       end

data/spec/rspec/core/example_spec.rb

@@ -103,7 +103,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
 
   describe "accessing options within a running example" do
     it "can look up option values by key", :demo => :data do
-      example.options[:demo].should eq(:data)
+      example.metadata[:demo].should eq(:data)
     end
   end
 
@@ -285,5 +285,4 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
     end
 
   end
-
 end

data/spec/rspec/core/filter_manager_spec.rb

@@ -0,0 +1,175 @@
+require 'spec_helper'
+
+module RSpec::Core
+  describe FilterManager do
+    %w[inclusions include exclusions exclude].each_slice(2) do |type, name|
+      it "merges #{type}" do
+        filter_manager = FilterManager.new
+        filter_manager.exclusions.clear # defaults
+        filter_manager.send name, :foo => :bar
+        filter_manager.send name, :baz => :bam
+        filter_manager.send(type).should eq(:foo => :bar, :baz => :bam)
+      end
+
+      it "overrides previous #{type} (via merge)" do
+        filter_manager = FilterManager.new
+        filter_manager.exclusions.clear # defaults
+        filter_manager.send name, :foo => 1
+        filter_manager.send name, :foo => 2
+        filter_manager.send(type).should eq(:foo => 2)
+      end
+
+      it "ignores new #{type} if same key exists and priority is low" do
+        filter_manager = FilterManager.new
+        filter_manager.exclusions.clear # defaults
+        filter_manager.send name, :foo => 1
+        filter_manager.send name, :weak, :foo => 2
+        filter_manager.send(type).should eq(:foo => 1)
+      end
+    end
+
+    describe "#prune" do
+      it "includes objects with tags matching inclusions" do
+        included = RSpec::Core::Metadata.new({:foo => :bar})
+        excluded = RSpec::Core::Metadata.new
+        filter_manager = FilterManager.new
+        filter_manager.include :foo => :bar
+        filter_manager.prune([included, excluded]).should eq([included])
+      end
+
+      it "excludes objects with tags matching exclusions" do
+        included = RSpec::Core::Metadata.new
+        excluded = RSpec::Core::Metadata.new({:foo => :bar})
+        filter_manager = FilterManager.new
+        filter_manager.exclude :foo => :bar
+        filter_manager.prune([included, excluded]).should eq([included])
+      end
+
+      it "prefers exclusion when matches previously set inclusion" do
+        included = RSpec::Core::Metadata.new
+        excluded = RSpec::Core::Metadata.new({:foo => :bar})
+        filter_manager = FilterManager.new
+        filter_manager.include :foo => :bar
+        filter_manager.exclude :foo => :bar
+        filter_manager.prune([included, excluded]).should eq([included])
+      end
+
+      it "prefers inclusion when matches previously set exclusion" do
+        included = RSpec::Core::Metadata.new({:foo => :bar})
+        excluded = RSpec::Core::Metadata.new
+        filter_manager = FilterManager.new
+        filter_manager.exclude :foo => :bar
+        filter_manager.include :foo => :bar
+        filter_manager.prune([included, excluded]).should eq([included])
+      end
+
+      it "prefers previously set inclusion when exclusion matches but has lower priority" do
+        included = RSpec::Core::Metadata.new({:foo => :bar})
+        excluded = RSpec::Core::Metadata.new
+        filter_manager = FilterManager.new
+        filter_manager.include :foo => :bar
+        filter_manager.exclude :low, :foo => :bar
+        filter_manager.prune([included, excluded]).should eq([included])
+      end
+
+      it "prefers previously set exclusion when inclusion matches but has lower priority" do
+        included = RSpec::Core::Metadata.new
+        excluded = RSpec::Core::Metadata.new({:foo => :bar})
+        filter_manager = FilterManager.new
+        filter_manager.exclude :foo => :bar
+        filter_manager.include :low, :foo => :bar
+        filter_manager.prune([included, excluded]).should eq([included])
+      end
+    end
+
+    describe "#inclusions#description" do
+      it 'cleans up the description' do
+        project_dir = File.expand_path('.')
+        lambda { }.inspect.should include(project_dir)
+        lambda { }.inspect.should include(' (lambda)') if RUBY_VERSION > '1.9'
+        lambda { }.inspect.should include('0x')
+
+        filter_manager = FilterManager.new
+        filter_manager.include :foo => lambda { }
+
+        filter_manager.inclusions.description.should_not include(project_dir)
+        filter_manager.inclusions.description.should_not include(' (lambda)')
+        filter_manager.inclusions.description.should_not include('0x')
+      end
+    end
+
+    describe "#exclusions#description" do
+      it 'cleans up the description' do
+        project_dir = File.expand_path('.')
+        lambda { }.inspect.should include(project_dir)
+        lambda { }.inspect.should include(' (lambda)') if RUBY_VERSION > '1.9'
+        lambda { }.inspect.should include('0x')
+
+        filter_manager = FilterManager.new
+        filter_manager.exclude :foo => lambda { }
+
+        filter_manager.exclusions.description.should_not include(project_dir)
+        filter_manager.exclusions.description.should_not include(' (lambda)')
+        filter_manager.exclusions.description.should_not include('0x')
+      end
+
+      it 'returns `{}` when it only contains the default filters' do
+        filter_manager = FilterManager.new
+        filter_manager.exclusions.description.should eq({}.inspect)
+      end
+
+      it 'includes other filters' do
+        filter_manager = FilterManager.new
+        filter_manager.exclude :foo => :bar
+        filter_manager.exclusions.description.should eq({ :foo => :bar }.inspect)
+      end
+
+      it 'deprecates an overridden :if filter' do
+        RSpec.should_receive(:warn_deprecation).with(/exclude\(:if.*is deprecated/)
+        filter_manager = FilterManager.new
+        filter_manager.exclude :if => :custom_filter
+      end
+
+      it 'deprecates an overridden :unless filter' do
+        RSpec.should_receive(:warn_deprecation).with(/exclude\(:unless.*is deprecated/)
+        filter_manager = FilterManager.new
+        filter_manager.exclude :unless => :custom_filter
+      end
+
+      it 'includes an overriden :if filter' do
+        RSpec.stub(:warn_deprecation)
+        filter_manager = FilterManager.new
+        filter_manager.exclude :if => :custom_filter
+        filter_manager.exclusions.description.should eq({ :if => :custom_filter }.inspect)
+      end
+
+      it 'includes an overriden :unless filter' do
+        RSpec.stub(:warn_deprecation)
+        filter_manager = FilterManager.new
+        filter_manager.exclude :unless => :custom_filter
+        filter_manager.exclusions.description.should eq({ :unless => :custom_filter }.inspect)
+      end
+    end
+
+    it "clears the inclusion filter on include :line_numbers" do
+      filter_manager = FilterManager.new
+      filter_manager.include :foo => :bar
+      filter_manager.include :line_numbers => [100]
+      filter_manager.inclusions.should eq(:line_numbers => [100])
+    end
+
+    it "clears the inclusion filter on include :locations" do
+      filter_manager = FilterManager.new
+      filter_manager.include :foo => :bar
+      filter_manager.include :locations => { "path/to/file.rb" => [37] }
+      filter_manager.inclusions.should eq(:locations => { "path/to/file.rb" => [37] })
+    end
+
+    it "clears the inclusion filter on include :full_description" do
+      filter_manager = FilterManager.new
+      filter_manager.include :foo => :bar
+      filter_manager.include :full_description => "this and that"
+      filter_manager.inclusions.should eq(:full_description => "this and that")
+    end
+  end
+end

data/spec/rspec/core/formatters/helpers_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 require 'rspec/core/formatters/helpers'
 
 describe RSpec::Core::Formatters::Helpers do
-  let(:helper) { helper = Object.new.extend(RSpec::Core::Formatters::Helpers) }
+  let(:helper) { Object.new.extend(RSpec::Core::Formatters::Helpers) }
 
   describe "format seconds" do
     context "sub second times" do

data/spec/rspec/core/formatters/html_formatter_spec.rb

@@ -16,7 +16,7 @@ module RSpec
 
         let(:generated_html) do
           options = RSpec::Core::ConfigurationOptions.new(
-            %w[spec/rspec/core/resources/formatter_specs.rb --format html]
+            %w[spec/rspec/core/resources/formatter_specs.rb --format html --order default]
           )
           options.parse_options
           err, out = StringIO.new, StringIO.new
@@ -49,7 +49,7 @@ module RSpec
         end
 
         def extract_backtrace_from(doc)
-          backtrace = doc.search("div.backtrace").
+          doc.search("div.backtrace").
             collect {|e| e.at("pre").inner_html}.
             collect {|e| e.split("\n")}.flatten.
             select  {|e| e =~ /formatter_specs\.rb/}
@@ -72,6 +72,7 @@ module RSpec
               actual_path, actual_line_number, actual_suffix = actual_backtraces[i].split(':')
               File.expand_path(actual_path).should eq(File.expand_path(expected_path))
               actual_line_number.should eq(expected_line_number)
+              actual_suffix.should eq(expected_suffix)
             end
           end
         end