rspec-core 2.9.0 → 2.10.0

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.9.0'
+      STRING = '2.10.0'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -115,10 +115,6 @@ module RSpec
         end
       end
 
-      def find_hook(hook, scope, group, example = nil)
-        @configuration.find_hook(hook, scope, group, example)
-      end
-
     private
 
       def declaration_line_numbers

data/spec/rspec/core/configuration_options_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 require 'ostruct'
 
-describe RSpec::Core::ConfigurationOptions do
+describe RSpec::Core::ConfigurationOptions, :fakefs do
   include ConfigOptionsHelper
 
   it "warns when HOME env var is not set", :unless => (RUBY_PLATFORM == 'java') do
@@ -316,11 +316,12 @@ describe RSpec::Core::ConfigurationOptions do
     it "merges global, local, SPEC_OPTS, and CLI" do
       File.open("./.rspec", "w") {|f| f << "--line 37"}
       File.open("~/.rspec", "w") {|f| f << "--color"}
-      ENV["SPEC_OPTS"] = "--debug"
+      ENV["SPEC_OPTS"] = "--debug --example 'foo bar'"
       options = parse_options("--drb")
       options[:color].should be_true
       options[:line_numbers].should eq(["37"])
       options[:debug].should be_true
+      options[:full_description].should eq(/foo\ bar/)
       options[:drb].should be_true
     end
 
@@ -350,6 +351,11 @@ describe RSpec::Core::ConfigurationOptions do
         options[:format].should be_nil
         options[:color].should be_true
       end
+      it "parses -e 'full spec description'" do
+        File.open("./custom.opts", "w") {|f| f << "-e 'The quick brown fox jumps over the lazy dog'"}
+        options = parse_options("-O", "./custom.opts")
+        options[:full_description].should == /The\ quick\ brown\ fox\ jumps\ over\ the\ lazy\ dog/
+      end
     end
   end
 end

data/spec/rspec/core/drb_options_spec.rb

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe RSpec::Core::DrbOptions do
+describe RSpec::Core::DrbOptions, :fakefs do
   include ConfigOptionsHelper
 
   describe "#drb_argv" do

data/spec/rspec/core/example_group_spec.rb

@@ -345,11 +345,11 @@ module RSpec::Core
       end
 
       it "adds the the file_path to metadata" do
-        ExampleGroup.describe(Object) { }.metadata[:example_group][:file_path].should eq(__FILE__)
+        ExampleGroup.describe(Object) { }.metadata[:example_group][:file_path].should eq(relative_path(__FILE__))
       end
 
       it "has a reader for file_path" do
-        ExampleGroup.describe(Object) { }.file_path.should eq(__FILE__)
+        ExampleGroup.describe(Object) { }.file_path.should eq(relative_path(__FILE__))
       end
 
       it "adds the line_number to metadata" do

data/spec/rspec/core/example_spec.rb

@@ -45,11 +45,7 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
     end
   end
 
-  describe "auto-generated example descriptions" do
-    let(:generated_description) { "the generated description" }
-    let(:rspec_example) { example_group.specify { 5.should eq(5) } }
-    before(:each) { RSpec::Matchers.stub(:generated_description => generated_description) }
-
+  describe "when there is no explicit description" do
     def expect_with(*frameworks)
       RSpec.configuration.stub(:expecting_with_rspec?).and_return(frameworks.include?(:rspec))
 
@@ -65,35 +61,62 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
     context "when `expect_with :rspec` is configured" do
       before(:each) { expect_with :rspec }
 
