rspec 1.2.2 → 1.2.3

data/spec/spec/matchers/matcher_methods_spec.rb

@@ -31,9 +31,6 @@ This module should provide the following methods, each of which returns a Matche
       it "have_at_most" do
         have_at_most(0).should be_an_instance_of(Have)
       end
-      it "include" do
-        include(:value).should be_an_instance_of(Include)
-      end
       it "raise_error" do
         raise_error.should be_an_instance_of(RaiseError)
         raise_error(NoMethodError).should be_an_instance_of(RaiseError)

data/spec/spec/matchers/matcher_spec.rb

@@ -28,6 +28,43 @@ module Spec
         end
       end
       
+      it "is not diffable by default" do
+        matcher = Spec::Matchers::Matcher.new(:name) do
+          match {|actual|}
+        end
+        matcher.matches?(0)
+        matcher.should_not be_diffable
+      end
+      
+      it "is diffable when told to be" do
+        matcher = Spec::Matchers::Matcher.new(:name) do
+          match {|actual|}
+          diffable
+        end
+        matcher.matches?(0)
+        matcher.should be_diffable
+      end
+      
+      it "provides expected" do
+        matcher = Spec::Matchers::Matcher.new(:name, 'expected string') do
+          match {|actual|}
+        end
+        
+        matcher.matches?('actual string')
+        
+        matcher.expected.should == ['expected string']
+      end
+      
+      it "provides actual" do
+        matcher = Spec::Matchers::Matcher.new(:name, 'expected string') do
+          match {|actual|}
+        end
+        
+        matcher.matches?('actual string')
+        
+        matcher.actual.should == 'actual string'
+      end
+      
       context "with overrides" do
         before(:each) do
           @matcher = Spec::Matchers::Matcher.new(:be_boolean, true) do |boolean|
@@ -143,6 +180,22 @@ module Spec
           @matcher.description.should == "matcher name 1, 2, 3, and 4"
         end
       end
+      
+      context "with helper methods" do
+        it "does something" do
+          matcher = Spec::Matchers::Matcher.new(:be_similar_to, [1,2,3]) do |sample|
+            match do |actual|
+              similar?(sample, actual)
+            end
+
+            def similar?(a, b)
+              a.sort == b.sort
+            end
+          end
+          
+          matcher.matches?([2,3,1]).should be_true
+        end
+      end
 
     end
   end

data/spec/spec/matchers/operator_matcher_spec.rb

@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-require 'spec/expectations/differs/default'
+require 'spec/runner/differs/default'
 
 describe "should ==" do
   

data/spec/spec/mocks/mock_spec.rb

@@ -575,5 +575,11 @@ module Spec
         second == first
       end
     end
+
+    describe "method_missing" do
+      it "should be private" do
+        Mock.private_instance_methods.should include("method_missing")
+      end
+    end
   end
 end

data/spec/spec/runner/configuration_spec.rb

@@ -5,6 +5,7 @@ module Spec
     describe Configuration do
       with_sandboxed_options do
         with_sandboxed_config do
+          
           describe "#mock_with" do
             it "should default mock framework to rspec" do
               config.mock_framework.should =~ /\/spec\/adapters\/mock_frameworks\/rspec$/
@@ -179,7 +180,7 @@ module Spec
               config.append_before(:all, :type => :special_child) do
                 order << :special_child_append_before_all
               end
-              config.append_before(:each) do
+              config.append_before do # default is :each
                 order << :append_before_each
               end
               config.append_before(:each, :type => :special) do
@@ -293,7 +294,16 @@ module Spec
                 :append__after_all
               ]
             end
+
+          end
+          
+          describe "#predicate_matchers (DEPRECATED)" do
+            it "is deprecated" do
+              Spec.should_receive(:deprecate)
+              config.predicate_matchers[:foo] = :bar?
+            end
           end
+
         end
       end
     end

