dchelimsky-rspec 1.1.99.9 → 1.1.99.13

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

@@ -42,8 +42,4 @@ describe "Test::Unit::TestCase" do
       $?.should == 256
     end
   end
-  
-  describe "not yet implemented examples:" do
-    it "this example should be reported as pending (not an error)"
-  end
 end

data/spec/spec/matchers/be_close_spec.rb

@@ -29,7 +29,7 @@ module Spec
         #when
           matcher.matches?(5.51)
         #then
-          matcher.failure_message.should == "expected 5.0 +/- (< 0.5), got 5.51"
+          matcher.failure_message_for_should.should == "expected 5.0 +/- (< 0.5), got 5.51"
       end
       it "should describe itself" do
         matcher = be_close(5.0, 0.5)

data/spec/spec/matchers/change_spec.rb

@@ -307,6 +307,18 @@ describe "should change(actual, message).from(old).to(new)" do
   it "should pass when #from comes before #to" do
     lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).from("string").to("cat")
   end
+  
+  it "should show the correct messaging when #after and #to are different" do
+    lambda do
+      lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).from("string").to("dog")
+    end.should fail_with("some_value should have been changed to \"dog\", but is now \"cat\"")
+  end
+  
+  it "should show the correct messaging when #before and #from are different" do
+    lambda do
+      lambda { @instance.some_value = "cat" }.should change(@instance, :some_value).from("not_string").to("cat")
+    end.should fail_with("some_value should have initially been \"not_string\", but was \"string\"")
+  end
 end
 
 describe "should change{ block }.from(old).to(new)" do

data/spec/spec/matchers/eql_spec.rb

@@ -17,12 +17,12 @@ module Spec
       it "should provide message, expected and actual on #failure_message" do
         matcher = eql("1")
         matcher.matches?(1)
-        matcher.failure_message.should == ["expected \"1\", got 1 (using .eql?)", "1", 1]
+        matcher.failure_message_for_should.should == ["expected \"1\", got 1 (using .eql?)", "1", 1]
       end
       it "should provide message, expected and actual on #negative_failure_message" do
         matcher = eql(1)
         matcher.matches?(1)
-        matcher.negative_failure_message.should == ["expected 1 not to equal 1 (using .eql?)", 1, 1]
+        matcher.failure_message_for_should_not.should == ["expected 1 not to equal 1 (using .eql?)", 1, 1]
       end
     end
   end

data/spec/spec/matchers/equal_spec.rb

@@ -17,12 +17,12 @@ module Spec
       it "should provide message, expected and actual on #failure_message" do
         matcher = equal("1")
         matcher.matches?(1)
-        matcher.failure_message.should == ["expected \"1\", got 1 (using .equal?)", "1", 1]
+        matcher.failure_message_for_should.should == ["expected \"1\", got 1 (using .equal?)", "1", 1]
       end
       it "should provide message, expected and actual on #negative_failure_message" do
         matcher = equal(1)
         matcher.matches?(1)
-        matcher.negative_failure_message.should == ["expected 1 not to equal 1 (using .equal?)", 1, 1]
+        matcher.failure_message_for_should_not.should == ["expected 1 not to equal 1 (using .equal?)", 1, 1]
       end
     end
   end

data/spec/spec/matchers/have_spec.rb

@@ -212,7 +212,7 @@ describe "should have_at_least(n).items" do
     size_matcher.matches?(owner)
     
     #then
-    length_matcher.negative_failure_message.should == <<-EOF
+    length_matcher.failure_message_for_should_not.should == <<-EOF
 Isn't life confusing enough?
 Instead of having to figure out the meaning of this:
   should_not have_at_least(3).items_in_collection_with_length_method
@@ -220,7 +220,7 @@ We recommend that you use this instead:
   should have_at_most(2).items_in_collection_with_length_method
 EOF
 
-    size_matcher.negative_failure_message.should == <<-EOF
+    size_matcher.failure_message_for_should_not.should == <<-EOF
 Isn't life confusing enough?
 Instead of having to figure out the meaning of this:
   should_not have_at_least(3).items_in_collection_with_size_method
@@ -266,7 +266,7 @@ describe "should have_at_most(n).items" do
     size_matcher.matches?(owner)
     
     #then
-    length_matcher.negative_failure_message.should == <<-EOF
+    length_matcher.failure_message_for_should_not.should == <<-EOF
 Isn't life confusing enough?
 Instead of having to figure out the meaning of this:
   should_not have_at_most(3).items_in_collection_with_length_method
@@ -274,7 +274,7 @@ We recommend that you use this instead:
   should have_at_least(4).items_in_collection_with_length_method
 EOF
     
