rspec-core 2.6.4 → 2.7.0.rc1

data/spec/rspec/core/formatters/{text_mate_formatted-1.9.1.html → text_mate_formatted-1.9.3.html}

@@ -312,18 +312,18 @@ a {
       <span class="failed_spec_name">fails</span>
       <div class="failure" id="failure_1">
         <div class="message"><pre>RSpec::Core::PendingExampleFixedError</pre></div>
-        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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>'
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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 &lt;top (required)&gt;'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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 &lt;module:Formatters&gt;'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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 &lt;module:Formatters&gt;'
 <a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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 &lt;module:Formatters&gt;'
 <a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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">29</span>            <span class="ident">teardown_mocks_for_rspec</span>
-<span class="linenum">30</span>          <span class="keyword">end</span>
-<span class="offending"><span class="linenum">31</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">32</span>        <span class="keyword">end</span>
-<span class="linenum">33</span>        <span class="keyword">raise</span> <span class="constant">PendingDeclaredInExample</span><span class="punct">.</span><span class="ident">new</span><span class="punct">(</span><span class="ident">message</span><span class="punct">)</span></code></pre>
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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 &lt;module:Formatters&gt;'</pre></div>
+    <pre class="ruby"><code><span class="linenum">16</span>  <span class="ident">context</span> <span class="punct">&quot;</span><span class="string">with content that would pass</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="linenum">17</span>    <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">fails</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="offending"><span class="linenum">18</span>      <span class="ident">pending</span> <span class="keyword">do</span></span>
+<span class="linenum">19</span>        <span class="number">1</span><span class="punct">.</span><span class="ident">should</span> <span class="ident">eq</span><span class="punct">(</span><span class="number">1</span><span class="punct">)</span>
+<span class="linenum">20</span>      <span class="keyword">end</span></code></pre>
       </div>
     </dd>
   </dl>
@@ -345,22 +345,23 @@ a {
       <span class="failed_spec_name">fails</span>
       <div class="failure" id="failure_2">
         <div class="message"><pre>
-expected 2
-     got 1
+expected: 2
+     got: 1
 
 (compared using ==)
 </pre></div>
-        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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>'
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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 &lt;top (required)&gt;'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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 &lt;module:Formatters&gt;'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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 &lt;module:Formatters&gt;'
 <a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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 &lt;module:Formatters&gt;'
 <a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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>
-<span class="linenum">30</span>      <span class="keyword">end</span></code></pre>
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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 &lt;module:Formatters&gt;'</pre></div>
+    <pre class="ruby"><code><span class="linenum">31</span><span class="ident">describe</span> <span class="punct">&quot;</span><span class="string">failing spec</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="linenum">32</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">fails</span><span class="punct">&quot;</span> <span class="keyword">do</span>
+<span class="offending"><span class="linenum">33</span>    <span class="number">1</span><span class="punct">.</span><span class="ident">should</span> <span class="ident">eq</span><span class="punct">(</span><span class="number">2</span><span class="punct">)</span></span>
+<span class="linenum">34</span>  <span class="keyword">end</span>
+<span class="linenum">35</span><span class="keyword">end</span></code></pre>
       </div>
     </dd>
   </dl>
@@ -375,14 +376,14 @@ expected 2
       <span class="failed_spec_name">fails with a backtrace that has no file</span>
       <div class="failure" id="failure_3">
         <div class="message"><pre>foo</pre></div>
-        <div class="backtrace"><pre>(erb):1:in `<main>'
-<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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>'
+        <div class="backtrace"><pre>(erb):1:in `&lt;main&gt;'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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 &lt;top (required)&gt;'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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 &lt;module:Formatters&gt;'
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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 &lt;module:Formatters&gt;'
 <a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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 &lt;module:Formatters&gt;'
 <a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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/david/projects/ruby/rspec2/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>
+<a href="txmt://open?url=file:///Users/david/projects/ruby/rspec2/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 &lt;module:Formatters&gt;'</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>
@@ -391,7 +392,7 @@ expected 2
       <span class="failed_spec_name">fails with a backtrace containing an erb file</span>
       <div class="failure" id="failure_4">
         <div class="message"><pre>Exception</pre></div>
-        <div class="backtrace"><pre><a href="txmt://open?url=file:///foo.html.erb&line=1">/foo.html.erb:1</a> :in `<main>': foo (RuntimeError)</pre></div>
+        <div class="backtrace"><pre><a href="txmt://open?url=file:///foo.html.erb&line=1">/foo.html.erb:1</a> :in `&lt;main&gt;': foo (RuntimeError)</pre></div>
     <pre class="ruby"><code><span class="linenum">-1</span><span class="comment"># Couldn't get snippet for /foo.html.erb</span></code></pre>
       </div>
     </dd>

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

@@ -22,7 +22,7 @@ module RSpec
           err, out = StringIO.new, StringIO.new
           command_line = RSpec::Core::CommandLine.new(options)
           command_line.run(err, out)
-          out.string.gsub /\d+\.\d+ seconds/, 'x seconds'
+          out.string.gsub(/\d+\.\d+ seconds/, 'x seconds')
 
         end
 
@@ -58,7 +58,7 @@ module RSpec
             expected_doc = Nokogiri::HTML(expected_html)
             expected_doc.search("div.backtrace").remove
 
-            actual_doc.inner_html.should == expected_doc.inner_html
+            actual_doc.inner_html.should eq(expected_doc.inner_html)
 
             backtrace_lines.each do |backtrace_line|
               backtrace_line['href'].should include("txmt://open?url=")

data/spec/rspec/core/hooks_filtering_spec.rb

@@ -15,13 +15,13 @@ module RSpec::Core
         group = ExampleGroup.describe
         group.example("example") {}
         group.run
-        filters.should == [
+        filters.should eq([
           "before all in config",
           "around each in config",
           "before each in config",
           "after each in config",
           "after all in config"
-        ]
+        ])
       end
     end
 
@@ -38,11 +38,11 @@ module RSpec::Core
           group = ExampleGroup.describe(:match => true)
           group.example("example") {}
           group.run
-          filters.should == [
+          filters.should eq([
             "around each in config",
             "before each in config",
             "after each in config"
-          ]
+          ])
         end
       end
 
@@ -58,13 +58,13 @@ module RSpec::Core
         group = ExampleGroup.describe(:match => true)
         group.example("example") {}
         group.run
-        filters.should == [
+        filters.should eq([
           "before all in config",
           "around each in config",
           "before each in config",
           "after each in config",
           "after all in config"
-        ]
+        ])
       end
 
       it "runs before|after :all hooks on matching nested example groups" do
@@ -85,8 +85,8 @@ module RSpec::Core
         group.run
 
         example_1_filters.should be_empty
-        example_2_filters.should == [:before_all]
-        filters.should == [:before_all, :after_all]
+        example_2_filters.should eq([:before_all])
+        filters.should eq([:before_all, :after_all])
       end
 
       it "runs before|after :all hooks only on the highest level group that matches the filter" do
@@ -109,11 +109,11 @@ module RSpec::Core
         end
         group.run
 
-        example_1_filters.should == [:before_all]
-        example_2_filters.should == [:before_all]
-        example_3_filters.should == [:before_all]
+        example_1_filters.should eq([:before_all])
+        example_2_filters.should eq([:before_all])
+        example_3_filters.should eq([:before_all])
 
-        filters.should == [:before_all, :after_all]
+        filters.should eq([:before_all, :after_all])
       end
 
       it "should not be ran if the filter doesn't match the example group's filter" do
@@ -128,7 +128,7 @@ module RSpec::Core
         group = ExampleGroup.describe(:match => true)
         group.example("example") {}
         group.run
-        filters.should == []
+        filters.should eq([])
       end
 
       context "when the hook filters apply to individual examples instead of example groups" do
@@ -164,11 +164,11 @@ module RSpec::Core
           let(:example_metadata) { { :foo => :bar } }
 
           it "runs the `:each` hooks" do
-            each_filters.should == [
+            each_filters.should eq([
               'around each in config',
               'before each in config',
               'after each in config'
-            ]
+            ])
           end
 
           it "does not run the `:all` hooks" do
@@ -199,13 +199,13 @@ module RSpec::Core
         group = ExampleGroup.describe(:one => 1, :two => 2, :three => 3)
         group.example("example") {}
         group.run
-        filters.should == [
+        filters.should eq([
           "before all in config",
           "around each in config",
           "before each in config",
           "after each in config",
           "after all in config"
-        ]
+        ])
       end
 
       it "should not be ran if some hook filters don't match the group's filters" do
@@ -220,7 +220,7 @@ module RSpec::Core
         group = ExampleGroup.describe(:one => 1, :two => 2, :three => 3)
         group.example("example") {}
         group.run
-        filters.should == []
+        filters.should eq([])
       end
     end
   end

data/spec/rspec/core/let_spec.rb

@@ -12,19 +12,32 @@ describe "#let" do
     end.new
   end
 
+  let(:nil_value) do
+    @nil_value_count += 1
+    nil
+  end
+
   it "generates an instance method" do
-    counter.count.should == 1
+    counter.count.should eq(1)
   end
 
   it "caches the value" do
-    counter.count.should == 1
-    counter.count.should == 2
+    counter.count.should eq(1)
+    counter.count.should eq(2)
+  end
+
+  it "caches a nil value" do
+    @nil_value_count = 0
+    nil_value
+    nil_value
+
+    @nil_value_count.should eq(1)
   end
 end
 
 describe "#let!" do
   let!(:creator) do
-    class Creator
+    Class.new do
       @count = 0
       def self.count
         @count += 1
@@ -33,10 +46,10 @@ describe "#let!" do
   end
 
   it "evaluates the value non-lazily" do
-    lambda { Creator.count }.should_not raise_error
+    lambda { creator.count }.should_not raise_error
   end
 
   it "does not interfere between tests" do
-    Creator.count.should == 1
+    creator.count.should eq(1)
   end
 end

data/spec/rspec/core/metadata_spec.rb

@@ -17,67 +17,120 @@ module RSpec
         it "uses :caller if passed as part of the user metadata" do
           m = Metadata.new
           m.process('group', :caller => ['example_file:42'])
-          m[:example_group][:location].should == 'example_file:42'
+          m[:example_group][:location].should eq("example_file:42")
         end
       end
 
-      describe "#apply_condition" do
+      describe "#filter_applies?" 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
+        shared_examples_for "matching by line number" do
+          let(:preceeding_declaration_lines) {{
+            parent_group_metadata[:example_group][:line_number] => parent_group_metadata[:example_group][:line_number],
+            group_metadata[:example_group][:line_number] => group_metadata[:example_group][:line_number],
+            example_metadata[:line_number] => example_metadata[:line_number],
+            (example_metadata[:line_number] + 1) => example_metadata[:line_number],
+            (example_metadata[:line_number] + 2) => example_metadata[:line_number] + 2,
+          }}
+          before do
+            world.should_receive(:preceding_declaration_line).at_least(:once).and_return do |v|
+              preceeding_declaration_lines[v]
+            end
+          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 group when the line_number is the example group line number" do
+            # this call doesn't really make sense since filter_applies? is only called
+            # for example metadata not group metadata
+            group_metadata.filter_applies?(condition_key, group_condition).should be_true
+          end
+
+          it "matches the example when the line_number is the grandparent example group line number" do
+            example_metadata.filter_applies?(condition_key, parent_group_condition).should be_true
+          end
+
+          it "matches the example when the line_number is the parent example group line number" do
+            example_metadata.filter_applies?(condition_key, group_condition).should be_true
+          end
+
+          it "matches the example when the line_number is the example line number" do
+            example_metadata.filter_applies?(condition_key, example_condition).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
+          it "matches when the line number is between this example and the next" do
+            example_metadata.filter_applies?(condition_key, between_examples_condition).should be_true
+          end
+
+          it "does not match when the line number matches the next example" do
+            example_metadata.filter_applies?(condition_key, next_example_condition).should be_false
+          end
         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
+        context "with a single line number" do
+          let(:condition_key){ :line_numbers }
+          let(:parent_group_condition) { [parent_group_metadata[:example_group][:line_number]] }
+          let(:group_condition) { [group_metadata[:example_group][:line_number]] }
+          let(:example_condition) { [example_metadata[:line_number]] }
+          let(:between_examples_condition) { [group_metadata[:example_group][:line_number] + 1] }
+          let(:next_example_condition) { [example_metadata[:line_number] + 2] }
+
+          it_has_behavior "matching by line number"
         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
+        context "with multiple line numbers" do
+          let(:condition_key){ :line_numbers }
+          let(:parent_group_condition) { [-1, parent_group_metadata[:example_group][:line_number]] }
+          let(:group_condition) { [-1, group_metadata[:example_group][:line_number]] }
+          let(:example_condition) { [-1, example_metadata[:line_number]] }
+          let(:between_examples_condition) { [-1, group_metadata[:example_group][:line_number] + 1] }
+          let(:next_example_condition) { [-1, example_metadata[:line_number] + 2] }
+
+          it_has_behavior "matching by line number"
         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
+        context "with locations" do
+          let(:condition_key){ :locations }
+          let(:parent_group_condition) do
+            {File.expand_path(parent_group_metadata[:example_group][:file_path]) => [parent_group_metadata[:example_group][:line_number]]}
+          end
+          let(:group_condition) do
+            {File.expand_path(group_metadata[:example_group][:file_path]) => [group_metadata[:example_group][:line_number]]}
+          end
+          let(:example_condition) do
+            {File.expand_path(example_metadata[:file_path]) => [example_metadata[:line_number]]}
+          end
+          let(:between_examples_condition) do
+            {File.expand_path(group_metadata[:example_group][:file_path]) => [group_metadata[:example_group][:line_number] + 1]}
+          end
+          let(:next_example_condition) do
+            {File.expand_path(example_metadata[:file_path]) => [example_metadata[:line_number] + 2]}
+          end
+
+          it_has_behavior "matching by line number"
+
+          it "ignores location filters for other files" do
+            example_metadata.filter_applies?(:locations, {"/path/to/other_spec.rb" => [3,5,7]}).should be_true
+          end
         end
 
         it "matches a proc that evaluates to true" do
-          example_metadata.apply_condition(:if, lambda { |v| v }).should be_true
+          example_metadata.filter_applies?(: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
+          example_metadata.filter_applies?(: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
+          example_metadata.filter_applies?(:if, lambda { |v, m| passed_metadata = m })
+          passed_metadata.should eq(example_metadata)
         end
       end
 
@@ -87,43 +140,43 @@ module RSpec
         let(:line_number)        { __LINE__ - 1 }
 
         it "stores the description" do
-          mfe[:description].should == "example description"
+          mfe[:description].should eq("example description")
         end
 
         it "stores the full_description (group description + example description)" do
-          mfe[:full_description].should == "group description example description"
+          mfe[:full_description].should eq("group description example description")
         end
 
         it "creates an empty execution result" do
-          mfe[:execution_result].should == {}
+          mfe[:execution_result].should eq({})
         end
 
         it "extracts file path from caller" do
-          mfe[:file_path].should == __FILE__
+          mfe[:file_path].should eq(__FILE__)
         end
 
         it "extracts line number from caller" do
-          mfe[:line_number].should == line_number
+          mfe[:line_number].should eq(line_number)
         end
 
         it "extracts location from caller" do
-          mfe[:location].should == "#{__FILE__}:#{line_number}"
+          mfe[:location].should eq("#{__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'
+          example_metadata[:location].should eq("example_file:42")
         end
 
         it "merges arbitrary options" do
-          mfe[:arbitrary].should == :options
+          mfe[:arbitrary].should eq(: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"
+          b[:description].should eq("new description")
         end
       end
 
@@ -133,7 +186,6 @@ module RSpec
             m = Metadata.new
             m.process('group')
 
-            m = m.for_example("example", {})
             m[:example_group][:describes].should be_nil
           end
         end
@@ -143,7 +195,6 @@ module RSpec
             m = Metadata.new
             m.process(:group)
 
-            m = m.for_example("example", {})
             m[:example_group][:describes].should be_nil
           end
         end
@@ -153,49 +204,73 @@ module RSpec
             m = Metadata.new
             m.process(String)
 
-            m = m.for_example("example", {})
             m[:example_group][:describes].should be(String)
           end
         end
 
-        context "with describes from a superclass metadata" do
-          it "returns the superclass' described class" do
+        context "in a nested group" do
+          it "returns the parent group's described class" do
             sm = Metadata.new
             sm.process(String)
 
             m = Metadata.new(sm)
             m.process(Array)
 
-            m = m.for_example("example", {})
             m[:example_group][:describes].should be(String)
           end
+
+          it "returns own described class if parent doesn't have one" do
+            sm = Metadata.new
+            sm.process("foo")
+
+            m = Metadata.new(sm)
+            m.process(Array)
+
+            m[:example_group][:describes].should be(Array)
+          end
+
+          it "can override a parent group's described class" do
+            parent = Metadata.new
+            parent.process(String)
+
+            child = Metadata.new(parent)
+            child.process(Fixnum)
+            child[:example_group][:describes] = Hash
+
+            grandchild = Metadata.new(child)
+            grandchild.process(Array)
+
+            grandchild[:example_group][:describes].should be(Hash)
+            child[:example_group][:describes].should be(Hash)
+            parent[:example_group][:describes].should be(String)
+          end
         end
       end
 
       describe ":description" do
         it "just has the example description" do
           m = Metadata.new
-          m.process('group')
+          m.process("group")
 
           m = m.for_example("example", {})
-          m[:description].should == "example"
+          m[:description].should eq("example")
         end
 
         context "with a string" do
           it "provides the submitted description" do
             m = Metadata.new
-            m.process('group')
+            m.process("group")
 
-            m[:example_group][:description].should == "group"
+            m[:example_group][:description].should eq("group")
           end
         end
 
         context "with a non-string" do
           it "provides the submitted description" do
             m = Metadata.new
-            m.process('group')
+            m.process("group")
 
-            m[:example_group][:description].should == "group"
+            m[:example_group][:description].should eq("group")
           end
         end
 
@@ -204,7 +279,16 @@ module RSpec
             m = Metadata.new
             m.process(Object, 'group')
 
-            m[:example_group][:description].should == "Object group"
+            m[:example_group][:description].should eq("Object group")
+          end
+        end
+
+        context "with empty args" do
+          it "returns empty string for [:example_group][:description]" do
+            m = Metadata.new
+            m.process()
+
+            m[:example_group][:description].should eq("")
           end
         end
       end
@@ -215,17 +299,18 @@ module RSpec
           group_metadata.process('group')
 
           example_metadata = group_metadata.for_example("example", {})
-          example_metadata[:full_description].should == "group example"
+          example_metadata[:full_description].should eq("group example")
         end
 
         it "concats nested example group descriptions" do
           parent = Metadata.new
-          parent.process(Object, 'parent')
+          parent.process('parent')
 
           child = Metadata.new(parent)
           child.process('child')
 
-          child[:example_group][:full_description].should == "Object parent child"
+          child[:example_group][:full_description].should eq("parent child")
+          child.for_example('example', child)[:full_description].should eq("parent child example")
         end
 
         %w[# . ::].each do |char|
@@ -258,7 +343,7 @@ module RSpec
                     "./lib/rspec/core/foo.rb",
                     "#{__FILE__}:#{__LINE__}"
           ])
-          m[:example_group][:file_path].should == __FILE__
+          m[:example_group][:file_path].should eq(__FILE__)
         end
       end
 
@@ -266,19 +351,19 @@ module RSpec
         it "finds the line number with the first non-rspec lib file in the backtrace" do
           m = Metadata.new
           m.process({})
-          m[:example_group][:line_number].should == __LINE__ - 1
+          m[:example_group][:line_number].should eq(__LINE__ - 1)
         end
 
         it "finds the line number with the first spec file with drive letter" do
           m = Metadata.new
           m.process(:caller => [ "C:/path/to/file_spec.rb:#{__LINE__}" ])
-          m[:example_group][:line_number].should == __LINE__ - 1
+          m[:example_group][:line_number].should eq(__LINE__ - 1)
         end
 
         it "uses the number after the first : for ruby 1.9" do
           m = Metadata.new
           m.process(:caller => [ "#{__FILE__}:#{__LINE__}:999" ])
-          m[:example_group][:line_number].should == __LINE__ - 1
+          m[:example_group][:line_number].should eq(__LINE__ - 1)
         end
       end
 
@@ -290,7 +375,7 @@ module RSpec
           child = Metadata.new(parent)
           child.process()
 
-          child[:example_group][:example_group].should == parent[:example_group]
+          child[:example_group][:example_group].should eq(parent[:example_group])
         end
       end
     end