data/spec/spec/runner/drb_command_line_spec.rb

@@ -6,13 +6,19 @@ module Spec
       describe DrbCommandLine do
 
         context "without server running" do
-          it "should print error when there is no running local server" do
+          it "prints error" do
             err = out = StringIO.new
             DrbCommandLine.run(OptionParser.parse(['--version'], err, out))
 
             err.rewind
             err.read.should =~ /No server is running/
           end
+          
+          it "returns nil" do
+            err = out = StringIO.new
+            result = DrbCommandLine.run(OptionParser.parse(['--version'], err, out))
+            result.should be_nil
+          end
         end    
 
         context "with server running" do
@@ -45,6 +51,12 @@ module Spec
             DRb.stop_service
           end
 
+          it "returns true" do
+            err = out = StringIO.new
+            result = DrbCommandLine.run(OptionParser.parse(['--version'], err, out))
+            result.should be_true
+          end
+
           it "should run against local server" do
             out = run_spec_via_druby(['--version'])
             out.should =~ /rspec \d+\.\d+\.\d+.*/n

data/spec/spec/runner/example_group_runner_spec.rb

@@ -22,12 +22,5 @@ module Spec
         end
       end
     end
-    
-    describe BehaviourRunner do
-      it "is DEPRECATED (use ExampleGroupRunner)" do
-        Kernel.should_receive(:warn).with(/DEPRECATED/)
-        BehaviourRunner.new(nil)
-      end
-    end
   end
 end

data/spec/spec/runner/formatter/base_formatter_spec.rb

@@ -4,19 +4,26 @@ module Spec
   module Runner
     module Formatter
       describe BaseFormatter do
-        subject {BaseFormatter.new(nil, nil)}
+        subject { BaseFormatter.new(nil,nil) }
+        it {should respond_to(:start                ).with(1).argument }
+        it {should respond_to(:example_group_started).with(1).argument }
+        it {should respond_to(:example_started      ).with(1).argument }
+        # -3 indicates that one of the arguments is optional, with a default
+        # value assigned. This is due to deprecated_pending_location. Once
+        # that is removed, this should be changed to 2.
+        it {should respond_to(:example_pending      ).with(-3).arguments}
+        it {should respond_to(:example_passed       ).with(1).argument }
+        it {should respond_to(:example_failed       ).with(3).arguments}
+        it {should respond_to(:start_dump           ).with(0).arguments}
+        it {should respond_to(:dump_failure         ).with(2).arguments}
+        it {should respond_to(:dump_summary         ).with(4).arguments}
+        it {should respond_to(:dump_pending         ).with(0).arguments}
+        it {should respond_to(:close                ).with(0).arguments}
         
-        it {should respond_to(:start            ).with(1).argument }
-        it {should respond_to(:add_example_group).with(1).argument }
-        it {should respond_to(:example_passed   ).with(1).argument }
-        it {should respond_to(:example_started  ).with(1).argument }
-        it {should respond_to(:example_failed   ).with(3).arguments}
-        it {should respond_to(:example_pending  ).with(3).arguments}
-        it {should respond_to(:start_dump       ).with(0).arguments}
-        it {should respond_to(:dump_failure     ).with(2).arguments}
-        it {should respond_to(:dump_summary     ).with(4).arguments}
-        it {should respond_to(:dump_pending     ).with(0).arguments}
-        it {should respond_to(:close            ).with(0).arguments}
+        it "deprecates add_example_group" do
+          Spec.should_receive(:deprecate)
+          subject.add_example_group(stub('example group'))
+        end
       end
     end
   end

data/spec/spec/runner/formatter/base_text_formatter_spec.rb

@@ -37,7 +37,7 @@ module Spec
           
           context "#colourise" do
             it "warns when subclasses call colourise" do
-              Kernel.should_receive(:warn).with(/DEPRECATED/)
+              Spec.should_receive(:deprecate)
               @formatter.method_that_class_colourise('this message', @failure)
             end
             
