rspec-core 2.0.0.beta.8 → 2.0.0.beta.9

data/spec/rspec/core/example_spec.rb

@@ -1,8 +1,8 @@
 require 'spec_helper'
 
-describe Rspec::Core::Example, :parent_metadata => 'sample' do
+describe RSpec::Core::Example, :parent_metadata => 'sample' do
   let(:example_group) do
-    Rspec::Core::ExampleGroup.describe('group description')
+    RSpec::Core::ExampleGroup.describe('group description')
   end
 
   let(:example) do
@@ -41,7 +41,7 @@ describe Rspec::Core::Example, :parent_metadata => 'sample' do
 
   describe '#described_class' do
     it "returns the class (if any) of the outermost example group" do
-      described_class.should == Rspec::Core::Example
+      described_class.should == RSpec::Core::Example
     end
   end
 
@@ -59,7 +59,7 @@ describe Rspec::Core::Example, :parent_metadata => 'sample' do
   describe "#run" do
     it "runs after(:each) when the example passes" do
       after_run = false
-      group = Rspec::Core::ExampleGroup.describe do
+      group = RSpec::Core::ExampleGroup.describe do
         after(:each) { after_run = true }
         example('example') { 1.should == 1 }
       end
@@ -69,7 +69,7 @@ describe Rspec::Core::Example, :parent_metadata => 'sample' do
 
     it "runs after(:each) when the example fails" do
       after_run = false
-      group = Rspec::Core::ExampleGroup.describe do
+      group = RSpec::Core::ExampleGroup.describe do
         after(:each) { after_run = true }
         example('example') { 1.should == 2 }
       end
@@ -79,7 +79,7 @@ describe Rspec::Core::Example, :parent_metadata => 'sample' do
 
     it "runs after(:each) when the example raises an Exception" do
       after_run = false
-      group = Rspec::Core::ExampleGroup.describe do
+      group = RSpec::Core::ExampleGroup.describe do
         after(:each) { after_run = true }
         example('example') { raise "this error" } 
       end
@@ -87,4 +87,16 @@ describe Rspec::Core::Example, :parent_metadata => 'sample' do
       after_run.should be_true, "expected after(:each) to be run"
     end
   end
+
+  describe "#in_block?" do
+    before do
+      running_example.should_not be_in_block
+    end
+    it "is only true during the example (but not before or after)" do
+      running_example.should be_in_block
+    end
+    after do
+      running_example.should_not be_in_block
+    end
+  end
 end

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

@@ -1,8 +1,8 @@
 require "spec_helper"
 
-describe Rspec::Core::Formatters::BaseFormatter do
+describe RSpec::Core::Formatters::BaseFormatter do
   
-  let(:formatter) { Rspec::Core::Formatters::BaseFormatter.new }
+  let(:formatter) { RSpec::Core::Formatters::BaseFormatter.new }
 
   it "has start as an interface with one argument" do
     formatter.should have_interface_for(:start).with(1).argument

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

@@ -1,5 +1,21 @@
 require "spec_helper"
 
-describe Rspec::Core::Formatters::BaseTextFormatter do
-  
+module RSpec::Core::Formatters
+
+  describe BaseTextFormatter do
+    describe "#dump_failures" do
+      it "preserves formatting" do 
+        output = StringIO.new
+        group = RSpec::Core::ExampleGroup.describe
+        example = group.example { "this".should eq("that") }
+        formatter = RSpec::Core::Formatters::BaseTextFormatter.new
+        group.run_all(formatter)
+
+        RSpec.configuration.stub(:output) { output }
+        RSpec.configuration.stub(:color_enabled?) { false }
+        formatter.dump_failures
+        output.string.should =~ /(\s+)expected \"that\"\n\1     got \"this\"/m
+      end
+    end
+  end
 end

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

@@ -1,5 +1,30 @@
-require 'spec_helper'
+require "spec_helper"
 
