rspec-core 2.0.1 → 2.1.0

data/spec/rspec/core/formatters/text_mate_formatted-1.9.2.html

@@ -212,22 +212,18 @@ a {
       <span class="failed_spec_name">fails</span>
       <div class="failure" id="failure_0">
         <div class="message"><pre>RSpec::Core::PendingExampleFixedError</pre></div>
-        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=19">./spec/rspec/core/resources/formatter_specs.rb:19</a> :in `block (3 levels) in <top (required)>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=24">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:24</a> :in `block (2 levels) in <module:Formatters>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `block (5 levels) in <module:Formatters>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `open'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `block (4 levels) in <module:Formatters>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `chdir'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `block (3 levels) in <module:Formatters>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/spec_helper.rb&line=71">./spec/spec_helper.rb:71</a> :in `block (3 levels) in <top (required)>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/spec_helper.rb&line=45">./spec/spec_helper.rb:45</a> :in `instance_eval'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/spec_helper.rb&line=45">./spec/spec_helper.rb:45</a> :in `sandboxed'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/spec_helper.rb&line=71">./spec/spec_helper.rb:71</a> :in `block (2 levels) in <top (required)>'</pre></div>
-    <pre class="ruby"><code><span class="linenum">11</span>          <span class="keyword">rescue</span> <span class="constant">Exception</span> <span class="punct">=&gt;</span> <span class="ident">e</span>
-<span class="linenum">12</span>          <span class="keyword">end</span>
-<span class="offending"><span class="linenum">13</span>          <span class="keyword">raise</span> <span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Core</span><span class="punct">::</span><span class="constant">PendingExampleFixedError</span><span class="punct">.</span><span class="ident">new</span> <span class="keyword">if</span> <span class="ident">result</span></span>
-<span class="linenum">14</span>        <span class="keyword">end</span>
-<span class="linenum">15</span>        <span class="ident">throw</span> <span class="symbol">:pending_declared_in_example</span><span class="punct">,</span> <span class="ident">message</span></code></pre>
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=18">./spec/rspec/core/resources/formatter_specs.rb:18</a> :in `block (3 levels) in <top (required)>'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=24">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:24</a> :in `block (2 levels) in <module:Formatters>'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `block (5 levels) in <module:Formatters>'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `open'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `block (4 levels) in <module:Formatters>'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `block (3 levels) in <module:Formatters>'</pre></div>
+    <pre class="ruby"><code><span class="linenum">20</span>          <span class="keyword">rescue</span> <span class="constant">Exception</span> <span class="punct">=&gt;</span> <span class="ident">e</span>
+<span class="linenum">21</span>          <span class="keyword">end</span>
+<span class="offending"><span class="linenum">22</span>          <span class="keyword">raise</span> <span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Core</span><span class="punct">::</span><span class="constant">PendingExampleFixedError</span><span class="punct">.</span><span class="ident">new</span> <span class="keyword">if</span> <span class="ident">result</span></span>
+<span class="linenum">23</span>        <span class="keyword">end</span>
+<span class="linenum">24</span>        <span class="ident">throw</span> <span class="symbol">:pending_declared_in_example</span><span class="punct">,</span> <span class="ident">message</span></code></pre>
       </div>
     </dd>
   </dl>
@@ -253,17 +249,13 @@ expected 2
 
 (compared using ==)
 </pre></div>
-        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=34">./spec/rspec/core/resources/formatter_specs.rb:34</a> :in `block (2 levels) in <top (required)>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=24">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:24</a> :in `block (2 levels) in <module:Formatters>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `block (5 levels) in <module:Formatters>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `open'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `block (4 levels) in <module:Formatters>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `chdir'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `block (3 levels) in <module:Formatters>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/spec_helper.rb&line=71">./spec/spec_helper.rb:71</a> :in `block (3 levels) in <top (required)>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/spec_helper.rb&line=45">./spec/spec_helper.rb:45</a> :in `instance_eval'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/spec_helper.rb&line=45">./spec/spec_helper.rb:45</a> :in `sandboxed'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/spec_helper.rb&line=71">./spec/spec_helper.rb:71</a> :in `block (2 levels) in <top (required)>'</pre></div>
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=33">./spec/rspec/core/resources/formatter_specs.rb:33</a> :in `block (2 levels) in <top (required)>'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=24">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:24</a> :in `block (2 levels) in <module:Formatters>'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `block (5 levels) in <module:Formatters>'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `open'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `block (4 levels) in <module:Formatters>'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `block (3 levels) in <module:Formatters>'</pre></div>
     <pre class="ruby"><code><span class="linenum">27</span>        <span class="keyword">end</span>
 <span class="linenum">28</span>
 <span class="offending"><span class="linenum">29</span>        <span class="keyword">raise</span><span class="punct">(</span><span class="constant">RSpec</span><span class="punct">::</span><span class="constant">Expectations</span><span class="punct">::</span><span class="constant">ExpectationNotMetError</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">))</span></span>
@@ -282,17 +274,13 @@ expected 2
       <div class="failure" id="failure_0">
         <div class="message"><pre>foo</pre></div>
         <div class="backtrace"><pre>(erb):1:in `<main>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=42">./spec/rspec/core/resources/formatter_specs.rb:42</a> :in `block (2 levels) in <top (required)>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=24">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:24</a> :in `block (2 levels) in <module:Formatters>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `block (5 levels) in <module:Formatters>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `open'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `block (4 levels) in <module:Formatters>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `chdir'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `block (3 levels) in <module:Formatters>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/spec_helper.rb&line=71">./spec/spec_helper.rb:71</a> :in `block (3 levels) in <top (required)>'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/spec_helper.rb&line=45">./spec/spec_helper.rb:45</a> :in `instance_eval'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/spec_helper.rb&line=45">./spec/spec_helper.rb:45</a> :in `sandboxed'
-<a href="txmt://open?url=file:///Users/alex/code/ruby/rspec-core/spec/spec_helper.rb&line=71">./spec/spec_helper.rb:71</a> :in `block (2 levels) in <top (required)>'</pre></div>
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/resources/formatter_specs.rb&line=41">./spec/rspec/core/resources/formatter_specs.rb:41</a> :in `block (2 levels) in <top (required)>'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=24">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:24</a> :in `block (2 levels) in <module:Formatters>'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `block (5 levels) in <module:Formatters>'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `open'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=47">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:47</a> :in `block (4 levels) in <module:Formatters>'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `chdir'
+<a href="txmt://open?url=file:///Users/mmarston/code/rspec-dev/repos/rspec-core/spec/rspec/core/formatters/text_mate_formatter_spec.rb&line=46">./spec/rspec/core/formatters/text_mate_formatter_spec.rb:46</a> :in `block (3 levels) in <module:Formatters>'</pre></div>
     <pre class="ruby"><code><span class="linenum">-1</span><span class="comment"># Couldn't get snippet for (erb)</span></code></pre>
       </div>
     </dd>

data/spec/rspec/core/metadata_spec.rb

@@ -4,7 +4,7 @@ module RSpec
   module Core
     describe Metadata do
 
-      describe "process" do
+      describe "#process" do
         Metadata::RESERVED_KEYS.each do |key|
           it "prohibits :#{key} as a hash key" do
             m = Metadata.new
@@ -13,19 +13,121 @@ module RSpec
             end.to raise_error(/:#{key} is not allowed/)
           end
         end
-      end
 
-      describe "description" do
-        it "just has the example description" do
+        it "uses :caller if passed as part of the user metadata" do
           m = Metadata.new
-          m.process('group')
+          m.process('group', :caller => ['example_file:42'])
+          m[:example_group][:location].should == 'example_file:42'
+        end
+      end
 
-          m = m.for_example("example", {})
-          m[:description].should == "example"
+      describe "#apply_condition" do
+
+        let(:parent_group_metadata) { Metadata.new.process('parent group', :caller => ["foo_spec.rb:#{__LINE__}"]) }
+        let(:parent_group_line_number) { parent_group_metadata[:example_group][:line_number] }
+        let(:group_metadata) { Metadata.new(parent_group_metadata).process('group', :caller => ["foo_spec.rb:#{__LINE__}"]) }
+        let(:group_line_number) { group_metadata[:example_group][:line_number] }
+        let(:example_metadata) { group_metadata.for_example('example', :caller => ["foo_spec.rb:#{__LINE__}"], :if => true) }
+        let(:example_line_number) { example_metadata[:line_number] }
+        let(:next_example_metadata) { group_metadata.for_example('next_example', :caller => ["foo_spec.rb:#{example_line_number + 2}"]) }
+        let(:world) { World.new }
+
+        before { RSpec.stub(:world) { world } }
+
+        it "matches the group when the line_number is the example group line number" do
+          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_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_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_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_declaration_line).and_return(example_line_number + 2)
+          example_metadata.apply_condition(:line_number, example_line_number + 2).should be_false
+        end
+
+        it "matches a proc that evaluates to true" do
+          example_metadata.apply_condition(:if, lambda { |v| v }).should be_true
+        end
+
+        it "does not match a proc that evaluates to false" do
+          example_metadata.apply_condition(:if, lambda { |v| !v }).should be_false
+        end
+
+        it "passes the metadata hash as the second argument if a given proc expects 2 args" do
+          passed_metadata = nil
+          example_metadata.apply_condition(:if, lambda { |v, m| passed_metadata = m })
+          passed_metadata.should == example_metadata
         end
       end
 
-      describe "describes" do
+      describe "#for_example" do
+        let(:metadata)           { Metadata.new.process("group description") }
+        let(:mfe)                { metadata.for_example("example description", {:arbitrary => :options}) }
+        let(:line_number)        { __LINE__ - 1 }
+
+        it "stores the description" do
+          mfe[:description].should == "example description"
+        end
+
+        it "stores the full_description (group description + example description)" do
+          mfe[:full_description].should == "group description example description"
+        end
+
+        it "creates an empty execution result" do
+          mfe[:execution_result].should == {}
+        end
+
+        it "extracts file path from caller" do
+          mfe[:file_path].should == __FILE__
+        end
+
+        it "extracts line number from caller" do
+          mfe[:line_number].should == line_number
+        end
+
+        it "extracts location from caller" do
+          mfe[:location].should == "#{__FILE__}:#{line_number}"
+        end
+
+        it "uses :caller if passed as an option" do
+          example_metadata = metadata.for_example('example description', {:caller => ['example_file:42']})
+          example_metadata[:location].should == 'example_file:42'
+        end
+
+        it "merges arbitrary options" do
+          mfe[:arbitrary].should == :options
+        end
+
+        it "points :example_group to the same hash object" do
+          a = metadata.for_example("foo", {})[:example_group]
+          b = metadata.for_example("bar", {})[:example_group]
+          a[:description] = "new description"
+          b[:description].should == "new description"
+        end
+      end
+
+      describe ":describes" do
         context "with a String" do
           it "returns nil" do
             m = Metadata.new
@@ -57,37 +159,15 @@ module RSpec
         end
       end
 
-      describe "full description" do
-        it "concats the example group name and description" do
+      describe ":description" do
+        it "just has the example description" do
           m = Metadata.new
           m.process('group')
 
           m = m.for_example("example", {})
-          m[:full_description].should == "group example"
-        end
-
-        %w[# . ::].each do |char|
-          context "with a 2nd arg starting with #{char}" do
-            it "removes the space" do
-              m = Metadata.new
-              m.process(Array, "#{char}method")
-              m[:example_group][:full_description].should eq("Array#{char}method")
-            end
-          end
-
-          context "with a nested description starting with #" do
-            it "removes the space" do
-              m = Metadata.new
-              m.process("Object")
-              m = Metadata.new(m)
-              m.process("#{char}method")
-              m[:example_group][:full_description].should eq("Object#{char}method")
-            end
-          end
+          m[:description].should == "example"
         end
-      end
 
-      describe "description" do
         context "with a string" do
           it "provides the submitted description" do
             m = Metadata.new
@@ -116,8 +196,16 @@ module RSpec
         end
       end
 
-      describe "full description" do
-        it "concats the nested example group descriptions" do
+      describe ":full_description" do
+        it "concats example group name and description" do
+          group_metadata = Metadata.new
+          group_metadata.process('group')
+
+          example_metadata = group_metadata.for_example("example", {})
+          example_metadata[:full_description].should == "group example"
+        end
+
+        it "concats nested example group descriptions" do
           parent = Metadata.new
           parent.process(Object, 'parent')
 
@@ -126,32 +214,42 @@ module RSpec
 
           child[:example_group][:full_description].should == "Object parent child"
         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()
+        %w[# . ::].each do |char|
+          context "with a 2nd arg starting with #{char}" do
+          it "removes the space" do
+            m = Metadata.new
+            m.process(Array, "#{char}method")
+            m[:example_group][:full_description].should eq("Array#{char}method")
+          end
+          end
+        end
 
-          child[:example_group][:example_group].should == parent[:example_group]
+        %w[# . ::].each do |char|
+          context "with a nested description starting with #{char}" do
+          it "removes the space" do
+            parent = Metadata.new
+            parent.process("Object")
+            child = Metadata.new(parent)
+            child.process("#{char}method")
+            child[:example_group][:full_description].should eq("Object#{char}method")
+          end
+          end
         end
       end
 
-      describe "file path" do
+      describe ":file_path" do
         it "finds the first non-rspec lib file in the caller array" do
           m = Metadata.new
           m.process(:caller => [
-            "./lib/rspec/core/foo.rb",
-            "#{__FILE__}:#{__LINE__}"
+                    "./lib/rspec/core/foo.rb",
+                    "#{__FILE__}:#{__LINE__}"
           ])
           m[:example_group][:file_path].should == __FILE__
         end
       end
 
-      describe "line number" do
+      describe ":line_number" do
         it "finds the line number with the first non-rspec lib file in the backtrace" do
           m = Metadata.new
           m.process({})
@@ -171,94 +269,17 @@ module RSpec
         end
       end
 
-      describe "metadata for example" do
-        let(:metadata)           { Metadata.new.process("group description") }
-        let(:mfe)                { metadata.for_example("example description", {:arbitrary => :options}) }
-        let(:line_number)        { __LINE__ - 1 }
-
-        it "stores the description" do
-          mfe[:description].should == "example description"
-        end
-
-        it "stores the full_description (group description + example description)" do
-          mfe[:full_description].should == "group description example description"
-        end
-
-        it "creates an empty execution result" do
-          mfe[:execution_result].should == {}
-        end
-
-        it "extracts file path from caller" do
-          mfe[:file_path].should == __FILE__
-        end
-
-        it "extracts line number from caller" do
-          mfe[:line_number].should == line_number
-        end
-
-        it "extracts location from caller" do
-          mfe[:location].should == "#{__FILE__}:#{line_number}"
-        end
-
-        it "merges arbitrary options" do
-          mfe[:arbitrary].should == :options
-        end
-
-        it "points :example_group to the same hash object" do
-          a = metadata.for_example("foo", {})[:example_group]
-          b = metadata.for_example("bar", {})[:example_group]
-          a[:description] = "new description"
-          b[:description].should == "new description"
-        end
-      end
-
-      describe "apply_condition" do
-
-
-        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.world }
-
-        it "matches the group when the line_number is the example group line number" do
-          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_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_declaration_line).and_return(example_line_number)
-          example_metadata.apply_condition(:line_number, example_line_number).should be_true
-        end
+      describe "child example group" do
+        it "nests the parent's example group metadata" do
+          parent = Metadata.new
+          parent.process(Object, 'parent')
 
-        it "matches when the line number is between this example and the next" do
-          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
+          child = Metadata.new(parent)
+          child.process()
 
-        it "does not match when the line number matches the next example" do
-          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
+          child[:example_group][:example_group].should == parent[:example_group]
         end
-
       end
-
     end
   end
 end

data/spec/rspec/core/pending_example_spec.rb

@@ -10,6 +10,45 @@ RSpec::Matchers.define :be_pending_with do |message|
   end
 end
 
+RSpec::Matchers.define :fail_with do |exception_klass|
+  match do |example|
+    failure_reason(example, exception_klass).nil?
+  end
+
+  failure_message_for_should do |example|
+    "expected example to fail with a #{exception_klass} exception, but #{failure_reason(example, exception_klass)}"
+  end
+
+  def failure_reason(example, exception_klass)
+    result = example.metadata[:execution_result]
+    case
+      when example.metadata[:pending] then "was pending"
+      when result[:status] != 'failed' then result[:status]
+      when !result[:exception_encountered].is_a?(exception_klass) then "failed with a #{result[:exception_encountered].class}"
+      else nil
+    end
+  end
+end
+
+RSpec::Matchers.define :pass do
+  match do |example|
+    failure_reason(example).nil?
+  end
+
+  failure_message_for_should do |example|
+    "expected example to pass, but #{failure_reason(example)}"
+  end
+
+  def failure_reason(example)
+    result = example.metadata[:execution_result]
+    case
+      when example.metadata[:pending] then "was pending"
+      when result[:status] != 'passed' then result[:status]
+      else nil
+    end
+  end
+end
+
 describe "an example" do
   context "with no block" do
     it "is listed as pending with 'Not Yet Implemented'" do
@@ -23,7 +62,7 @@ describe "an example" do
   end
 
   context "with no args" do
-    it "is listed as pending with 'No reason given'" do
+    it "is listed as pending with the default message" do
       group = RSpec::Core::ExampleGroup.describe('group') do
         it "does something" do
           pending
@@ -31,7 +70,7 @@ describe "an example" do
       end
       example = group.examples.first
       example.run(group.new, stub.as_null_object)
-      example.should be_pending_with('No reason given')
+      example.should be_pending_with(RSpec::Core::Pending::DEFAULT_MESSAGE)
     end
   end
 
@@ -82,37 +121,106 @@ describe "an example" do
   end
 
   context "with a block" do
+    def run_example(*pending_args)
+      group = RSpec::Core::ExampleGroup.describe('group') do
+        it "does something" do
+          pending(*pending_args) { yield }
+        end
+      end
+      example = group.examples.first
+      example.run(group.new, stub.as_null_object)
+      example
+    end
+
     context "that fails" do
-      it "is listed as pending with the supplied message" do
-        group = RSpec::Core::ExampleGroup.describe('group') do
-          it "does something" do
-            pending("just because") do
-              3.should == 4
-            end
-          end
+      def run_example(*pending_args)
+        super(*pending_args) { raise ArgumentError.new }
+      end
+
+      context "when given no options" do
+        it "is listed as pending with the supplied message" do
+          run_example("just because").should be_pending_with("just because")
+        end
+
+        it "is listed as pending with the default message when no message is given" do
+          run_example.should be_pending_with(RSpec::Core::Pending::DEFAULT_MESSAGE)
+        end
+      end
+
+      context "when given a truthy :if option" do
+        it "is listed as pending with the supplied message" do
+          run_example("just because", :if => true).should be_pending_with("just because")
+        end
+
+        it "is listed as pending with the default message when no message is given" do
+          run_example(:if => true).should be_pending_with(RSpec::Core::Pending::DEFAULT_MESSAGE)
+        end
+      end
+
+      context "when given a falsey :if option" do
+        it "runs the example and fails" do
+          run_example(                :if => false).should fail_with(ArgumentError)
+          run_example("just because", :if => false).should fail_with(ArgumentError)
+        end
+      end
+
+      context "when given a truthy :unless option" do
+        it "runs the example and fails" do
+          run_example(                :unless => true).should fail_with(ArgumentError)
+          run_example("just because", :unless => true).should fail_with(ArgumentError)
+        end
+      end
+
+      context "when given a falsey :unless option" do
+        it "is listed as pending with the supplied message" do
+          run_example("just because", :unless => false).should be_pending_with("just because")
+        end
+
+        it "is listed as pending with the default message when no message is given" do
+          run_example(:unless => false).should be_pending_with(RSpec::Core::Pending::DEFAULT_MESSAGE)
         end
-        example = group.examples.first
-        example.run(group.new, stub.as_null_object)
-        example.should be_pending_with('just because')
       end
     end
 
     context "that passes" do
-      it "raises a PendingExampleFixedError" do
-        group = RSpec::Core::ExampleGroup.describe('group') do
-          it "does something" do
-            pending("just because") do
-              3.should == 3
-            end
-          end
+      def run_example(*pending_args)
+        super(*pending_args) { 3.should == 3 }
+      end
+
+      context "when given no options" do
+        it "fails with a PendingExampleFixedError" do
+          run_example("just because").should fail_with(RSpec::Core::PendingExampleFixedError)
+          run_example.should                 fail_with(RSpec::Core::PendingExampleFixedError)
+        end
+      end
+
+      context "when given a truthy :if option" do
+        it "fails with a PendingExampleFixedError" do
+          run_example("just because", :if => true).should fail_with(RSpec::Core::PendingExampleFixedError)
+          run_example(                :if => true).should fail_with(RSpec::Core::PendingExampleFixedError)
+        end
+      end
+
+      context "when given a falsey :if option" do
+        it "runs the example and it passes" do
+          run_example(                :if => false).should pass
+          run_example("just because", :if => false).should pass
+        end
+      end
+
+      context "when given a truthy :unless option" do
+        it "runs the example and it passes" do
+          run_example(                :unless => true).should pass
+          run_example("just because", :unless => true).should pass
+        end
+      end
+
+      context "when given a falsey :unless option" do
+        it "fails with a PendingExampleFixedError" do
+          run_example("just because", :unless => false).should fail_with(RSpec::Core::PendingExampleFixedError)
+          run_example(                :unless => false).should fail_with(RSpec::Core::PendingExampleFixedError)
         end
-        example = group.examples.first
-        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)
       end
     end
   end
-
 end