-      it "generates a description for an example with no description" do
-        expect {
-          example_group.run
-        }.to change { rspec_example.metadata[:description] }.from("").to(generated_description)
+      it "uses the matcher-generated description" do
+        example_group.example { 5.should eq(5) }
+        example_group.run
+        example_group.examples.first.description.should eq("should eq 5")
+      end
+
+      it "uses the file and line number if there is no matcher-generated description" do
+        example = example_group.example {}
+        example_group.run
+        example.description.should match(/example at #{relative_path(__FILE__)}:#{__LINE__ - 2}/)
+      end
+
+      it "uses the file and line number if there is an error before the matcher" do
+        example = example_group.example { 5.should eq(5) }
+        example_group.before { raise }
+        example_group.run
+        example.description.should match(/example at #{relative_path(__FILE__)}:#{__LINE__ - 3}/)
       end
     end
 
     context "when `expect_with :rspec, :stdlib` is configured" do
       before(:each) { expect_with :rspec, :stdlib }
 
-      it "generates a description for an example with no description" do
-        expect {
-          example_group.run
-        }.to change { rspec_example.metadata[:description] }.from("").to(generated_description)
+      it "uses the matcher-generated description" do
+        example_group.example { 5.should eq(5) }
+        example_group.run
+        example_group.examples.first.description.should eq("should eq 5")
+      end
+
+      it "uses the file and line number if there is no matcher-generated description" do
+        example = example_group.example {}
+        example_group.run
+        example.description.should match(/example at #{relative_path(__FILE__)}:#{__LINE__ - 2}/)
+      end
+
+      it "uses the file and line number if there is an error before the matcher" do
+        example = example_group.example { 5.should eq(5) }
+        example_group.before { raise }
+        example_group.run
+        example.description.should match(/example at #{relative_path(__FILE__)}:#{__LINE__ - 3}/)
       end
     end
 
     context "when `expect_with :stdlib` is configured" do
-      let!(:stdlib_example) { example_group.specify { assert 5 == 5 } }
       before(:each) { expect_with :stdlib }
 
       it "does not attempt to get the generated description from RSpec::Matchers" do
         RSpec::Matchers.should_not_receive(:generated_description)
+        example_group.example { assert 5 == 5 }
         example_group.run
       end
 
-      it "fails an example with no description" do
+      it "uses the file and line number" do
+        example = example_group.example { assert 5 == 5 }
         example_group.run
-        stdlib_example.should have_failed_with(NotImplementedError)
+        example.description.should match(/example at #{relative_path(__FILE__)}:#{__LINE__ - 2}/)
       end
     end
   end

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

@@ -27,7 +27,7 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
       line = __LINE__ - 2
       group.run(formatter)
       formatter.dump_commands_to_rerun_failed_examples
-      output.string.should include("rspec #{RSpec::Core::Formatters::BaseFormatter::relative_path("#{__FILE__}:#{line}")} # example group fails")
+      output.string.should include("rspec #{RSpec::Core::Metadata::relative_path("#{__FILE__}:#{line}")} # example group fails")
     end
   end
 
@@ -57,6 +57,12 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
         group.example("example name") { raise exception_without_message }
         expect { run_all_and_dump_failures }.not_to raise_error(NoMethodError)
       end
+
+      it "preserves ancestry" do
+        example = group.example("example name") { raise "something" }
+        run_all_and_dump_failures
+        example.example_group.ancestors.size.should == 1
+      end
     end
 
     context "with an exception class other than RSpec" do
@@ -315,13 +321,12 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
 
   describe "#dump_profile" do
     before do
-      formatter.stub(:examples) do
-        group = RSpec::Core::ExampleGroup.describe("group") do
-          example("example")
-        end
-        group.run(double('reporter').as_null_object)
-        group.examples
+      group = RSpec::Core::ExampleGroup.describe("group") do
+        example("example") { sleep 0.1 }
       end
+      group.run(double('reporter').as_null_object)
+
+      formatter.stub(:examples) { group.examples }
     end
 
     it "names the example" do
@@ -340,5 +345,10 @@ describe RSpec::Core::Formatters::BaseTextFormatter do
 
       output.string.should =~ /#{filename}\:#{__LINE__ - 21}/
     end
+
+    it "prints the percentage taken from the total runtime" do
+      formatter.dump_profile
+      output.string.should =~ /, 100.0% of total time\):/
+    end
   end
 end

data/spec/rspec/core/hooks_spec.rb

@@ -15,7 +15,7 @@ module RSpec::Core
             define_method :metadata_hash do |*args|
               instance = HooksHost.new
               args.unshift scope if scope
-              hooks = instance.send(type, *args) { }
+              hooks = instance.send(type, *args) {}
               hooks.first.options
             end
           end
@@ -33,19 +33,19 @@ module RSpec::Core
             let(:instance) { HooksHost.new }
 
             it "defaults to :each scope if no arguments are given" do
-              hooks = instance.send(type) { }
+              hooks = instance.send(type) {}
               hook = hooks.first
               instance.hooks[type][:each].should include(hook)
             end
 
             it "defaults to :each scope if the only argument is a metadata hash" do
-              hooks = instance.send(type, :foo => :bar) { }
+              hooks = instance.send(type, :foo => :bar) {}
               hook = hooks.first
               instance.hooks[type][:each].should include(hook)
             end
 
             it "raises an error if only metadata symbols are given as arguments" do
-              expect { instance.send(type, :foo, :bar) { } }.to raise_error(ArgumentError)
+              expect { instance.send(type, :foo, :bar) {} }.to raise_error(ArgumentError)
             end
           end
         end
@@ -63,7 +63,7 @@ module RSpec::Core
             describe "##{type}(#{scope.inspect})" do
               let(:instance) { HooksHost.new }
               let!(:hook) do
-                hooks = instance.send(type, scope) { }
+                hooks = instance.send(type, scope) {}
                 hooks.first
               end
 
@@ -119,6 +119,7 @@ module RSpec::Core
             def yielder
               yield
             end
+
             around do |example|
               yielder { example.run }
             end
@@ -130,12 +131,118 @@ module RSpec::Core
           examples.should have(1).example
         end
       end
+    end
+
+    [:all, :each].each do |scope|
+      describe "prepend_before(#{scope})" do
+        it "adds to the front of the list of before(:#{scope}) hooks" do
+          messages = []
+
+          RSpec.configure { |config| config.before(scope)         { messages << "config 3" } }
+          RSpec.configure { |config| config.prepend_before(scope) { messages << "config 2" } }
+          RSpec.configure { |config| config.before(scope)         { messages << "config 4" } }
+          RSpec.configure { |config| config.prepend_before(scope) { messages << "config 1" } }
+
+          group = ExampleGroup.describe { example {} }
+          group.before(scope)         { messages << "group 3" }
+          group.prepend_before(scope) { messages << "group 2" }
+          group.before(scope)         { messages << "group 4" }
+          group.prepend_before(scope) { messages << "group 1" }
+
+          group.run
+
+          messages.should eq([
+            'group 1',
+            'group 2',
+            'config 1',
+            'config 2',
+            'config 3',
+            'config 4',
+            'group 3',
+            'group 4'
+          ])
+        end
+      end
+
+      describe "append_before(#{scope})" do
+        it "adds to the back of the list of before(:#{scope}) hooks (same as `before`)" do
+          messages = []
+
+          RSpec.configure { |config| config.before(scope)        { messages << "config 1" } }
+          RSpec.configure { |config| config.append_before(scope) { messages << "config 2" } }
+          RSpec.configure { |config| config.before(scope)        { messages << "config 3" } }
+
+          group = ExampleGroup.describe { example {} }
+          group.before(scope)        { messages << "group 1" }
+          group.append_before(scope) { messages << "group 2" }
+          group.before(scope)        { messages << "group 3" }
+
+          group.run
+
+          messages.should eq([
+            'config 1',
+            'config 2',
+            'config 3',
+            'group 1',
+            'group 2',
+            'group 3'
+          ])
+        end
+      end
+
+      describe "prepend_after(#{scope})" do
+        it "adds to the front of the list of after(:#{scope}) hooks (same as `after`)" do
+          messages = []
+
+          RSpec.configure { |config| config.after(scope)         { messages << "config 3" } }
+          RSpec.configure { |config| config.prepend_after(scope) { messages << "config 2" } }
+          RSpec.configure { |config| config.after(scope)         { messages << "config 1" } }
+
+          group = ExampleGroup.describe { example {} }
+          group.after(scope)         { messages << "group 3" }
+          group.prepend_after(scope) { messages << "group 2" }
+          group.after(scope)         { messages << "group 1" }
+
+          group.run
+
+          messages.should eq([
+            'group 1',
+            'group 2',
+            'group 3',
+            'config 1',
+            'config 2',
+            'config 3'
+          ])
+        end
+      end
+
+      describe "append_after(#{scope})" do
+        it "adds to the back of the list of after(:#{scope}) hooks" do
+          messages = []
+
+          RSpec.configure { |config| config.after(scope)        { messages << "config 2" } }
+          RSpec.configure { |config| config.append_after(scope) { messages << "config 3" } }
+          RSpec.configure { |config| config.after(scope)        { messages << "config 1" } }
+          RSpec.configure { |config| config.append_after(scope) { messages << "config 4" } }
+
+          group = ExampleGroup.describe { example {} }
+          group.after(scope)        { messages << "group 2" }
+          group.append_after(scope) { messages << "group 3" }
+          group.after(scope)        { messages << "group 1" }
+          group.append_after(scope) { messages << "group 4" }
+
+          group.run
 
-      describe Hooks::Hook do
-        it "requires a block" do
-          lambda {
-            Hooks::BeforeHook.new :foo => :bar
-          }.should raise_error("no block given for before hook")
+          messages.should eq([
+            'group 1',
+            'group 2',
+            'config 1',
+            'config 2',
+            'config 3',
+            'config 4',
+            'group 3',
+            'group 4'
+          ])
         end
       end
     end

data/spec/rspec/core/metadata_spec.rb

@@ -118,6 +118,10 @@ module RSpec
           end
         end
 
+        it "matches a proc with no arguments that evaluates to true" do
+          example_metadata.filter_applies?(:if, lambda { true }).should be_true
+        end
+
         it "matches a proc that evaluates to true" do
           example_metadata.filter_applies?(:if, lambda { |v| v }).should be_true
         end
@@ -131,6 +135,12 @@ module RSpec
           example_metadata.filter_applies?(:foo, lambda { |v, m| m == example_metadata }).should be_true
         end
 
+        it "raises an error when the proc has an incorrect arity" do
+          expect {
+            example_metadata.filter_applies?(:if, lambda { |a,b,c| true })
+          }.to raise_error(ArgumentError)
+        end
+
         context "with an Array" do
           let(:metadata_with_array) {
             group_metadata.for_example('example_with_array', :tag => [:one, 2, 'three', /four/])
@@ -188,7 +198,7 @@ module RSpec
         end
 
         it "extracts file path from caller" do
-          mfe[:file_path].should eq(__FILE__)
+          mfe[:file_path].should eq(relative_path(__FILE__))
         end
 
         it "extracts line number from caller" do
@@ -196,7 +206,7 @@ module RSpec
         end
 
         it "extracts location from caller" do
-          mfe[:location].should eq("#{__FILE__}:#{line_number}")
+          mfe[:location].should eq("#{relative_path(__FILE__)}:#{line_number}")
         end
 
         it "uses :caller if passed as an option" do
@@ -397,7 +407,7 @@ module RSpec
                     "./lib/rspec/core/foo.rb",
                     "#{__FILE__}:#{__LINE__}"
           ])
-          m[:example_group][:file_path].should eq(__FILE__)
+          m[:example_group][:file_path].should eq(relative_path(__FILE__))
         end
       end
 

data/spec/rspec/core/pending_example_spec.rb

@@ -70,9 +70,10 @@ describe "an example" do
         end
         example = group.examples.last
         example.run(group.new, stub.as_null_object)
-        example.description.should be_empty
+        example.description.should match(/example at/)
       end
     end
+
     context "after another example with some assertion" do
       it "does not show any message" do
         group = RSpec::Core::ExampleGroup.describe('group') do
@@ -85,7 +86,7 @@ describe "an example" do
         end
         example = group.examples.last
         example.run(group.new, stub.as_null_object)
-        example.description.should be_empty
+        example.description.should match(/example at/)
       end
     end
   end