-describe Rspec::Core::Formatters::DocumentationFormatter do
-  
-end
+module RSpec::Core::Formatters
+  describe DocumentationFormatter do
+    it "numbers the failures" do
+
+      examples = [
+        double("example 1",
+               :description => "first example",
+               :execution_result => {:status => 'failed', :exception_encountered => Exception.new }
+              ),
+        double("example 2",
+               :description => "second example",
+               :execution_result => {:status => 'failed', :exception_encountered => Exception.new }
+              )
+      ]
+
+      output = StringIO.new
+      RSpec.configuration.stub(:output) { output }
+      RSpec.configuration.stub(:color_enabled?) { false }
+
+      formatter = RSpec::Core::Formatters::DocumentationFormatter.new
+      
+      examples.each {|e| formatter.example_finished(e) }
+
+      output.string.should =~ /first example \(FAILED - 1\)/m
+      output.string.should =~ /second example \(FAILED - 2\)/m
+    end
+  end
+end

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

@@ -1,23 +1,29 @@
 require 'spec_helper'
 require 'stringio'
 
-describe Rspec::Core::Formatters::Helpers do
-  let(:helper) { helper = Object.new.extend(Rspec::Core::Formatters::Helpers) }
+describe RSpec::Core::Formatters::Helpers do
+  let(:helper) { helper = Object.new.extend(RSpec::Core::Formatters::Helpers) }
 
   describe "format seconds" do
-    it "uses passed in precision if specified" do
-      pending("get regex right to handle this case where we don't want it to consume all zeroes") do
-        helper.format_seconds(0.00005, 2).should == "0.00"
-      end
-    end
-    
     context "sub second times" do
       it "returns 5 digits of precision" do
-        helper.format_seconds(0.000005).should == "0.00001"
+        helper.format_seconds(0.000006).should == "0.00001"
+      end
+
+      it "strips off trailing zeroes beyond sub-second precision" do
+        helper.format_seconds(0.020000).should == "0.02"
       end
 
-      it "strips off trailing zeroes" do
-        helper.format_seconds(0.02000).should == "0.02"
+      context "0" do
+        it "strips off trailing zeroes" do
+          helper.format_seconds(0.00000000001).should == "0"
+        end
+      end
+
+      context "> 1" do
+        it "strips off trailing zeroes" do
+          helper.format_seconds(1.00000000001).should == "1"
+        end
       end
     end
 
@@ -32,6 +38,7 @@ describe Rspec::Core::Formatters::Helpers do
         helper.format_seconds(5).should == "5"
         helper.format_seconds(5.0).should == "5"
       end
+
     end    
   end
 

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

@@ -1,11 +1,11 @@
 require 'spec_helper'
 require 'stringio'
 
-describe Rspec::Core::Formatters::ProgressFormatter do
+describe RSpec::Core::Formatters::ProgressFormatter do
   
    before do
      @output = StringIO.new
-     @formatter = Rspec::Core::Formatters::ProgressFormatter.new
+     @formatter = RSpec::Core::Formatters::ProgressFormatter.new
      @formatter.start(2)
      @formatter.stub!(:color_enabled?).and_return(false)
      @formatter.stub!(:output).and_return(@output)

data/spec/rspec/core/kernel_extensions_spec.rb

@@ -1,13 +1,9 @@
 require 'spec_helper'
 
-describe Rspec::Core::KernelExtensions do
-  
-  it "should be included in Object" do
-    Object.included_modules.should include(Rspec::Core::KernelExtensions)
+describe "extensions" do
+  describe "debugger" do
+    it "is defined on Kernel" do
+      Kernel.should respond_to(:debugger)
+    end
   end
-  
-  it "should add a describe method to Object" do
-    Object.should respond_to(:describe)
-  end
-
 end

data/spec/rspec/core/metadata_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Rspec
+module RSpec
   module Core
     describe Metadata do
 
@@ -76,6 +76,18 @@ module Rspec
         end
       end
 
+      describe "parent example group" do
+        it "nests the parent's example group metadata" do
+          parent = Metadata.new
+          parent.process(Object, 'parent')
+          
+          child = Metadata.new(parent)
+          child.process()
+
+          child[:example_group][:example_group].should == parent[:example_group]
+        end
+      end
+
       describe "file path" do
         it "finds the first spec file in the caller array" do
           m = Metadata.new
@@ -168,38 +180,47 @@ module Rspec
       end
 
       describe "apply_condition" do
