rspec 0.8.2 → 0.9.0

data/spec/spec/runner/formatter/progress_bar_formatter_dry_run_spec.rb

@@ -3,15 +3,15 @@ require File.dirname(__FILE__) + '/../../../spec_helper.rb'
 module Spec
 module Runner
 module Formatter
-context "ProgressBarFormatterDryRun" do
-    setup do
+describe "ProgressBarFormatterDryRun" do
+    before(:each) do
         @io = StringIO.new
-        @formatter = ProgressBarFormatter.new(@io, true)
-      
+        @formatter = ProgressBarFormatter.new(@io)
+        @formatter.dry_run = true
     end
-    specify "should not produce summary on dry run" do
+    it "should not produce summary on dry run" do
         @formatter.dump_summary(3, 2, 1)
-        @io.string.should_eql("")
+        @io.string.should eql("")
       
     end
   

data/spec/spec/runner/formatter/progress_bar_formatter_failure_dump_spec.rb

@@ -3,27 +3,27 @@ require File.dirname(__FILE__) + '/../../../spec_helper.rb'
 module Spec
   module Runner
     module Formatter
-      context "ProgressBarFormatter failure dump with NoisyBacktraceTweaker" do
-        setup do
+      describe "ProgressBarFormatter failure dump with NoisyBacktraceTweaker" do
+        before(:each) do
           @io = StringIO.new
-          @reporter = Reporter.new(ProgressBarFormatter.new(@io), NoisyBacktraceTweaker.new)
-          @reporter.add_context("context")
+          @reporter = Reporter.new([ProgressBarFormatter.new(@io)], NoisyBacktraceTweaker.new)
+          @reporter.add_behaviour("context")
         end
 
-        specify "should end with line break" do
+        it "should end with line break" do
           error=Spec::Expectations::ExpectationNotMetError.new("message")
           set_backtrace(error)
-          @reporter.spec_finished("spec", error, "spec")
+          @reporter.example_finished("spec", error, "spec")
           @reporter.dump
-          @io.string.should_match(/\n\z/)
+          @io.string.should match(/\n\z/)
         end
 
-        specify "should include context and spec name in backtrace if error in spec" do
+        it "should include context and spec name in backtrace if error in spec" do
           error=RuntimeError.new("message")
           set_backtrace(error)
-          @reporter.spec_finished("spec", error, "spec")
+          @reporter.example_finished("spec", error, "spec")
           @reporter.dump
-          @io.string.should_match(/RuntimeError in 'context spec'/)
+          @io.string.should match(/RuntimeError in 'context spec'/)
         end
 
         def set_backtrace(error)

data/spec/spec/runner/formatter/progress_bar_formatter_spec.rb

@@ -3,52 +3,47 @@ require File.dirname(__FILE__) + '/../../../spec_helper.rb'
 module Spec
   module Runner
     module Formatter
-      context "ProgressBarFormatter" do
-        setup do
+      describe "ProgressBarFormatter" do
+        before(:each) do
           @io = StringIO.new
           @formatter = ProgressBarFormatter.new(@io)
         end
 
-        specify "should produce line break on start dump" do
+        it "should produce line break on start dump" do
           @formatter.start_dump
-          @io.string.should_eql("\n")
+          @io.string.should eql("\n")
         end
 
-        specify "should produce standard summary" do
+        it "should produce standard summary" do
           @formatter.dump_summary(3, 2, 1)
-          @io.string.should_eql("\nFinished in 3 seconds\n\n2 specifications, 1 failure\n")
+          @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure\n")
         end
 
-        specify "should push F for failing spec" do
-          @formatter.spec_failed("spec", 98, Reporter::Failure.new("c", "s", RuntimeError.new))
-          @io.string.should_eql("F")
+        it "should push F for failing spec" do
+          @formatter.example_failed("spec", 98, Reporter::Failure.new("c s", RuntimeError.new))
+          @io.string.should eql("F")
         end
 
-        specify "should push dot for passing spec" do
-          @formatter.spec_passed("spec")
-          @io.string.should_eql(".")
+        it "should push dot for passing spec" do
+          @formatter.example_passed("spec")
+          @io.string.should eql(".")
         end
 
-        specify "should push line break for context" do
-          @formatter.add_context("context", :ignored)
-          @io.string.should_eql("\n")
-        end
-
-        specify "should push nothing on start" do
+        it "should push nothing on start" do
           @formatter.start(4)
-          @io.string.should_eql("")
+          @io.string.should eql("")
         end
 
-        specify "should ensure two ':' in the first backtrace" do
+        it "should ensure two ':' in the first backtrace" do
           backtrace = ["/tmp/x.rb:1", "/tmp/x.rb:2", "/tmp/x.rb:3"]
-          @formatter.format_backtrace(backtrace).should_eql(<<-EOE.rstrip)
+          @formatter.format_backtrace(backtrace).should eql(<<-EOE.rstrip)
 /tmp/x.rb:1:
 /tmp/x.rb:2:
 /tmp/x.rb:3:
 EOE
 
           backtrace = ["/tmp/x.rb:1: message", "/tmp/x.rb:2", "/tmp/x.rb:3"]
-          @formatter.format_backtrace(backtrace).should_eql(<<-EOE.rstrip)
+          @formatter.format_backtrace(backtrace).should eql(<<-EOE.rstrip)
 /tmp/x.rb:1: message
 /tmp/x.rb:2:
 /tmp/x.rb:3:
@@ -56,21 +51,21 @@ EOE
         end
       end
       
-      context "ProgressBarFormatter outputting to custom out" do
-        setup do
+      describe "ProgressBarFormatter outputting to custom out" do
+        before(:each) do
           @out = mock("out")
           @out.stub!(:puts)
           @formatter = ProgressBarFormatter.new(@out)
           @formatter.class.send :public, :output_to_tty?
         end
 
-        teardown do
+        after(:each) do
           @formatter.class.send :protected, :output_to_tty?
         end
 
-        specify "should not throw NoMethodError on output_to_tty?" do
+        it "should not throw NoMethodError on output_to_tty?" do
           @out.should_receive(:tty?).and_raise(NoMethodError)
-          @formatter.output_to_tty?.should be(false)
+          @formatter.output_to_tty?.should be_false
         end
       end
     end

data/spec/spec/runner/formatter/rdoc_formatter_dry_run_spec.rb

@@ -3,14 +3,15 @@ require File.dirname(__FILE__) + '/../../../spec_helper.rb'
 module Spec
 module Runner
 module Formatter
-context "RdocFormatterDryRun" do
-    setup do
+describe "RdocFormatterDryRun" do
+    before(:each) do
         @io = StringIO.new
-        @formatter = RdocFormatter.new(@io, true)
+        @formatter = RdocFormatter.new(@io)
+        @formatter.dry_run = true
     end
-    specify "should not produce summary on dry run" do
+    it "should not produce summary on dry run" do
         @formatter.dump_summary(3, 2, 1)
-        @io.string.should_eql ""      
+        @io.string.should == ""      
     end
 end
 end

data/spec/spec/runner/formatter/rdoc_formatter_spec.rb

@@ -3,35 +3,35 @@ require File.dirname(__FILE__) + '/../../../spec_helper.rb'
 module Spec
 module Runner
 module Formatter
-context "RdocFormatter" do
-    setup do
+describe "RdocFormatter" do
+    before(:each) do
         @io = StringIO.new
-        @formatter = RdocFormatter.new(@io, true)
-      
+        @formatter = RdocFormatter.new(@io)
+        @formatter.dry_run = true
     end
-    specify "should produce no summary" do
+    it "should produce no summary" do
         @formatter.dump_summary(nil, nil, nil)
-        @io.string.should_be_empty
+        @io.string.should be_empty
       
     end
-    specify "should produce nothing on start dump" do
+    it "should produce nothing on start dump" do
         @formatter.start_dump
-        @io.string.should_be_empty
+        @io.string.should be_empty
       
     end
-    specify "should push out context" do
-        @formatter.add_context("context", :ignored)
-        @io.string.should_eql("# context\n")
+    it "should push out context" do
+        @formatter.add_behaviour("context")
+        @io.string.should eql("# context\n")
       
     end
-    specify "should push out failed spec" do
-        @formatter.spec_failed("spec", 98, nil)
-        @io.string.should_eql("# * spec [98 - FAILED]\n")
+    it "should push out failed spec" do
+        @formatter.example_failed("spec", 98, nil)
+        @io.string.should eql("# * spec [98 - FAILED]\n")
       
     end
-    specify "should push out spec" do
-        @formatter.spec_passed("spec")
-        @io.string.should_eql("# * spec\n")
+    it "should push out spec" do
+        @formatter.example_passed("spec")
+        @io.string.should eql("# * spec\n")
       
     end
   

data/spec/spec/runner/formatter/snippet_extractor_spec.rb

@@ -0,0 +1,11 @@
+require File.dirname(__FILE__) + '/../../../spec_helper.rb'
+
+describe Spec::Runner::Formatter::SnippetExtractor do
+  it "should fall back on a default message when it doesn't understand a line" do
+    Spec::Runner::Formatter::SnippetExtractor.new.snippet_for("blech").should == ["# Couldn't get snippet for blech", 1]
+  end
+
+  it "should fall back on a default message when it doesn't find the file" do
+    Spec::Runner::Formatter::SnippetExtractor.new.lines_around("blech", 8).should == "# Couldn't get snippet for blech"
+  end
+end

data/spec/spec/runner/formatter/specdoc_formatter_dry_run_spec.rb

@@ -3,15 +3,15 @@ require File.dirname(__FILE__) + '/../../../spec_helper.rb'
 module Spec
 module Runner
 module Formatter
-context "SpecdocFormatterDryRun" do
-    setup do
+describe "SpecdocFormatterDryRun" do
+    before(:each) do
         @io = StringIO.new
-        @formatter = SpecdocFormatter.new(@io, true)
-      
+        @formatter = SpecdocFormatter.new(@io)
+        @formatter.dry_run = true
     end
-    specify "should not produce summary on dry run" do
+    it "should not produce summary on dry run" do
         @formatter.dump_summary(3, 2, 1)
-        @io.string.should_eql("")
+        @io.string.should eql("")
       
     end
   

data/spec/spec/runner/formatter/specdoc_formatter_spec.rb

@@ -3,40 +3,40 @@ require File.dirname(__FILE__) + '/../../../spec_helper.rb'
 module Spec
 module Runner
 module Formatter
-context "SpecdocFormatter" do
-    setup do
+describe "SpecdocFormatter" do
+    before(:each) do
         @io = StringIO.new
         @formatter = SpecdocFormatter.new(@io)
       
     end
-    specify "should produce standard summary" do
+    it "should produce standard summary" do
         @formatter.dump_summary(3, 2, 1)
-        @io.string.should_eql("\nFinished in 3 seconds\n\n2 specifications, 1 failure\n")
+        @io.string.should eql("\nFinished in 3 seconds\n\n2 examples, 1 failure\n")
       
     end
-    specify "should push context name" do
-        @formatter.add_context("context", :ignored)
-        @io.string.should_eql("\ncontext\n")
+    it "should push context name" do
+        @formatter.add_behaviour("context")
+        @io.string.should eql("\ncontext\n")
       
     end
-    specify "should push failing spec name and failure number" do
-        @formatter.spec_failed("spec", 98, Reporter::Failure.new("c", "s", RuntimeError.new))
-        @io.string.should_eql("- spec (ERROR - 98)\n")
+    it "should push failing spec name and failure number" do
+        @formatter.example_failed("spec", 98, Reporter::Failure.new("c s", RuntimeError.new))
+        @io.string.should eql("- spec (ERROR - 98)\n")
       
     end
-    specify "should push nothing on start" do
+    it "should push nothing on start" do
         @formatter.start(5)
-        @io.string.should_eql("")
+        @io.string.should eql("")
       
     end
-    specify "should push nothing on start dump" do
+    it "should push nothing on start dump" do
         @formatter.start_dump
-        @io.string.should_eql("")
+        @io.string.should eql("")
       
     end
-    specify "should push passing spec name" do
-        @formatter.spec_passed("spec")
-        @io.string.should_eql("- spec\n")
+    it "should push passing spec name" do
+        @formatter.example_passed("spec")
+        @io.string.should eql("- spec\n")
       
     end
   

data/spec/spec/runner/heckle_runner_spec.rb

@@ -14,50 +14,50 @@ unless ['i386-mswin32', 'java'].index(PLATFORM)
     end
   end
 
-  context "HeckleRunner" do
-    setup do
+  describe "HeckleRunner" do
+    before(:each) do
       @heckle = mock("heckle", :null_object => true)
-      @context_runner = mock("context_runner")
+      @behaviour_runner = mock("behaviour_runner")
       @heckle_class = mock("heckle_class")
     end
 
-    specify "should heckle all methods in all classes in a module" do
-      @heckle_class.should_receive(:new).with("Foo::Bar", "one", context_runner).and_return(@heckle)
-      @heckle_class.should_receive(:new).with("Foo::Bar", "two", context_runner).and_return(@heckle)
-      @heckle_class.should_receive(:new).with("Foo::Zap", "three", context_runner).and_return(@heckle)
-      @heckle_class.should_receive(:new).with("Foo::Zap", "four", context_runner).and_return(@heckle)
+    it "should heckle all methods in all classes in a module" do
+      @heckle_class.should_receive(:new).with("Foo::Bar", "one", behaviour_runner).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Bar", "two", behaviour_runner).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Zap", "three", behaviour_runner).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Zap", "four", behaviour_runner).and_return(@heckle)
 
       heckle_runner = Spec::Runner::HeckleRunner.new("Foo", @heckle_class)
-      heckle_runner.heckle_with(context_runner)
+      heckle_runner.heckle_with(behaviour_runner)
     end
 
-    specify "should heckle all methods in a class" do
-      @heckle_class.should_receive(:new).with("Foo::Bar", "one", context_runner).and_return(@heckle)
-      @heckle_class.should_receive(:new).with("Foo::Bar", "two", context_runner).and_return(@heckle)
+    it "should heckle all methods in a class" do
+      @heckle_class.should_receive(:new).with("Foo::Bar", "one", behaviour_runner).and_return(@heckle)
+      @heckle_class.should_receive(:new).with("Foo::Bar", "two", behaviour_runner).and_return(@heckle)
 
       heckle_runner = Spec::Runner::HeckleRunner.new("Foo::Bar", @heckle_class)
-      heckle_runner.heckle_with(context_runner)
+      heckle_runner.heckle_with(behaviour_runner)
     end
 
-    specify "should fail heckling when the class is not found" do
+    it "should fail heckling when the class is not found" do
       lambda do
         heckle_runner = Spec::Runner::HeckleRunner.new("Foo::Bob", @heckle_class)
-        heckle_runner.heckle_with(context_runner)
+        heckle_runner.heckle_with(behaviour_runner)
       end.should raise_error(StandardError, "Heckling failed - \"Foo::Bob\" is not a known class or module")
     end
 
-    specify "should heckle specific method in a class (with #)" do
-      @heckle_class.should_receive(:new).with("Foo::Bar", "two", context_runner).and_return(@heckle)
+    it "should heckle specific method in a class (with #)" do
+      @heckle_class.should_receive(:new).with("Foo::Bar", "two", behaviour_runner).and_return(@heckle)
 
       heckle_runner = Spec::Runner::HeckleRunner.new("Foo::Bar#two", @heckle_class)
-      heckle_runner.heckle_with(context_runner)
+      heckle_runner.heckle_with(behaviour_runner)
     end
 
-    specify "should heckle specific method in a class (with .)" do
-      @heckle_class.should_receive(:new).with("Foo::Bar", "two", context_runner).and_return(@heckle)
+    it "should heckle specific method in a class (with .)" do
+      @heckle_class.should_receive(:new).with("Foo::Bar", "two", behaviour_runner).and_return(@heckle)
 
       heckle_runner = Spec::Runner::HeckleRunner.new("Foo::Bar.two", @heckle_class)
-      heckle_runner.heckle_with(context_runner)
+      heckle_runner.heckle_with(behaviour_runner)
     end
   end
 end

data/spec/spec/runner/heckler_spec.rb

@@ -2,11 +2,11 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 unless ['i386-mswin32', 'java'].index(PLATFORM)
   require 'spec/runner/heckle_runner'
 
-  context "Heckler" do
-    specify "should run context_runner on tests_pass?" do
-      context_runner = mock("context_runner")
-      context_runner.should_receive(:run)
-      heckler = Spec::Runner::Heckler.new('Array', 'push', context_runner)
+  describe "Heckler" do
+    it "should run behaviour_runner on tests_pass?" do
+      behaviour_runner = mock("behaviour_runner")
+      behaviour_runner.should_receive(:run).with([], false)
+      heckler = Spec::Runner::Heckler.new('Array', 'push', behaviour_runner)
 
       heckler.tests_pass?
     end

data/spec/spec/runner/noisy_backtrace_tweaker_spec.rb

@@ -2,42 +2,42 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Runner
-    context "NoisyBacktraceTweaker" do
-      setup do
+    describe "NoisyBacktraceTweaker" do
+      before(:each) do
         @error = RuntimeError.new
         @tweaker = NoisyBacktraceTweaker.new
       end
         
-      specify "should leave anything in lib spec dir" do
+      it "should leave anything in lib spec dir" do
         ["expectations", "mocks", "runner", "stubs"].each do |child|
           @error.set_backtrace(["/lib/spec/#{child}/anything.rb"])
           @tweaker.tweak_backtrace(@error, "spec name")
-          @error.backtrace.should_not_be_empty
+          @error.backtrace.should_not be_empty
         end
       end
 
-      specify "should leave anything in spec dir" do
+      it "should leave anything in spec dir" do
         @error.set_backtrace(["/lib/spec/expectations/anything.rb"])
         @tweaker.tweak_backtrace(@error, "spec name")
-        @error.backtrace.should_not_be_empty
+        @error.backtrace.should_not be_empty
       end
 
-      specify "should leave bin spec" do
+      it "should leave bin spec" do
         @error.set_backtrace(["bin/spec:"])
         @tweaker.tweak_backtrace(@error, "spec name")
-        @error.backtrace.should_not_be_empty
+        @error.backtrace.should_not be_empty
       end
 
-      specify "should not barf on nil backtrace" do
+      it "should not barf on nil backtrace" do
         lambda do
           @tweaker.tweak_backtrace(@error, "spec name")
-        end.should_not_raise
+        end.should_not raise_error
       end
       
-      specify "should clean up double slashes" do
+      it "should clean up double slashes" do
         @error.set_backtrace(["/a//b/c//d.rb"])
         @tweaker.tweak_backtrace(@error, "spec name")
-        @error.backtrace.should_include "/a/b/c/d.rb"
+        @error.backtrace.should include("/a/b/c/d.rb")
       end
       
     end