rspec 0.8.2 → 0.9.0

data/spec/spec/runner/reporter_spec.rb

@@ -1,126 +1,135 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
-module Runner
-context "Reporter" do
-    setup do
+  module Runner
+    
+    module ReporterSpecHelper
+      def setup
         @io = StringIO.new
-        @backtrace_tweaker = Spec::Mocks::Mock.new("backtrace tweaker", {
-          :auto_verify => false
-        })
-        @formatter = Spec::Mocks::Mock.new("formatter", {
-          :auto_verify => false
-        })
-        @reporter = Reporter.new(@formatter, @backtrace_tweaker)
-      
-    end
-    specify "should account for context in stats" do
-        @formatter.should_receive(:add_context).with("context", true)
-        @reporter.add_context("context")
-      
-    end
-    specify "should account for spec and error in stats for pass" do
-        @formatter.should_receive(:add_context)
-        @formatter.should_receive(:spec_started).with("spec")
-        @formatter.should_receive(:spec_failed).with("spec", 1, failure)
-        @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:dump_failure).with(1, :anything)
-        @formatter.should_receive(:dump_summary).with(:anything, 1, 1)
-        @backtrace_tweaker.should_receive(:tweak_backtrace)
-        @reporter.add_context("context")
-        @reporter.spec_started("spec")
-        @reporter.spec_finished("spec", RuntimeError.new)
-        @reporter.dump
-      
-    end
-    specify "should account for spec in stats for pass" do
-        @formatter.should_receive(:spec_started)
-        @formatter.should_receive(:spec_passed)
-        @formatter.should_receive(:start_dump)
-        @formatter.should_receive(:dump_summary).with(:anything, 1, 0)
-        @reporter.spec_started("spec")
-        @reporter.spec_finished("spec")
-        @reporter.dump
-      
+        @backtrace_tweaker = stub("backtrace tweaker", :tweak_backtrace => nil)
+        @formatter = mock("formatter")
+        @reporter = Reporter.new([@formatter], @backtrace_tweaker)
+      end
+
+      def failure
+        Mocks::DuckTypeArgConstraint.new(:header, :exception)
+      end
     end
-    specify "should delegate to backtrace tweaker" do
-        @formatter.should_receive(:add_context)
-        @formatter.should_receive(:spec_failed)
-        @backtrace_tweaker.should_receive(:tweak_backtrace)
-        @reporter.add_context("context")
-        @reporter.spec_finished("spec", RuntimeError.new)
-        @backtrace_tweaker.__verify
+    
+    describe Reporter do
+      include ReporterSpecHelper
+      before(:each) {setup}
       
-    end
-    specify "should handle multiple contexts with same name" do
-        @formatter.should_receive(:add_context).exactly(3).times
-        @formatter.should_receive(:spec_started).exactly(3).times
-        @formatter.should_receive(:spec_passed).exactly(3).times
+      it "should tell formatter when behaviour is added" do
+        @formatter.should_receive(:add_behaviour).with("behaviour")
+        @reporter.add_behaviour("behaviour")
+      end
+
+      it "should handle multiple behaviours with same name" do
+        @formatter.should_receive(:add_behaviour).exactly(3).times
+        @formatter.should_receive(:example_started).exactly(3).times
+        @formatter.should_receive(:example_passed).exactly(3).times
         @formatter.should_receive(:start_dump)
         @formatter.should_receive(:dump_summary).with(:anything, 3, 0)
-        @reporter.add_context("context")
-        @reporter.spec_started("spec 1")
-        @reporter.spec_finished("spec 1")
-        @reporter.add_context("context")
-        @reporter.spec_started("spec 2")
-        @reporter.spec_finished("spec 2")
-        @reporter.add_context("context")
-        @reporter.spec_started("spec 3")
-        @reporter.spec_finished("spec 3")
+        @reporter.add_behaviour("behaviour")
+        @reporter.example_started("spec 1")
+        @reporter.example_finished("spec 1")
+        @reporter.add_behaviour("behaviour")
+        @reporter.example_started("spec 2")
+        @reporter.example_finished("spec 2")
+        @reporter.add_behaviour("behaviour")
+        @reporter.example_started("spec 3")
+        @reporter.example_finished("spec 3")
         @reporter.dump
-      
-    end
-    specify "should handle multiple specs same name" do
-      
+      end
+
+      it "should handle multiple examples with the same name" do
         error=RuntimeError.new