-        let(:group_metadata) { Metadata.new.process('group', :caller => ["foo_spec.rb:#{__LINE__}"]) }
+
+
+        let(:parent_group_metadata) { Metadata.new.process('parent group', :caller => ["foo_spec.rb:#{__LINE__}"]) }
+        let(:parent_group_line_number) { __LINE__ -1 }
+        let(:group_metadata) { Metadata.new(parent_group_metadata).process('group', :caller => ["foo_spec.rb:#{__LINE__}"]) }
         let(:group_line_number) { __LINE__ -1 }
         let(:example_metadata) { group_metadata.for_example('example', :caller => ["foo_spec.rb:#{__LINE__}"]) }
         let(:example_line_number) { __LINE__ -1 }
         let(:next_example_metadata) {group_metadata.for_example('next_example', 
           :caller => ["foo_spec.rb:#{example_line_number + 2}"])}
-        let(:world) { Rspec::Core.world }
+        let(:world) { RSpec.world }
 
         it "matches the group when the line_number is the example group line number" do
-          world.should_receive(:preceding_example_or_group_line).and_return(group_line_number)
+          world.should_receive(:preceding_declaration_line).and_return(group_line_number)
           # this call doesn't really make sense since apply_condition is only called 
           # for example metadata not group metadata
           group_metadata.apply_condition(:line_number, group_line_number).should be_true
         end
 
+        it "matches the example when the line_number is the grandparent example group line number" do
+          world.should_receive(:preceding_declaration_line).and_return(parent_group_line_number)
+          example_metadata.apply_condition(:line_number, parent_group_line_number).should be_true
+        end
+
         it "matches the example when the line_number is the parent example group line number" do
-          world.should_receive(:preceding_example_or_group_line).and_return(group_line_number)
+          world.should_receive(:preceding_declaration_line).and_return(group_line_number)
           example_metadata.apply_condition(:line_number, group_line_number).should be_true
         end
 
         it "matches the example when the line_number is the example line number" do
-          world.should_receive(:preceding_example_or_group_line).and_return(example_line_number)
+          world.should_receive(:preceding_declaration_line).and_return(example_line_number)
           example_metadata.apply_condition(:line_number, example_line_number).should be_true
         end
         
         it "matches when the line number is between this example and the next" do
-          world.should_receive(:preceding_example_or_group_line).and_return(example_line_number)
+          world.should_receive(:preceding_declaration_line).and_return(example_line_number)
           example_metadata.apply_condition(:line_number, example_line_number + 1).should be_true
         end
         
         it "does not match when the line number matches the next example" do
-          world.should_receive(:preceding_example_or_group_line).and_return(example_line_number + 2)
+          world.should_receive(:preceding_declaration_line).and_return(example_line_number + 2)
           example_metadata.apply_condition(:line_number, example_line_number + 2).should be_false
         end
         

data/spec/rspec/core/pending_example_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-Rspec::Matchers.define :be_pending_with do |message|
+RSpec::Matchers.define :be_pending_with do |message|
   match do |example|
     example.metadata[:pending] && example.metadata[:execution_result][:pending_message] == message
   end
@@ -13,7 +13,7 @@ end
 describe "an example" do
   context "with no block" do
     it "is listed as pending with 'Not Yet Implemented'" do
-      group = Rspec::Core::ExampleGroup.describe('group') do
+      group = RSpec::Core::ExampleGroup.describe('group') do
         it "has no block" 
       end
       example = group.examples.first
@@ -24,7 +24,7 @@ describe "an example" do
 
   context "with no args" do
     it "is listed as pending with 'No reason given'" do
-      group = Rspec::Core::ExampleGroup.describe('group') do
+      group = RSpec::Core::ExampleGroup.describe('group') do
         it "does something" do
           pending
         end
@@ -37,7 +37,7 @@ describe "an example" do
 
   context "with a message" do
     it "is listed as pending with the supplied message" do
-      group = Rspec::Core::ExampleGroup.describe('group') do
+      group = RSpec::Core::ExampleGroup.describe('group') do
         it "does something" do
           pending("just because")
         end
@@ -51,7 +51,7 @@ describe "an example" do
   context "with a block" do
     context "that fails" do
       it "is listed as pending with the supplied message" do
-        group = Rspec::Core::ExampleGroup.describe('group') do
+        group = RSpec::Core::ExampleGroup.describe('group') do
           it "does something" do
             pending("just because") do
               3.should == 4
@@ -66,7 +66,7 @@ describe "an example" do
 
     context "that passes" do
       it "raises a PendingExampleFixedError" do
