rspec 1.1.11 → 1.1.12

data/spec/spec/runner/drb_command_line_spec.rb

@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module Runner
     describe DrbCommandLine, "without running local server" do
-      unless Config::CONFIG['ruby_install_name'] == 'jruby'
+      unless jruby?
         it "should print error when there is no running local server" do
           err = StringIO.new
           out = StringIO.new
@@ -17,7 +17,7 @@ module Spec
 
     describe "with local server" do
 
-      class CommandLineForSpec
+      class ::CommandLineForSpec
         def self.run(argv, stderr, stdout)
           orig_options = Spec::Runner.options
           tmp_options = OptionParser.parse(argv, stderr, stdout)
@@ -28,9 +28,9 @@ module Spec
         end
       end
       
-      unless Config::CONFIG['ruby_install_name'] == 'jruby'
+      unless jruby?
         before(:all) do
-          DRb.start_service("druby://127.0.0.1:8989", CommandLineForSpec)
+          DRb.start_service("druby://127.0.0.1:8989", ::CommandLineForSpec)
           @@drb_example_file_counter = 0
         end
 

data/spec/spec/runner/example_group_runner_spec.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Runner
+    describe ExampleGroupRunner do
+      before(:each) do
+        err = StringIO.new('')
+        out = StringIO.new('')
+        @options = Options.new(err, out)
+        @runner = Spec::Runner::ExampleGroupRunner.new(@options)
+      end
+
+      after(:each) do
+        Spec::Expectations.differ = nil
+      end
+
+      describe "#load_files" do
+        it "should load UTF-8 encoded files" do
+          file = File.expand_path(File.dirname(__FILE__) + "/resources/utf8_encoded.rb")
+          @options.files << file
+          @runner.load_files(@options.files_to_load).should == @options.files_to_load
+        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,108 +4,19 @@ module Spec
   module Runner
     module Formatter
       describe BaseFormatter do
-        before :each do
-          @options, @where = nil, nil
-          @formatter = BaseFormatter.new(@options, @where)
-        end
-        
-        class HaveInterfaceMatcher
-          def initialize(method)
-            @method = method
-          end
-          
-          attr_reader :object
-          attr_reader :method
-          
-          def matches?(object)
-            @object = object
-            object.respond_to?(@method)
-          end
-          
-          def with(arity)
-            WithArity.new(self, @method, arity)
-          end
-          
-          class WithArity
-            def initialize(matcher, method, arity)
-              @have_matcher = matcher
-              @method = method
-              @arity  = arity
-            end
-            
-            def matches?(an_object)
-              @have_matcher.matches?(an_object) && real_arity == @arity
-            end
-            
-            def failure_message
-              "#{@have_matcher} should have method :#{@method} with #{argument_arity}, but it had #{real_arity}"
-            end
-            
-            def arguments
-              self
-            end
-            
-            alias_method :argument, :arguments
-            
-          private
-            
-            def real_arity
-              @have_matcher.object.method(@method).arity
-            end
-            
-            def argument_arity
-              if @arity == 1
-                "1 argument"
-              else
-                "#{@arity} arguments"
-              end
-            end
-          end
-        end
-        
-        def have_interface_for(method)
-          HaveInterfaceMatcher.new(method)
-        end
-        
-        it "should have start as an interface with one argument"do
-          @formatter.should have_interface_for(:start).with(1).argument
-        end
-        
-        it "should have add_example_group as an interface with one argument" do
-          @formatter.should have_interface_for(:add_example_group).with(1).argument
-        end
-        
-        it "should have example_started as an interface with one argument" do
-          @formatter.should have_interface_for(:example_started).with(1).argument
-        end
-        
-        it "should have example_failed as an interface with three arguments" do
-          @formatter.should have_interface_for(:example_failed).with(3).arguments
-        end
-        
-        it "should have example_pending as an interface with three arguments" do
-          @formatter.should have_interface_for(:example_pending).with(3).arguments
-        end
-        
-        it "should have start_dump as an interface with zero arguments" do
-          @formatter.should have_interface_for(:start_dump).with(0).arguments
-        end
-        
-        it "should have dump_failure as an interface with two arguments" do
-          @formatter.should have_interface_for(:dump_failure).with(2).arguments
-        end
-        
-        it "should have dump_summary as an interface with two arguments" do
-          @formatter.should have_interface_for(:dump_failure).with(2).arguments
-        end
-
-        it "should have dump_pending as an interface with zero arguments" do
-          @formatter.should have_interface_for(:dump_pending).with(0).arguments
-        end
-
-        it "should have close  as an interface with zero arguments" do
-          @formatter.should have_interface_for(:close).with(0).arguments
-        end
+        subject {BaseFormatter.new(nil, nil)}
+        
+        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}
       end
     end
   end

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