-    size_matcher.negative_failure_message.should == <<-EOF
+    size_matcher.failure_message_for_should_not.should == <<-EOF
 Isn't life confusing enough?
 Instead of having to figure out the meaning of this:
   should_not have_at_most(3).items_in_collection_with_size_method

data/spec/spec/matchers/match_spec.rb

@@ -14,7 +14,7 @@ describe "should match(expected)" do
   it "should provide message, expected and actual on failure" do
     matcher = match(/rings/)
     matcher.matches?("string")
-    matcher.failure_message.should == ["expected \"string\" to match /rings/", /rings/, "string"]
+    matcher.failure_message_for_should.should == ["expected \"string\" to match /rings/", /rings/, "string"]
   end
 end
 
@@ -32,6 +32,6 @@ describe "should_not match(expected)" do
   it "should provide message, expected and actual on failure" do
     matcher = match(/tri/)
     matcher.matches?("string")
-    matcher.negative_failure_message.should == ["expected \"string\" not to match /tri/", /tri/, "string"]
+    matcher.failure_message_for_should_not.should == ["expected \"string\" not to match /tri/", /tri/, "string"]
   end
 end

data/spec/spec/matchers/matcher_spec.rb

@@ -0,0 +1,97 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module Matchers
+    describe Spec::Matchers::Matcher do
+      context "without overrides" do
+        before(:each) do
+          @matcher = Spec::Matchers::Matcher.new(:be_a_multiple_of, 3) do |multiple|
+            match do |actual|
+              actual % multiple == 0
+            end
+          end
+        end
+        
+        it "provides a default description" do
+          @matcher.matches?(0)
+          @matcher.description.should == "be a multiple of 3"
+        end
+
+        it "provides a default failure message for #should" do
+          @matcher.matches?(8)
+          @matcher.failure_message_for_should.should == "expected 8 to be a multiple of 3"
+        end
+
+        it "provides a default failure message for #should_not" do
+          @matcher.matches?(9)
+          @matcher.failure_message_for_should_not.should == "expected 9 not to be a multiple of 3"
+        end
+      end
+      
+      context "with overrides" do
+        before(:each) do
+          @matcher = Spec::Matchers::Matcher.new(:be_boolean, true) do |boolean|
+            match do |actual|
+              actual
+            end
+            description do
+              "be the boolean #{boolean}"
+            end
+            failure_message_for_should do |actual|
+              "expected #{actual} to be the boolean #{boolean}"
+            end
+            failure_message_for_should_not do |actual|
+              "expected #{actual} not to be the boolean #{boolean}"
+            end
+          end
+        end
+
+        it "does not hide result of match block when true" do
+          @matcher.matches?(true).should be_true
+        end
+
+        it "does not hide result of match block when false" do
+          @matcher.matches?(false).should be_false
+        end
+
+        it "overrides the description" do
+          @matcher.matches?(true)
+          @matcher.description.should == "be the boolean true"
+        end
+
+        it "overrides the failure message for #should" do
+          @matcher.matches?(false)
+          @matcher.failure_message_for_should.should == "expected false to be the boolean true"
+        end
+        
+        it "overrides the failure message for #should_not" do
+          @matcher.matches?(true)
+          @matcher.failure_message_for_should_not.should == "expected true not to be the boolean true"
+        end
+      end
+      
+      context "#new" do
+        it "passes matches? arg to match block" do
+          matcher = Spec::Matchers::Matcher.new(:ignore) do 
+            match do |actual|
+              actual == 5
+            end
+          end
+          matcher.matches?(5).should be_true
+        end
+
+        it "exposes arg submitted through #new to matcher block" do
+          matcher = Spec::Matchers::Matcher.new(:ignore, 4) do |expected|
+            match do |actual|
+              actual > expected
+            end
+          end
+          matcher.matches?(5).should be_true
+        end
+      end
+
+      context "matching with overrides" do
+      end
+    end
+  end
+end

data/spec/spec/matchers/throw_symbol_spec.rb

@@ -17,11 +17,11 @@ module Spec
         end
         it "should provide a failure message" do
           @matcher.matches?(lambda{})
-          @matcher.failure_message.should == "expected a Symbol but nothing was thrown"
+          @matcher.failure_message_for_should.should == "expected a Symbol but nothing was thrown"
         end
         it "should provide a negative failure message" do
           @matcher.matches?(lambda{ throw :sym})
-          @matcher.negative_failure_message.should == "expected no Symbol, got :sym"
+          @matcher.failure_message_for_should_not.should == "expected no Symbol, got :sym"
         end
       end
           
@@ -42,15 +42,15 @@ module Spec
         end
         it "should provide a failure message when no Symbol is thrown" do
           @matcher.matches?(lambda{})
-          @matcher.failure_message.should == "expected :sym but nothing was thrown"
+          @matcher.failure_message_for_should.should == "expected :sym but nothing was thrown"
         end
         it "should provide a failure message when wrong Symbol is thrown" do
           @matcher.matches?(lambda{ throw :other_sym })
-          @matcher.failure_message.should == "expected :sym, got :other_sym"
+          @matcher.failure_message_for_should.should == "expected :sym, got :other_sym"
         end
         it "should provide a negative failure message" do
           @matcher.matches?(lambda{ throw :sym })
-          @matcher.negative_failure_message.should == "expected :sym not to be thrown"
+          @matcher.failure_message_for_should_not.should == "expected :sym not to be thrown"
         end
         it "should only match NameErrors raised by uncaught throws" do
           @matcher.matches?(lambda{ sym }).should be_false
@@ -77,15 +77,15 @@ module Spec
         end
         it "should provide a failure message when no Symbol is thrown" do
           @matcher.matches?(lambda{})
-          @matcher.failure_message.should == %q[expected :sym with "a" but nothing was thrown]
+          @matcher.failure_message_for_should.should == %q[expected :sym with "a" but nothing was thrown]
         end
         it "should provide a failure message when wrong Symbol is thrown" do
           @matcher.matches?(lambda{ throw :other_sym })
-          @matcher.failure_message.should == %q[expected :sym with "a", got :other_sym]
+          @matcher.failure_message_for_should.should == %q[expected :sym with "a", got :other_sym]
         end
         it "should provide a negative failure message" do
           @matcher.matches?(lambda{ throw :sym })
-          @matcher.negative_failure_message.should == %q[expected :sym with "a" not to be thrown]
+          @matcher.failure_message_for_should_not.should == %q[expected :sym with "a" not to be thrown]
         end
         it "should only match NameErrors raised by uncaught throws" do
           @matcher.matches?(lambda{ sym }).should be_false

data/spec/spec/mocks/mock_spec.rb

@@ -115,7 +115,7 @@ module Spec
         lambda {
           @mock.something("a","d","c")
           @mock.rspec_verify
-        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (\"a\", \"b\", \"c\") but received it with (\"a\", \"d\", \"c\")")
+        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (\"a\", \"b\", \"c\") but received it with ([\"a\", \"d\", \"c\"])")
       end
            
       it "should raise exception if args don't match when method called even when using null_object" do
@@ -124,7 +124,7 @@ module Spec
         lambda {
           @mock.something("a","d","c")
           @mock.rspec_verify
-        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (\"a\", \"b\", \"c\") but received it with (\"a\", \"d\", \"c\")")
+        }.should raise_error(MockExpectationError, "Mock 'test mock' expected :something with (\"a\", \"b\", \"c\") but received it with ([\"a\", \"d\", \"c\"])")
       end
            
       it "should fail if unexpected method called" do

data/spec/spec/mocks/stubbed_message_expectations_spec.rb

@@ -3,12 +3,24 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module Mocks
     describe "Example with stubbed and then called message" do
-      it "should fail if the message is expected and then subsequently not called again" do
+      it "fails if the message is expected and then subsequently not called again" do
         mock_obj = mock("mock", :msg => nil)
         mock_obj.msg
         mock_obj.should_receive(:msg)
         lambda { mock_obj.rspec_verify }.should raise_error(Spec::Mocks::MockExpectationError)
       end
+
+      it "outputs arguments of all similar calls" do
+        m = mock('mock', :foo => true)
+        m.should_receive(:foo).with('first')
+        m.foo('second')
+        m.foo('third')
+        lambda do
+          m.rspec_verify
+        end.should raise_error(%q|Mock 'mock' expected :foo with ("first") but received it with (["second"], ["third"])|)
+        m.rspec_reset
+      end
     end
+    
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dchelimsky-rspec
 version: !ruby/object:Gem::Version 
-  version: 1.1.99.9
+  version: 1.1.99.13
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-24 00:00:00 -08:00
+date: 2009-03-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.8.3
+        version: 1.9.0
     version: 
 description: Behaviour Driven Development for Ruby.
 email: 
@@ -47,12 +47,9 @@ extra_rdoc_files:
 - README.txt
 - TODO.txt
 - examples/failing/README.txt
-- examples/passing/priority.txt
-- spec/spec/runner/empty_file.txt
-- spec/spec/runner/examples.txt
-- spec/spec/runner/failed.txt
 files: 
 - .autotest
+- .document
 - History.txt
 - License.txt
 - Manifest.txt
@@ -60,6 +57,7 @@ files:
 - Rakefile
 - Ruby1.9.markdown
 - TODO.txt
+- Upgrade.markdown
 - bin/autospec
 - bin/spec
 - cucumber.yml
@@ -73,6 +71,7 @@ files:
 - examples/failing/mocking_with_mocha.rb
 - examples/failing/mocking_with_rr.rb
 - examples/failing/partial_mock_example.rb
+- examples/failing/pending_example.rb
 - examples/failing/predicate_example.rb
 - examples/failing/raising_example.rb
 - examples/failing/spec_helper.rb
@@ -99,7 +98,6 @@ files:
 - examples/passing/partial_mock_example.rb
 - examples/passing/pending_example.rb
 - examples/passing/predicate_example.rb
-- examples/passing/priority.txt
 - examples/passing/shared_example_group_example.rb
 - examples/passing/shared_stack_examples.rb
 - examples/passing/simple_matcher_example.rb
@@ -120,9 +118,12 @@ files:
 - features/interop/examples_and_tests_together.feature
 - features/interop/test_but_not_test_unit.feature
 - features/interop/test_case_with_should_methods.feature
+- features/matchers/create_matcher.feature
 - features/mock_framework_integration/use_flexmock.feature
 - features/mock_framework_integration/use_mocha.feature
 - features/mock_framework_integration/use_rr.feature
+- features/mocks/mix_stubs_and_mocks.feature
+- features/pending/pending_examples.feature
 - features/step_definitions/running_rspec.rb
 - features/support/env.rb
 - features/support/matchers/smart_match.rb
@@ -137,6 +138,7 @@ files:
 - lib/spec/autorun.rb
 - lib/spec/dsl.rb
 - lib/spec/dsl/main.rb
+- lib/spec/dsl/matchers.rb
 - lib/spec/example.rb
 - lib/spec/example/before_and_after_hooks.rb
 - lib/spec/example/errors.rb
@@ -174,12 +176,14 @@ files:
 - lib/spec/matchers/equal.rb
 - lib/spec/matchers/errors.rb
 - lib/spec/matchers/exist.rb
+- lib/spec/matchers/extensions/instance_exec.rb
 - lib/spec/matchers/generated_descriptions.rb
 - lib/spec/matchers/has.rb
 - lib/spec/matchers/have.rb
 - lib/spec/matchers/include.rb
 - lib/spec/matchers/match.rb
 - lib/spec/matchers/match_array.rb
+- lib/spec/matchers/matcher.rb
 - lib/spec/matchers/method_missing.rb
 - lib/spec/matchers/operator_matcher.rb
 - lib/spec/matchers/raise_error.rb
@@ -253,6 +257,7 @@ files:
 - spec/ruby_forker.rb
 - spec/spec.opts
 - spec/spec/dsl/main_spec.rb
+- spec/spec/dsl/matchers_spec.rb
 - spec/spec/example/example_group_class_definition_spec.rb
 - spec/spec/example/example_group_factory_spec.rb
 - spec/spec/example/example_group_methods_spec.rb
@@ -268,6 +273,7 @@ files:
 - spec/spec/expectations/differs/default_spec.rb
 - spec/spec/expectations/extensions/object_spec.rb
 - spec/spec/expectations/fail_with_spec.rb
+- spec/spec/expectations/handler_spec.rb
 - spec/spec/expectations/wrap_expectation_spec.rb
 - spec/spec/interop/test/unit/resources/spec_that_fails.rb
 - spec/spec/interop/test/unit/resources/spec_that_passes.rb
@@ -290,13 +296,13 @@ files:
 - spec/spec/matchers/eql_spec.rb
 - spec/spec/matchers/equal_spec.rb
 - spec/spec/matchers/exist_spec.rb
-- spec/spec/matchers/handler_spec.rb
 - spec/spec/matchers/has_spec.rb
 - spec/spec/matchers/have_spec.rb
 - spec/spec/matchers/include_spec.rb
 - spec/spec/matchers/match_array_spec.rb
 - spec/spec/matchers/match_spec.rb
 - spec/spec/matchers/matcher_methods_spec.rb
+- spec/spec/matchers/matcher_spec.rb
 - spec/spec/matchers/operator_matcher_spec.rb
 - spec/spec/matchers/raise_error_spec.rb
 - spec/spec/matchers/respond_to_spec.rb
@@ -416,6 +422,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: rspec 1.1.99.9
+summary: rspec 1.1.99.13
 test_files: []