-        group = Rspec::Core::ExampleGroup.describe('group') do
+        group = RSpec::Core::ExampleGroup.describe('group') do
           it "does something" do
             pending("just because") do
               3.should == 3
@@ -77,7 +77,7 @@ describe "an example" do
         example.run(group.new, stub.as_null_object)
         example.metadata[:pending].should be_false
         example.metadata[:execution_result][:status].should == 'failed'
-        example.metadata[:execution_result][:exception_encountered].should be_a(Rspec::Core::PendingExampleFixedError)
+        example.metadata[:execution_result][:exception_encountered].should be_a(RSpec::Core::PendingExampleFixedError)
       end
     end
   end

data/spec/rspec/core/ruby_project_spec.rb

@@ -1,4 +1,4 @@
-module Rspec
+module RSpec
   module Core
     describe RubyProject do
 

data/spec/rspec/core/runner_spec.rb

@@ -1,11 +1,11 @@
 require 'spec_helper'
 
-describe Rspec::Core::Runner do
+describe RSpec::Core::Runner do
 
   describe 'reporter' do
 
     it 'should return the configured formatter' do
-      Rspec::Core::Runner.new.reporter.should == Rspec.configuration.formatter
+      RSpec::Core::Runner.new.reporter.should == RSpec.configuration.formatter
     end
 
   end  
@@ -13,15 +13,15 @@ describe Rspec::Core::Runner do
   describe 'at_exit' do
     
     it 'should set an at_exit hook if none is already set' do
-      Rspec::Core::Runner.stub!(:installed_at_exit?).and_return(false)
-      Rspec::Core::Runner.should_receive(:at_exit)
-      Rspec::Core::Runner.autorun
+      RSpec::Core::Runner.stub!(:installed_at_exit?).and_return(false)
+      RSpec::Core::Runner.should_receive(:at_exit)
+      RSpec::Core::Runner.autorun
     end
     
     it 'should 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.should_receive(:at_exit).never
-      Rspec::Core::Runner.autorun
+      RSpec::Core::Runner.stub!(:installed_at_exit?).and_return(true)
+      RSpec::Core::Runner.should_receive(:at_exit).never
+      RSpec::Core::Runner.autorun
     end
     
   end
@@ -29,6 +29,6 @@ describe Rspec::Core::Runner do
   describe 'placeholder' do
     
     # it "should "    
-    # Rspec::Core::Runner.new
+    # RSpec::Core::Runner.new
   end
 end

data/spec/rspec/core/shared_example_group_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Rspec::Core
+module RSpec::Core
 
   describe SharedExampleGroup do
 
@@ -27,7 +27,7 @@ module Rspec::Core
     describe "share_examples_for" do
 
       it "should capture the given name and block in the Worlds collection of shared example groups" do
-        Rspec::Core.world.shared_example_groups.should_receive(:[]=).with(:foo, anything)
+        RSpec.world.shared_example_groups.should_receive(:[]=).with(:foo, anything)
         share_examples_for(:foo) { }
       end
 
@@ -41,7 +41,7 @@ module Rspec::Core
           def self.class_helper; end
           def extra_helper; end
         }
-        Rspec::Core.world.stub(:shared_example_groups).and_return({ :shared_example_group => block })
+        RSpec.world.stub(:shared_example_groups).and_return({ :shared_example_group => block })
         group.it_should_behave_like :shared_example_group
         group.instance_methods.should  include('extra_helper')
         group.singleton_methods.should include('class_helper')

data/spec/rspec/core/subject_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-module Rspec::Core
+module RSpec::Core
 
   describe Subject do
 

data/spec/rspec/core/world_spec.rb

@@ -3,19 +3,18 @@ require 'spec_helper'
 class Bar; end
 class Foo; end
 
-module Rspec::Core
+module RSpec::Core
 
   describe World do
     
     before do
-      @world = Rspec::Core::World.new
-      Rspec::Core.stub(:world).and_return(@world)
+      @world = RSpec.world
     end
 
     describe "example_groups" do
     
       it "should contain all defined example groups" do
-        group = Rspec::Core::ExampleGroup.describe("group") {}
+        group = RSpec::Core::ExampleGroup.describe("group") {}
         @world.example_groups.should include(group)
       end
     
@@ -23,14 +22,14 @@ module Rspec::Core
     
     describe "applying inclusion filters" do
     
-      before(:all) do
+      before(:each) do
         options_1 = { :foo => 1, :color => 'blue', :feature => 'reporting' }
         options_2 = { :pending => true, :feature => 'reporting'  }
         options_3 = { :array => [1,2,3,4], :color => 'blue' }      
-        @bg1 = Rspec::Core::ExampleGroup.describe(Bar, "find group-1", options_1) { }
-        @bg2 = Rspec::Core::ExampleGroup.describe(Bar, "find group-2", options_2) { }
-        @bg3 = Rspec::Core::ExampleGroup.describe(Bar, "find group-3", options_3) { }
-        @bg4 = Rspec::Core::ExampleGroup.describe(Foo, "find these examples") do
+        @bg1 = RSpec::Core::ExampleGroup.describe(Bar, "find group-1", options_1) { }
+        @bg2 = RSpec::Core::ExampleGroup.describe(Bar, "find group-2", options_2) { }
+        @bg3 = RSpec::Core::ExampleGroup.describe(Bar, "find group-3", options_3) { }
+        @bg4 = RSpec::Core::ExampleGroup.describe(Foo, "find these examples") do
           it('I have no options') {}
           it("this is awesome", :awesome => true) {}
           it("this is too", :awesome => true) {}
@@ -117,36 +116,18 @@ module Rspec::Core
         @world.apply_exclusion_filters(group.examples, :name => /exclude/, "another_condition" => "foo").should == group.examples
         @world.apply_exclusion_filters(group.examples, :name => /exclude/, "another_condition" => "foo1").should == group.examples
       end
-      
     end
     
-    describe "filtering example groups" do
-      
-      it "should run matches" do
-        @group1 = ExampleGroup.describe(Bar, "find these examples") do
-          it('I have no options',       :color => :red, :awesome => true) {}
-          it("I also have no options",  :color => :red, :awesome => true) {}
-          it("not so awesome",          :color => :red, :awesome => false) {}
-        end
-        Rspec::Core.world.stub(:exclusion_filter).and_return({ :awesome => false })
-        Rspec::Core.world.stub(:filter).and_return({ :color => :red })
-        Rspec::Core.world.stub(:example_groups).and_return([@group1])
-        filtered_example_groups = @world.filtered_example_groups
-        filtered_example_groups.should == [@group1]
-        @group1.examples_to_run.should == @group1.examples[0..1]      
-      end
-      
-    end
 
-    describe "preceding_example_or_group_line" do
+    describe "preceding_declaration_line" do
       before(:each) do
         @group1_line = 10
         @group2_line = 20
         @group2_example1_line = 30
         @group2_example2_line = 40
         
-        @group1 = Rspec::Core::ExampleGroup.describe(Bar, "group-1") { }
-        @group2 = Rspec::Core::ExampleGroup.describe(Bar, "group-2") do
+        @group1 = RSpec::Core::ExampleGroup.describe(Bar, "group-1") { }
+        @group2 = RSpec::Core::ExampleGroup.describe(Bar, "group-2") do
           it('example 1') {}
           it("example 2") {}
         end
@@ -157,23 +138,23 @@ module Rspec::Core
       end
       
       it "should return nil if no example or group precedes the line" do 
-        @world.preceding_example_or_group_line(@group1_line-1).should == nil
+        @world.preceding_declaration_line(@group1_line-1).should == nil
       end
       
       it "should return the argument line number if a group starts on that line" do
-        @world.preceding_example_or_group_line(@group1_line).should == @group1_line
+        @world.preceding_declaration_line(@group1_line).should == @group1_line
       end
       
       it "should return the argument line number if an example starts on that line" do
-        @world.preceding_example_or_group_line(@group2_example1_line).should == @group2_example1_line
+        @world.preceding_declaration_line(@group2_example1_line).should == @group2_example1_line
       end
       
       it "should return line number of a group that immediately precedes the argument line" do
-        @world.preceding_example_or_group_line(@group2_line+1).should == @group2_line
+        @world.preceding_declaration_line(@group2_line+1).should == @group2_line
       end
       
       it "should return line number of an example that immediately precedes the argument line" do
-        @world.preceding_example_or_group_line(@group2_example1_line+1).should == @group2_example1_line        
+        @world.preceding_declaration_line(@group2_example1_line+1).should == @group2_example1_line        
       end
       
     end