@@ -0,0 +1,23 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec/runner/formatter/base_text_formatter'
+require 'fileutils'
+
+module Spec
+  module Runner
+    module Formatter
+      describe BaseTextFormatter do
+        
+        before :all do
+          @sandbox = "spec/sandbox"
+        end
+
+        it "should create the directory contained in WHERE if it does not exist" do
+          FileUtils.should_receive(:mkdir_p).with(@sandbox)
+          File.stub!(:open)
+          BaseTextFormatter.new({},"#{@sandbox}/temp.rb")
+        end
+
+      end
+    end
+  end
+end

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

@@ -16,10 +16,10 @@ module Spec
         
         it "should add example name for each failure" do
           formatter.add_example_group(Class.new(ExampleGroup).describe("b 1"))
-          formatter.example_failed("e 1", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          formatter.example_failed("e 1", nil, Spec::Runner::Reporter::Failure.new(nil, RuntimeError.new))
           formatter.add_example_group(Class.new(ExampleGroup).describe("b 2"))
-          formatter.example_failed("e 2", nil, Reporter::Failure.new(nil, RuntimeError.new))
-          formatter.example_failed("e 3", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          formatter.example_failed("e 2", nil, Spec::Runner::Reporter::Failure.new(nil, RuntimeError.new))
+          formatter.example_failed("e 3", nil, Spec::Runner::Reporter::Failure.new(nil, RuntimeError.new))
           io.string.should include("b 1")
           io.string.should include("b 2")
         end
@@ -30,13 +30,13 @@ module Spec
           grand_child_example_group = Class.new(child_example_group).describe("GrandChild")
 
           formatter.add_example_group(grand_child_example_group)
-          formatter.example_failed("failure", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          formatter.example_failed("failure", nil, ::Spec::Runner::Reporter::Failure.new(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(Class.new(ExampleGroup).describe("something something (druby://99.99.99.99:99)"))
-          @formatter.example_failed("e 1", nil, Reporter::Failure.new(nil, RuntimeError.new))
+          @formatter.example_failed("e 1", nil, ::Spec::Runner::Reporter::Failure.new(nil, RuntimeError.new))
           io.string.should == "something something\n"
         end
       end

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

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

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

@@ -188,7 +188,7 @@ a {
       <span class="failed_spec_name">should fail when expected message not received</span>
       <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>./failing_examples/mocking_example.rb:13:
+        <div class="backtrace"><pre>./examples/failing/mocking_example.rb:13:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:24:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:20:</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>
@@ -203,7 +203,7 @@ a {
       <span class="failed_spec_name">should fail when messages are received out of order</span>
       <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>./failing_examples/mocking_example.rb:22:
+        <div class="backtrace"><pre>./examples/failing/mocking_example.rb:22:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:24:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:20:</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>
@@ -218,7 +218,7 @@ a {
       <span class="failed_spec_name">should get yelled at when sending unexpected messages</span>
       <div class="failure" id="failure_3">
         <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div>
-        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:28:
+        <div class="backtrace"><pre>./examples/failing/mocking_example.rb:28:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:24:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:20:</pre></div>
     <pre class="ruby"><code><span class="linenum">26</span>  <span class="ident">it</span> <span class="punct">&quot;</span><span class="string">should get yelled at when sending unexpected messages</span><span class="punct">&quot;</span> <span class="keyword">do</span>
@@ -233,7 +233,7 @@ a {
       <span class="failed_spec_name">has a bug we need to fix</span>
       <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>./failing_examples/mocking_example.rb:33:
+        <div class="backtrace"><pre>./examples/failing/mocking_example.rb:33:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:24:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:20:</pre></div>
     <pre class="ruby"><code><span class="linenum">31</span>
@@ -262,7 +262,7 @@ Diff:
 +behaviour driven development
  framework for Ruby
 </pre></div>
-        <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:13:
+        <div class="backtrace"><pre>./examples/failing/diffing_spec.rb:13:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:24:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:20:</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>
@@ -292,7 +292,7 @@ Diff:
 +species=tortoise
  &gt;
 </pre></div>
-        <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:34:
+        <div class="backtrace"><pre>./examples/failing/diffing_spec.rb:34:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:24:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:20:</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>

data/spec/spec/runner/formatter/html_formatted-1.8.5-jruby.html

@@ -188,7 +188,7 @@ a {
       <span class="failed_spec_name">should fail when expected message not received</span>
       <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>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:13:in `should_receive'
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:13:in `should_receive'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
@@ -206,8 +206,8 @@ a {
       <span class="failed_spec_name">should fail when messages are received out of order</span>
       <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>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:22:in `three'
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:16:in `instance_eval'
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:22:in `three'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:16:in `instance_eval'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
@@ -225,7 +225,7 @@ a {
       <span class="failed_spec_name">should get yelled at when sending unexpected messages</span>
       <div class="failure" id="failure_3">
         <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div>
-        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:28:in `should_not_receive'
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:28:in `should_not_receive'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
@@ -243,8 +243,8 @@ a {
       <span class="failed_spec_name">has a bug we need to fix</span>
       <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>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:33:in `pending'
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:33:in `instance_eval'
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:33:in `pending'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:33:in `instance_eval'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
@@ -276,7 +276,7 @@ Diff:
 +behaviour driven development
  framework for Ruby
 </pre></div>
-        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/diffing_spec.rb:13:in `=='
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/diffing_spec.rb:13:in `=='
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
@@ -310,8 +310,8 @@ Diff:
 +species=tortoise
  &gt;
 </pre></div>
-        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/diffing_spec.rb:34:in `should'
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/diffing_spec.rb:31:in `instance_eval'
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/diffing_spec.rb:34:in `should'
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/diffing_spec.rb:31:in `instance_eval'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:24:in `run'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/spec/spec/runner/formatter/html_formatter_spec.rb:20:in `chdir'

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

@@ -188,7 +188,7 @@ a {
       <span class="failed_spec_name">should fail when expected message not received</span>
       <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>./failing_examples/mocking_example.rb:13:
+        <div class="backtrace"><pre>./examples/failing/mocking_example.rb:13:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:17:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir'
 ./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div>
@@ -204,7 +204,7 @@ a {
       <span class="failed_spec_name">should fail when messages are received out of order</span>
       <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>./failing_examples/mocking_example.rb:22:
+        <div class="backtrace"><pre>./examples/failing/mocking_example.rb:22:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:17:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir'
 ./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div>
@@ -220,7 +220,7 @@ a {
       <span class="failed_spec_name">should get yelled at when sending unexpected messages</span>
       <div class="failure" id="failure_3">
         <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div>
-        <div class="backtrace"><pre>./failing_examples/mocking_example.rb:28:
+        <div class="backtrace"><pre>./examples/failing/mocking_example.rb:28:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:17:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir'
 ./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div>
@@ -236,7 +236,7 @@ a {
       <span class="failed_spec_name">has a bug we need to fix</span>
       <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>./failing_examples/mocking_example.rb:33:
+        <div class="backtrace"><pre>./examples/failing/mocking_example.rb:33:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:17:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir'
 ./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div>
@@ -266,7 +266,7 @@ Diff:
 +behaviour driven development
  framework for Ruby
 </pre></div>
-        <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:13:
+        <div class="backtrace"><pre>./examples/failing/diffing_spec.rb:13:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:17:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir'
 ./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div>
@@ -297,7 +297,7 @@ Diff:
 +species=tortoise
  &gt;
 </pre></div>
-        <div class="backtrace"><pre>./failing_examples/diffing_spec.rb:34:
+        <div class="backtrace"><pre>./examples/failing/diffing_spec.rb:34:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:17:
 ./spec/spec/runner/formatter/html_formatter_spec.rb:13:in `chdir'
 ./spec/spec/runner/formatter/html_formatter_spec.rb:13:</pre></div>

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

@@ -188,7 +188,7 @@ a {
       <span class="failed_spec_name">should fail when expected message not received</span>
       <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>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:13:
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:13:
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:28:
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:
@@ -205,8 +205,8 @@ a {
       <span class="failed_spec_name">should fail when messages are received out of order</span>
       <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>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:22:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:16:in `instance_eval'
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:22:
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:16:in `instance_eval'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:28:
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:
@@ -223,7 +223,7 @@ a {
       <span class="failed_spec_name">should get yelled at when sending unexpected messages</span>
       <div class="failure" id="failure_3">
         <div class="message"><pre>Mock 'don't talk to me' expected :any_message_at_all with (any args) 0 times, but received it once</pre></div>
-        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:28:
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:28:
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:28:
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:
@@ -240,8 +240,8 @@ a {
       <span class="failed_spec_name">has a bug we need to fix</span>
       <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>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:33:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/mocking_example.rb:33:in `instance_eval'
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:33:
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/mocking_example.rb:33:in `instance_eval'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:28:
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:
@@ -272,8 +272,8 @@ Diff:
 +behaviour driven development
  framework for Ruby
 </pre></div>
-        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/diffing_spec.rb:13:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/diffing_spec.rb:2:in `instance_eval'
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/diffing_spec.rb:13:
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/diffing_spec.rb:2:in `instance_eval'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:28:
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:
@@ -305,8 +305,8 @@ Diff:
 +species=tortoise
  &gt;
 </pre></div>
-        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/diffing_spec.rb:34:
-/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./failing_examples/diffing_spec.rb:31:in `instance_eval'
+        <div class="backtrace"><pre>/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/diffing_spec.rb:34:
+/Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./examples/failing/diffing_spec.rb:31:in `instance_eval'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:28:
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24:in `chdir'
 /Users/david/projects/ruby/jruby/testsuites/rspec/target/rspec/./spec/spec/runner/formatter/html_formatter_spec.rb:24: