rspec 1.0.8 → 1.1.0

data/spec/spec/interop/test/unit/test_unit_spec_helper.rb

@@ -0,0 +1,14 @@
+require File.dirname(__FILE__) + '/../../../../spec_helper'
+require File.dirname(__FILE__) + '/../../../../ruby_forker'
+
+describe "Test::Unit interop", :shared => true do
+  include RubyForker
+  
+  def run_script(file_name)
+    output = ruby(file_name)
+    if !$?.success? || output.include?("FAILED") || output.include?("Error")
+      raise output
+    end
+    output
+  end  
+end

data/spec/spec/interop/test/unit/testcase_spec.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/test_unit_spec_helper'
+
+describe "Test::Unit::TestCase" do
+  it_should_behave_like "Test::Unit interop"
+  it "should pass" do
+    dir = File.dirname(__FILE__)
+    output = run_script("#{dir}/testcase_spec_with_test_unit.rb")
+    output.should include("3 examples, 0 failures")
+  end
+end

data/spec/spec/interop/test/unit/testcase_spec_with_test_unit.rb

@@ -0,0 +1,20 @@
+require "test/unit"
+require File.dirname(__FILE__) + '/../../../../spec_helper.rb'
+
+describe "TestCase#method_name" do
+  it "should equal the description of the example" do
+    @method_name.should == "should equal the description of the example"
+  end
+
+  def test_this
+    true.should be_true
+  end
+
+  def testThis
+    true.should be_true
+  end
+
+  def testament
+    raise "testament is not a test"
+  end
+end

data/spec/spec/interop/test/unit/testsuite_adapter_spec.rb

@@ -0,0 +1,9 @@
+require File.dirname(__FILE__) + '/test_unit_spec_helper'
+
+describe "TestSuiteAdapter" do
+  it_should_behave_like "Test::Unit interop"
+  it "should pass" do
+    dir = File.dirname(__FILE__)
+    run_script "#{dir}/testsuite_adapter_spec_with_test_unit.rb"
+  end
+end

data/spec/spec/interop/test/unit/testsuite_adapter_spec_with_test_unit.rb

@@ -0,0 +1,34 @@
+require "test/unit"
+require File.dirname(__FILE__) + '/../../../../spec_helper.rb'
+
+module TestSuiteAdapterSpecHelper
+  def create_adapter(group)
+    Test::Unit::TestSuiteAdapter.new(group)
+  end
+end
+
+describe "TestSuiteAdapter#size" do
+  include TestSuiteAdapterSpecHelper
+  it "should return the number of examples in the example group" do
+    group = Class.new(Spec::ExampleGroup) do
+      describe("some examples")
+      it("bar") {}
+      it("baz") {}
+    end
+    adapter = create_adapter(group)
+    adapter.size.should == 2
+  end
+end
+
+describe "TestSuiteAdapter#delete" do
+  include TestSuiteAdapterSpecHelper
+  it "should do nothing" do
+    group = Class.new(Spec::ExampleGroup) do
+      describe("Some Examples")
+      it("does something") {}
+    end
+    adapter = create_adapter(group)
+    adapter.delete(adapter.examples.first)
+    adapter.should be_empty
+  end
+end

data/spec/spec/matchers/be_spec.rb

@@ -199,6 +199,21 @@ describe "should be ===" do
   end
 end
 
+describe "should be" do
+  it "should pass if actual is true or a set value" do
+    true.should be
+    1.should be
+  end
+
+  it "should fail if actual is false" do
+    lambda {false.should be}.should fail_with("expected if to be satisfied, got false")
+  end
+
+  it "should fail if actual is nil" do
+    lambda {nil.should be}.should fail_with("expected if to be satisfied, got nil")
+  end
+end
+
 describe "should be(value)" do
   it "should pass if actual.equal?(value)" do
     5.should be(5)

data/spec/spec/matchers/change_spec.rb

@@ -133,6 +133,93 @@ describe "should change{ block }.by(expected)" do
   end
 end
 
+describe "should change(actual, message).by_at_least(expected)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when attribute is changed by greater than the expected amount" do
+    lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_least(1)
+  end
+  
+  it "should pass when attribute is changed by the expected amount" do
+    lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_least(2)
+  end  
+
+  it "should fail when the attribute is changed by less than the expected amount" do
+    lambda do
+      lambda { @instance.some_value += 1 }.should change(@instance, :some_value).by_at_least(2)
+    end.should fail_with("some_value should have been changed by at least 2, but was changed by 1")
+  end
+
+end
+
+describe "should change{ block }.by_at_least(expected)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when attribute is changed by greater than expected amount" do
+    lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_least(1)
+  end
+  
+  it "should pass when attribute is changed by the expected amount" do
+    lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_least(2)
+  end  
+
+  it "should fail when the attribute is changed by less than the unexpected amount" do
+    lambda do
+      lambda { @instance.some_value += 1 }.should change{@instance.some_value}.by_at_least(2)
+    end.should fail_with("result should have been changed by at least 2, but was changed by 1")
+  end
+end
+
+
+describe "should change(actual, message).by_at_most(expected)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when attribute is changed by less than the expected amount" do
+    lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_most(3)
+  end
+  
+  it "should pass when attribute is changed by the expected amount" do
+    lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_most(2)
+  end  
+
+  it "should fail when the attribute is changed by greater than the expected amount" do
+    lambda do
+      lambda { @instance.some_value += 2 }.should change(@instance, :some_value).by_at_most(1)
+    end.should fail_with("some_value should have been changed by at most 1, but was changed by 2")
+  end
+
+end
+
+describe "should change{ block }.by_at_most(expected)" do
+  before(:each) do
+    @instance = SomethingExpected.new
+    @instance.some_value = 5
+  end
+
+  it "should pass when attribute is changed by less than expected amount" do
+    lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_most(3)
+  end
+  
+  it "should pass when attribute is changed by the expected amount" do
+    lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_most(2)
+  end  
+
+  it "should fail when the attribute is changed by greater than the unexpected amount" do
+    lambda do
+      lambda { @instance.some_value += 2 }.should change{@instance.some_value}.by_at_most(1)
+    end.should fail_with("result should have been changed by at most 1, but was changed by 2")
+  end
+end
+
 describe "should change(actual, message).from(old)" do
   before(:each) do
     @instance = SomethingExpected.new

data/spec/spec/matchers/description_generation_spec.rb

@@ -1,148 +1,146 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 describe "Matchers should be able to generate their own descriptions" do
-  before(:each) do
-    @desc = nil
-    @callback = lambda { |desc| @desc = desc }
-    Spec::Matchers.description_generated(@callback)
+  after(:each) do
+    Spec::Matchers.clear_generated_description
   end
-  
+
   it "should == expected" do
     "this".should == "this"
-    @desc.should == "should == \"this\""
+    Spec::Matchers.generated_description.should == "should == \"this\""
   end
   
   it "should not == expected" do
     "this".should_not == "that"
-    @desc.should == "should not == \"that\""
+    Spec::Matchers.generated_description.should == "should not == \"that\""
   end
   
   it "should be empty (arbitrary predicate)" do
     [].should be_empty
-    @desc.should == "should be empty"
+    Spec::Matchers.generated_description.should == "should be empty"
   end
   
   it "should not be empty (arbitrary predicate)" do
     [1].should_not be_empty
-    @desc.should == "should not be empty"
+    Spec::Matchers.generated_description.should == "should not be empty"
   end
   
   it "should be true" do
     true.should be_true
-    @desc.should == "should be true"
+    Spec::Matchers.generated_description.should == "should be true"
   end
   
   it "should be false" do
     false.should be_false
-    @desc.should == "should be false"
+    Spec::Matchers.generated_description.should == "should be false"
   end
   
   it "should be nil" do
     nil.should be_nil
-    @desc.should == "should be nil"
+    Spec::Matchers.generated_description.should == "should be nil"
   end
   
   it "should be > n" do
     5.should be > 3
-    @desc.should == "should be > 3"
+    Spec::Matchers.generated_description.should == "should be > 3"
   end
   
   it "should be predicate arg1, arg2 and arg3" do
     5.0.should be_between(0,10)
-    @desc.should == "should be between 0 and 10"
+    Spec::Matchers.generated_description.should == "should be between 0 and 10"
   end
 
   it "should be_few_words predicate should be transformed to 'be few words'" do
     5.should be_kind_of(Fixnum)
-    @desc.should == "should be kind of Fixnum"
+    Spec::Matchers.generated_description.should == "should be kind of Fixnum"
   end
 
   it "should preserve a proper prefix for be predicate" do
     5.should be_a_kind_of(Fixnum)
-    @desc.should == "should be a kind of Fixnum"
+    Spec::Matchers.generated_description.should == "should be a kind of Fixnum"
     5.should be_an_instance_of(Fixnum)
-    @desc.should == "should be an instance of Fixnum"
+    Spec::Matchers.generated_description.should == "should be an instance of Fixnum"
   end
   
   it "should equal" do
     expected = "expected"
     expected.should equal(expected)
-    @desc.should == "should equal \"expected\""
+    Spec::Matchers.generated_description.should == "should equal \"expected\""
   end
   
   it "should_not equal" do
     5.should_not equal(37)
-    @desc.should == "should not equal 37"
+    Spec::Matchers.generated_description.should == "should not equal 37"
   end
   
   it "should eql" do
     "string".should eql("string")
-    @desc.should == "should eql \"string\""
+    Spec::Matchers.generated_description.should == "should eql \"string\""
   end
   
   it "should not eql" do
     "a".should_not eql(:a)
-    @desc.should == "should not eql :a"
+    Spec::Matchers.generated_description.should == "should not eql :a"
   end
   
   it "should have_key" do
     {:a => "a"}.should have_key(:a)
-    @desc.should == "should have key :a"
+    Spec::Matchers.generated_description.should == "should have key :a"
   end
   
   it "should have n items" do
     team.should have(3).players
-    @desc.should == "should have 3 players"
+    Spec::Matchers.generated_description.should == "should have 3 players"
   end
   
   it "should have at least n items" do
     team.should have_at_least(2).players
-    @desc.should == "should have at least 2 players"
+    Spec::Matchers.generated_description.should == "should have at least 2 players"
   end
   
   it "should have at most n items" do
     team.should have_at_most(4).players
-    @desc.should == "should have at most 4 players"
+    Spec::Matchers.generated_description.should == "should have at most 4 players"
   end
   
   it "should include" do
     [1,2,3].should include(3)
-    @desc.should == "should include 3"
+    Spec::Matchers.generated_description.should == "should include 3"
   end
   
   it "should match" do
     "this string".should match(/this string/)
-    @desc.should == "should match /this string/"
+    Spec::Matchers.generated_description.should == "should match /this string/"
   end
   
   it "should raise_error" do
     lambda { raise }.should raise_error
-    @desc.should == "should raise Exception"
+    Spec::Matchers.generated_description.should == "should raise Exception"
   end
   
   it "should raise_error with type" do
     lambda { raise }.should raise_error(RuntimeError)
-    @desc.should == "should raise RuntimeError"
+    Spec::Matchers.generated_description.should == "should raise RuntimeError"
   end
   
   it "should raise_error with type and message" do
     lambda { raise "there was an error" }.should raise_error(RuntimeError, "there was an error")
-    @desc.should == "should raise RuntimeError with \"there was an error\""
+    Spec::Matchers.generated_description.should == "should raise RuntimeError with \"there was an error\""
   end
   
   it "should respond_to" do
     [].should respond_to(:insert)
-    @desc.should == "should respond to #insert"
+    Spec::Matchers.generated_description.should == "should respond to #insert"
   end
   
   it "should throw symbol" do
     lambda { throw :what_a_mess }.should throw_symbol
-    @desc.should == "should throw a Symbol"
+    Spec::Matchers.generated_description.should == "should throw a Symbol"
   end
   
   it "should throw symbol (with named symbol)" do
     lambda { throw :what_a_mess }.should throw_symbol(:what_a_mess)
-    @desc.should == "should throw :what_a_mess"
+    Spec::Matchers.generated_description.should == "should throw :what_a_mess"
   end
   
   def team
@@ -152,8 +150,4 @@ describe "Matchers should be able to generate their own descriptions" do
       end
     end.new
   end
-  
-  after(:each) do
-    Spec::Matchers.unregister_description_generated(@callback)
-  end
 end

data/spec/spec/matchers/exist_spec.rb

@@ -1,8 +1,5 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-# NOTE - this was initially handled by an explicit matcher, but is now
-# handled by a default set of predicate_matchers.
-
 class Substance
   def initialize exists, description
     @exists = exists
@@ -16,33 +13,45 @@ class Substance
   end
 end
   
-describe "should exist" do
-  before(:each) do
-    @real = Substance.new true, 'something real'
-    @imaginary = Substance.new false, 'something imaginary'
+class SubstanceTester
+  include Spec::Matchers
+  def initialize substance
+    @substance = substance
   end
-  
-  it "should pass if target exists" do
-    @real.should exist
-  end
-  
-  it "should fail if target does not exist" do
-    lambda { @imaginary.should exist }.
-      should fail
+  def should_exist
+    @substance.should exist
   end
 end
 
-describe "should_not exist" do  
+describe "should exist," do
+  
   before(:each) do
     @real = Substance.new true, 'something real'
     @imaginary = Substance.new false, 'something imaginary'
   end
-  it "should pass if target doesn't exist" do
-    @imaginary.should_not exist
+
+  describe "within an example group" do
+  
+    it "should pass if target exists" do
+      @real.should exist
+    end
+  
+    it "should fail if target does not exist" do
+      lambda { @imaginary.should exist }.should fail
+    end
+    
+    it "should pass if target doesn't exist" do
+      lambda { @real.should_not exist }.should fail
+    end
   end
-  it "should fail if target does exist" do
-    lambda { @real.should_not exist }.
-      should fail
+
+  describe "outside of an example group" do
+
+    it "should pass if target exists" do
+      real_tester = SubstanceTester.new @real
+      real_tester.should_exist
+    end
+
   end
+
 end
-