-        @formatter.should_receive(:add_context).exactly(2).times
-        @formatter.should_receive(:spec_started).with("spec").exactly(4).times
-        @formatter.should_receive(:spec_passed).with("spec").exactly(2).times
-        @formatter.should_receive(:spec_failed).with("spec", 1, failure)
-        @formatter.should_receive(:spec_failed).with("spec", 2, failure)
+        @formatter.should_receive(:add_behaviour).exactly(2).times
+        @formatter.should_receive(:example_passed).with("example").exactly(2).times
+        @formatter.should_receive(:example_failed).with("example", 1, failure)
+        @formatter.should_receive(:example_failed).with("example", 2, failure)
         @formatter.should_receive(:dump_failure).exactly(2).times
         @formatter.should_receive(:start_dump)
         @formatter.should_receive(:dump_summary).with(:anything, 4, 2)
-        @backtrace_tweaker.should_receive(:tweak_backtrace)
-        @reporter.add_context("context")
-        @reporter.spec_started("spec")
-        @reporter.spec_finished("spec")
-        @reporter.spec_started("spec")
-        @reporter.spec_finished("spec", error)
-        @reporter.add_context("context")
-        @reporter.spec_started("spec")
-        @reporter.spec_finished("spec")
-        @reporter.spec_started("spec")
-        @reporter.spec_finished("spec", error)
+        @backtrace_tweaker.should_receive(:tweak_backtrace).twice
+        @reporter.add_behaviour("behaviour")
+        @reporter.example_finished("example")
+        @reporter.example_finished("example", error)
+        @reporter.add_behaviour("behaviour")
+        @reporter.example_finished("example")
+        @reporter.example_finished("example", error)
         @reporter.dump
-      
-    end
-    specify "should push context to formatter" do
-        @formatter.should_receive(:add_context).never
-        @reporter.add_context("context")
-      
-    end
-    specify "should push stats to reporter even with no data" do
+      end
+
+      it "should push stats to formatter even with no data" do
         @formatter.should_receive(:start_dump)
         @formatter.should_receive(:dump_summary).with(:anything, 0, 0)
         @reporter.dump
+      end
       
-    end
-    specify "should push time to reporter" do
+      it "should push time to formatter" do
         @formatter.should_receive(:start).with(5)
         @formatter.should_receive(:start_dump)
         @formatter.should_receive(:dump_summary) do |time, a, b|
-          time.to_s.should_match(/[0-9].[0-9|e|-]+/)
+          time.to_s.should match(/[0-9].[0-9|e|-]+/)
         end
         @reporter.start(5)
         @reporter.end
         @reporter.dump
+      end
+    end
+    
+    describe Reporter, " reporting one passing example" do
+      include ReporterSpecHelper
+      before(:each) {setup}
+
+      it "should tell formatter example passed" do
+        @formatter.should_receive(:example_passed)
+        @reporter.example_finished("example")
+      end
       
+      it "should not delegate to backtrace tweaker" do
+        @formatter.should_receive(:example_passed)
+        @backtrace_tweaker.should_not_receive(:tweak_backtrace)
+        @reporter.example_finished("example")
+      end
+
+      it "should account for passing example in stats" do
+        @formatter.should_receive(:example_passed)
+        @formatter.should_receive(:start_dump)
+        @formatter.should_receive(:dump_summary).with(:anything, 1, 0)
+        @reporter.example_finished("example")
+        @reporter.dump
+      end
     end
-    def failure
-      Mocks::DuckTypeArgConstraint.new(:header, :exception)
+
+    describe Reporter, " reporting one failing example" do
+      include ReporterSpecHelper
+      before(:each) {setup}
+
+      it "should tell formatter that example failed" do
+        @formatter.should_receive(:example_failed)
+        @reporter.example_finished("example", RuntimeError.new)
+      end
+      
+      it "should delegate to backtrace tweaker" do
+        @formatter.should_receive(:example_failed)
+        @backtrace_tweaker.should_receive(:tweak_backtrace)
+        @reporter.example_finished("spec", RuntimeError.new)
+      end
+
+      it "should account for failing example in stats" do
+        @formatter.should_receive(:add_behaviour)
+        @formatter.should_receive(:example_failed).with("example", 1, failure)
+        @formatter.should_receive(:start_dump)
+        @formatter.should_receive(:dump_failure).with(1, :anything)
+        @formatter.should_receive(:dump_summary).with(:anything, 1, 1)
+        @reporter.add_behaviour("behaviour")
+        @reporter.example_finished("example", RuntimeError.new)
+        @reporter.dump
+      end
+      
     end
-  
-end
-end
+  end
 end

data/spec/spec/runner/spec_matcher_spec.rb

@@ -1,8 +1,8 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
-  module Runner
-    module SpecMatcherSpecHelper
+  module DSL
+    module ExampleMatcherSpecHelper
       class MatchDescription
         def initialize(description)
           @description = description
@@ -25,81 +25,76 @@ module Spec
       end
     end
         
-    context "SpecMatcher" do
-      include SpecMatcherSpecHelper
+    describe ExampleMatcher do
+      include ExampleMatcherSpecHelper
       
-      specify "should match correct context and spec" do
-        matcher=SpecMatcher.new("context", "spec")
-        matcher.should match_description("context spec")
+      it "should match correct behaviour and example" do
+        matcher=ExampleMatcher.new("behaviour", "example")
+        matcher.should match_description("behaviour example")
       end
       
-      specify "should not match wrong spec" do
-        matcher=SpecMatcher.new("context", "other spec")
-        matcher.should_not match_description("context spec")
+      it "should not match wrong example" do
+        matcher=ExampleMatcher.new("behaviour", "other example")
+        matcher.should_not match_description("behaviour example")
       end
       
-      specify "should not match wrong context" do
-        matcher=SpecMatcher.new("other context", "spec")
-        matcher.should_not match_description("context spec")
+      it "should not match wrong behaviour" do
+        matcher=ExampleMatcher.new("other behaviour", "example")
+        matcher.should_not match_description("behaviour example")
       end
       
-      specify "should match spec only" do
-        matcher=SpecMatcher.new("context", "spec")
-        matcher.should match_description("spec")
+      it "should match example only" do
+        matcher=ExampleMatcher.new("behaviour", "example")
+        matcher.should match_description("example")
       end
       
-      specify "should match context only" do
-        matcher=SpecMatcher.new("context", "spec")
-        matcher.should match_description("context")
+      it "should match behaviour only" do
+        matcher=ExampleMatcher.new("behaviour", "example")
+        matcher.should match_description("behaviour")
       end
       
-      specify "should escape regexp chars" do
-        matcher=SpecMatcher.new("(con|text)", "[spec]")
+      it "should escape regexp chars" do
+        matcher=ExampleMatcher.new("(con|text)", "[example]")
         matcher.should_not match_description("con p")
       end
       
-      # specify "should match context only" do
-      #   matcher=SpecMatcher.new("context", "a context")
-      #   matcher.should match_description("a context")
-      # end
-      # 
-      # specify "should match spec only" do
-      #   matcher=SpecMatcher.new("with a spec", "a context")
-      #   matcher.should match_description("with a spec")
-      # end
+      it "should match when behaviour is modularized" do
+        matcher=ExampleMatcher.new("MyModule::MyClass", "example")
+        matcher.should match_description("MyClass example")
+      end
       
-      # specify "should match with regexp reserved (characters) in the spec" do
-      #   matcher=SpecMatcher.new("with ([#]) a spec", "a context")
+      # it "should match with regexp reserved (characters) in the example" do
+      #   matcher=ExampleMatcher.new("with ([#]) an example", "a context")
       #   matcher.should match_description("a context")
-      #   matcher.should match_description("with ([#]) a spec")
-      #   matcher.should match_description("a context with ([#]) a spec")
+      #   matcher.should match_description("with ([#]) an example")
+      #   matcher.should match_description("a context with ([#]) an example")
       # end
       # 
-      # specify "should match with regexp reserved (characters) in the context" do
-      #   matcher=SpecMatcher.new("with a spec", "a ([#]) context")
-      #   matcher.should match_description("a ([#]) context with a spec")
-      #   matcher.should match_description("a ([#]) context with a spec")
-      #   matcher.should match_description("a ([#]) context with a spec")
+      # it "should match with regexp reserved (characters) in the context" do
+      #   matcher=ExampleMatcher.new("with an example", "a ([#]) context")
+      #   matcher.should match_description("a ([#]) context with an example")
+      #   matcher.should match_description("a ([#]) context with an example")
+      #   matcher.should match_description("a ([#]) context with an example")
       # end
       