@@ -49,7 +49,7 @@ module Spec
           
           context "#magenta" do
             it "warns when subclasses call magenta" do
-              Kernel.should_receive(:warn).with(/DEPRECATED/)
+              Spec.should_receive(:deprecate).with(/#magenta/)
               @formatter.method_that_class_magenta('this message')
             end
 

data/spec/spec/runner/formatter/failing_example_groups_formatter_spec.rb

@@ -15,9 +15,9 @@ module Spec
         end
         
         it "should add example name for each failure" do
-          formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(Class.new(::Spec::Example::ExampleGroupDouble).describe("b 1")))
+          formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(Class.new(::Spec::Example::ExampleGroupDouble).describe("b 1")))
           formatter.example_failed("e 1", nil, Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
-          formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(Class.new(::Spec::Example::ExampleGroupDouble).describe("b 2")))
+          formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(Class.new(::Spec::Example::ExampleGroupDouble).describe("b 2")))
           formatter.example_failed("e 2", nil, Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
           formatter.example_failed("e 3", nil, Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
           io.string.should include("b 1")
@@ -29,13 +29,13 @@ module Spec
           child_example_group = Class.new(parent_example_group).describe("#child_method")
           grand_child_example_group = Class.new(child_example_group).describe("GrandChild")
 
-          formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(grand_child_example_group))
+          formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(grand_child_example_group))
           formatter.example_failed("failure", nil, ::Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
           io.string.should == "Parent#child_method GrandChild\n"
         end
 
         it "should remove druby url, which is used by Spec::Distributed" do
-          @formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(Class.new(::Spec::Example::ExampleGroupDouble).describe("something something (druby://99.99.99.99:99)")))
+          @formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(Class.new(::Spec::Example::ExampleGroupDouble).describe("something something (druby://99.99.99.99:99)")))
           @formatter.example_failed("e 1", nil, ::Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
           io.string.should == "something something\n"
         end

data/spec/spec/runner/formatter/failing_examples_formatter_spec.rb

@@ -15,9 +15,9 @@ module Spec
           example_group_1 = Class.new(::Spec::Example::ExampleGroupDouble).describe("A")
           example_group_2 = Class.new(example_group_1).describe("B")
 
-          @formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group_1))
+          @formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(example_group_1))
           @formatter.example_failed(example_group_1.it("a1"){}, nil, ::Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
-          @formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group_2))
+          @formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(example_group_2))
           @formatter.example_failed(example_group_2.it("b2"){}, nil, ::Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
           @formatter.example_failed(example_group_2.it("b3"){}, nil, ::Spec::Runner::Reporter::Failure.new("g", nil, RuntimeError.new))
           @io.string.should eql(<<-EOF

data/spec/spec/runner/formatter/html_formatted-1.8.6.html

@@ -192,10 +192,10 @@ a {
       <div class="failure" id="failure_1">
         <div class="message"><pre>Mock 'poke me' expected :poke with (any args) once, but received it 0 times</pre></div>
         <div class="backtrace"><pre>./examples/failing/mocking_example.rb:13:
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/../spec_helper.rb:43:in `run_with'
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:26:
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:22:in `chdir'
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:22:</pre></div>
+./spec/spec/runner/formatter/../../../spec_helper.rb:43:in `run_with'
+./spec/spec/runner/formatter/html_formatter_spec.rb:38:
+./spec/spec/runner/formatter/html_formatter_spec.rb:26:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:26:</pre></div>
     <pre class="ruby"><code><span class="linenum">11</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should fail when expected message not received</span><span class="punct">&quot;</span> <span class="keyword">do</span>
 <span class="linenum">12</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">poke me</span><span class="punct">&quot;)</span>
 <span class="offending"><span class="linenum">13</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:poke</span><span class="punct">)</span></span>
@@ -209,10 +209,10 @@ a {
       <div class="failure" id="failure_2">
         <div class="message"><pre>Mock 'one two three' received :three out of order</pre></div>
         <div class="backtrace"><pre>./examples/failing/mocking_example.rb:22:
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/../spec_helper.rb:43:in `run_with'
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:26:
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:22:in `chdir'
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:22:</pre></div>
+./spec/spec/runner/formatter/../../../spec_helper.rb:43:in `run_with'
+./spec/spec/runner/formatter/html_formatter_spec.rb:38:
+./spec/spec/runner/formatter/html_formatter_spec.rb:26:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:26:</pre></div>
     <pre class="ruby"><code><span class="linenum">20</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_receive</span><span class="punct">(</span><span class="symbol">:three</span><span class="punct">).</span><span class="ident">ordered</span>
 <span class="linenum">21</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">one</span>
 <span class="offending"><span class="linenum">22</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">three</span></span>
@@ -226,10 +226,10 @@ a {
       <div class="failure" id="failure_3">
         <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (no args) 0 times, but received it once</pre></div>
         <div class="backtrace"><pre>./examples/failing/mocking_example.rb:29:
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/../spec_helper.rb:43:in `run_with'
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:26:
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:22:in `chdir'
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:22:</pre></div>
+./spec/spec/runner/formatter/../../../spec_helper.rb:43:in `run_with'
+./spec/spec/runner/formatter/html_formatter_spec.rb:38:
+./spec/spec/runner/formatter/html_formatter_spec.rb:26:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:26:</pre></div>
     <pre class="ruby"><code><span class="linenum">27</span>    <span class="ident">mock</span> <span class="punct">=</span> <span class="ident">mock</span><span class="punct">(&quot;</span><span class="string">don't talk to me</span><span class="punct">&quot;)</span>
 <span class="linenum">28</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">should_not_receive</span><span class="punct">(</span><span class="symbol">:any_message_at_all</span><span class="punct">)</span>
 <span class="offending"><span class="linenum">29</span>    <span class="ident">mock</span><span class="punct">.</span><span class="ident">any_message_at_all</span></span>
@@ -242,10 +242,10 @@ a {
       <div class="failure" id="failure_4">
         <div class="message"><pre>Expected pending 'here is the bug' to fail. No Error was raised.</pre></div>
         <div class="backtrace"><pre>./examples/failing/mocking_example.rb:33:
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/../spec_helper.rb:43:in `run_with'
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:26:
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:22:in `chdir'
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:22:</pre></div>
+./spec/spec/runner/formatter/../../../spec_helper.rb:43:in `run_with'
+./spec/spec/runner/formatter/html_formatter_spec.rb:38:
+./spec/spec/runner/formatter/html_formatter_spec.rb:26:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:26:</pre></div>
     <pre class="ruby"><code><span class="linenum">31</span>
 <span class="linenum">32</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">has a bug we need to fix</span><span class="punct">&quot;</span> <span class="keyword">do</span>
 <span class="offending"><span class="linenum">33</span>    <span class="ident">pending</span> <span class="punct">&quot;</span><span class="string">here is the bug</span><span class="punct">&quot;</span> <span class="keyword">do</span></span>
@@ -273,10 +273,10 @@ Diff:
  framework for Ruby
 </pre></div>
         <div class="backtrace"><pre>./examples/failing/diffing_spec.rb:13:
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/../spec_helper.rb:43:in `run_with'
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:26:
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:22:in `chdir'
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:22:</pre></div>
+./spec/spec/runner/formatter/../../../spec_helper.rb:43:in `run_with'
+./spec/spec/runner/formatter/html_formatter_spec.rb:38:
+./spec/spec/runner/formatter/html_formatter_spec.rb:26:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:26:</pre></div>
     <pre class="ruby"><code><span class="linenum">11</span><span class="ident">framework</span> <span class="keyword">for</span> <span class="constant">Ruby</span>
 <span class="linenum">12</span><span class="constant">EOF</span>
 <span class="offending"><span class="linenum">13</span>    <span class="ident">usa</span><span class="punct">.</span><span class="ident">should</span> <span class="punct">==</span> <span class="ident">uk</span></span>
@@ -287,28 +287,25 @@ Diff:
     <dd class="spec failed">
       <span class="failed_spec_name">should print diff of different objects' pretty representation</span>
       <div class="failure" id="failure_6">
-        <div class="message"><pre>expected &lt;Animal
+        <div class="message"><pre>
+expected &lt;Animal
 name=bob,
 species=tortoise
 &gt;
-, got &lt;Animal
+
+     got &lt;Animal
 name=bob,
 species=giraffe
 &gt;
- (using .eql?)
-Diff:
-@@ -1,5 +1,5 @@
- &lt;Animal
- name=bob,
--species=tortoise
-+species=giraffe
- &gt;
+
+
+(compared using eql?)
 </pre></div>
         <div class="backtrace"><pre>./examples/failing/diffing_spec.rb:34:
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/../spec_helper.rb:43:in `run_with'
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:26:
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:22:in `chdir'
-/Users/david/projects/ruby/rspec-dev/example_rails_app/vendor/plugins/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:22:</pre></div>
+./spec/spec/runner/formatter/../../../spec_helper.rb:43:in `run_with'
+./spec/spec/runner/formatter/html_formatter_spec.rb:38:
+./spec/spec/runner/formatter/html_formatter_spec.rb:26:in `chdir'
+./spec/spec/runner/formatter/html_formatter_spec.rb:26:</pre></div>
     <pre class="ruby"><code><span class="linenum">32</span>    <span class="ident">expected</span> <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">giraffe</span><span class="punct">&quot;</span>
 <span class="linenum">33</span>    <span class="ident">actual</span>   <span class="punct">=</span> <span class="constant">Animal</span><span class="punct">.</span><span class="ident">new</span> <span class="punct">&quot;</span><span class="string">bob</span><span class="punct">&quot;,</span> <span class="punct">&quot;</span><span class="string">tortoise</span><span class="punct">&quot;</span>
 <span class="offending"><span class="linenum">34</span>    <span class="ident">expected</span><span class="punct">.</span><span class="ident">should</span> <span class="ident">eql</span><span class="punct">(</span><span class="ident">actual</span><span class="punct">)</span></span>

data/spec/spec/runner/formatter/html_formatter_spec.rb

@@ -10,6 +10,7 @@ module Spec
     module Formatter
       describe HtmlFormatter do
         attr_reader :root, :expected_file, :expected_html
+          
         before do
           @root = File.expand_path("#{File.dirname(__FILE__)}/../../../..")
           suffix = jruby? ? '-jruby' : ''
@@ -104,6 +105,25 @@ module Spec
             html.should =~ /This was a dry-run/m
           end
         end
+
+        it "should have method_missing as private" do
+          HtmlFormatter.private_instance_methods.should include("method_missing")
+        end
+
+        it "should respond_to? all messages" do
+          formatter = HtmlFormatter.new({ }, StringIO.new)
+          formatter.should respond_to(:just_about_anything)
+        end
+
+        it "should respond_to? anything, when given the private flag" do
+          formatter = HtmlFormatter.new({ }, StringIO.new)
+          formatter.respond_to?(:method_missing, true).should be_true
+        end
+
+        it "should not respond_to? method_missing (because it's private)" do
+          formatter = HtmlFormatter.new({ }, StringIO.new)
+          formatter.respond_to?(:method_missing).should be_false
+        end
       end
     end
   end

data/spec/spec/runner/formatter/nested_text_formatter_spec.rb

@@ -17,12 +17,12 @@ module Spec
           end
 
           describe "where ExampleGroup has no superclass with a description" do
-            def add_example_group
-              formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group))
+            def example_group_started
+              formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(example_group))
             end
 
             before do
-              add_example_group
+              example_group_started
             end
 
             describe "#dump_summary" do
@@ -49,7 +49,7 @@ OUT
               end
             end
 
-            describe "#add_example_group" do
+            describe "#example_group_started" do
               describe "when ExampleGroup has a nested description" do
                 
                 describe "when ExampleGroup has no parents with nested description" do
@@ -60,13 +60,13 @@ OUT
 
                 describe "when ExampleGroup has one parent with nested description" do
                   attr_reader :child_example_group
-                  def add_example_group
+                  def example_group_started
                     @child_example_group = Class.new(example_group).describe("Child ExampleGroup")
                   end
 
                   describe "and parent ExampleGroups have not been printed" do
                     before do
-                      formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(child_example_group))
+                      formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(child_example_group))
                     end
 
                     it "should push ExampleGroup name with two spaces of indentation" do
@@ -79,9 +79,9 @@ OUT
 
                   describe "and parent ExampleGroups have been printed" do
                     before do
-                      formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group))
+                      formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(example_group))
                       io.string = ""
-                      formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(child_example_group))
+                      formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(child_example_group))
                     end
 
                     it "should print only the indented ExampleGroup" do
@@ -94,14 +94,14 @@ OUT
 
                 describe "when ExampleGroup has two parents with nested description" do
                   attr_reader :child_example_group, :grand_child_example_group
-                  def add_example_group
+                  def example_group_started
                     @child_example_group = Class.new(example_group).describe("Child ExampleGroup")
                     @grand_child_example_group = Class.new(child_example_group).describe("GrandChild ExampleGroup")
                   end
 
                   describe "and parent ExampleGroups have not been printed" do
                     before do
-                      formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(grand_child_example_group))
+                      formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(grand_child_example_group))
                       
                     end
 
@@ -116,9 +116,9 @@ OUT
 
                   describe "and parent ExampleGroups have been printed" do
                     before do
-                      formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(child_example_group))
+                      formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(child_example_group))
                       io.string = ""
-                      formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(grand_child_example_group))
+                      formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(grand_child_example_group))
                     end
 
                     it "should print only the indented ExampleGroup" do
@@ -134,9 +134,9 @@ OUT
                 attr_reader :child_example_group
 
                 describe "and parent ExampleGroups have not been printed" do
-                  def add_example_group
+                  def example_group_started
                     @child_example_group = Class.new(example_group)
-                    formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(child_example_group))
+                    formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(child_example_group))
                   end
 
                   it "should render only the parent ExampleGroup" do
@@ -147,11 +147,11 @@ OUT
                 end
 
                 describe "and parent ExampleGroups have been printed" do
-                  def add_example_group
+                  def example_group_started
                     @child_example_group = Class.new(example_group)
-                    formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(example_group))
+                    formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(example_group))
                     io.string = ""
-                    formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(child_example_group))
+                    formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(child_example_group))
                   end
 
                   it "should not render anything" do
@@ -161,7 +161,7 @@ OUT
               end
 
               describe "when ExampleGroup nested description is blank" do
-                def add_example_group
+                def example_group_started
                   example_group.set_description
                   super
                 end
@@ -206,10 +206,10 @@ OUT
               describe "where ExampleGroup has two superclasses with a description" do
                 attr_reader :child_example_group, :grand_child_example_group
 
-                def add_example_group
+                def example_group_started
                   @child_example_group = Class.new(example_group).describe("Child ExampleGroup")
                   @grand_child_example_group = Class.new(child_example_group).describe("GrandChild ExampleGroup")
-                  formatter.add_example_group(Spec::Example::ExampleGroupProxy.new(grand_child_example_group))
+                  formatter.example_group_started(Spec::Example::ExampleGroupProxy.new(grand_child_example_group))
                 end
 
                 describe "when having an error" do