-      # specify "should not match wrong spec only" do
-      #   matcher=SpecMatcher.new("with another spec", "a context")
-      #   matcher.should_not match_description("with a spec")
+      # it "should not match wrong example only" do
+      #   matcher=ExampleMatcher.new("with another example", "a context")
+      #   matcher.should_not match_description("with an example")
       # end
       # 
-      # specify "should not match wrong context" do
-      #   matcher=SpecMatcher.new("another context with a spec", "a context")
-      #   matcher.should_not match_description("with a spec")
+      # it "should not match wrong context" do
+      #   matcher=ExampleMatcher.new("another context with an example", "a context")
+      #   matcher.should_not match_description("with an example")
       # end
       # 
-      # specify "should not match wrong context only" do
-      #   matcher=SpecMatcher.new("another context", "a context")
-      #   matcher.should_not match_description("with a spec")
+      # it "should not match wrong context only" do
+      #   matcher=ExampleMatcher.new("another context", "a context")
+      #   matcher.should_not match_description("with an example")
       # end
       # 
-      # specify "should not match wrong spec" do
-      #   matcher=SpecMatcher.new("a context with another spec", "a context")
-      #   matcher.should_not match_description("with a spec")
+      # it "should not match wrong example" do
+      #   matcher=ExampleMatcher.new("a context with another example", "a context")
+      #   matcher.should_not match_description("with an example")
       # end
       
     end

data/spec/spec/runner/spec_parser_spec.rb

@@ -1,37 +1,93 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-context "c" do
+describe "c" do
 
-  specify "1" do
+  it "1" do
   end
 
-  specify "2" do
+  it "2" do
   end
 
 end
 
-context "SpecParser" do
-  setup do
+describe "d" do
+
+  it "3" do
+  end
+
+  it "4" do
+  end
+
+end
+
+class SpecParserSubject
+end
+
+describe SpecParserSubject do
+  
+  it "5" do
+  end
+  
+end
+
+describe SpecParserSubject, " described" do
+  
+  it "6" do
+  end
+  
+end
+
+describe "SpecParser" do
+  before(:each) do
     @p = Spec::Runner::SpecParser.new
   end
 
-  specify "should find spec name at same line" do
-    @p.spec_name_for(File.open(__FILE__), 5).should_eql "c 1"
+  it "should find spec name for 'specify' at same line" do
+    @p.spec_name_for(File.open(__FILE__), 5).should == "c 1"
+  end
+
+  it "should find spec name for 'specify' at end of spec line" do
+    @p.spec_name_for(File.open(__FILE__), 6).should == "c 1"
   end
 
-  specify "should find spec name at end of spec line" do
-    @p.spec_name_for(File.open(__FILE__), 6).should_eql "c 1"
+  it "should find context for 'context' above all specs" do
+    @p.spec_name_for(File.open(__FILE__), 4).should == "c"
   end
 
-  specify "should find context name above all specs" do
-    @p.spec_name_for(File.open(__FILE__), 4).should_eql "c"
+  it "should find spec name for 'it' at same line" do
+    @p.spec_name_for(File.open(__FILE__), 15).should == "d 3"
   end
 
-#  specify "should find context name between specs" do
-#    @p.spec_name_for(File.open(__FILE__), 7).should_eql "c"
-#  end
+  it "should find spec name for 'it' at end of spec line" do
+    @p.spec_name_for(File.open(__FILE__), 16).should == "d 3"
+  end
+
+  it "should find context for 'describe' above all specs" do
+    @p.spec_name_for(File.open(__FILE__), 14).should == "d"
+  end
 
-  specify "should find nothing outside a context" do
-    @p.spec_name_for(File.open(__FILE__), 2).should_be_nil
+ it "should find nearest example name between examples" do
+   @p.spec_name_for(File.open(__FILE__), 7).should == "c 1"
+ end
+
+  it "should find nothing outside a context" do
+    @p.spec_name_for(File.open(__FILE__), 2).should be_nil
+  end
+  
+  it "should find context name for type" do
+    @p.spec_name_for(File.open(__FILE__), 26).should == "SpecParserSubject"
+  end
+  
+  it "should find context and spec name for type" do
+    @p.spec_name_for(File.open(__FILE__), 28).should == "SpecParserSubject 5"
+  end
+
+  it "should find context and description for type" do
+    @p.spec_name_for(File.open(__FILE__), 33).should == "SpecParserSubject described"
+  end
+  
+  it "should find context and description and example for type" do
+    @p.spec_name_for(File.open(__FILE__), 36).should == "SpecParserSubject described 6"
   end
+  
 end