rspec 0.5.16 → 0.6.0

data/test/spec/api/sugar_test.rb

@@ -40,7 +40,7 @@ module Spec
 
       def test_should_allow_underscored_anys_on_mocks
         sweetener = Mock.new "sweetener"
-        sweetener.should_receive(:natural?).once_and_return(false)
+        sweetener.should_receive(:natural?).once.and_return(false)
         natural = sweetener.natural?
         natural.should_be false
         sweetener.__verify

data/test/spec/runner/backtrace_tweaker_test.rb

@@ -8,7 +8,7 @@ module Spec
       end
       
       def test_should_not_barf_on_nil_backtrace
-        proc { @tweaker.tweak_backtrace @error, 'spec name' }.should.not.raise
+        proc { @tweaker.tweak_backtrace @error, 'spec name' }.should_not_raise
       end
       
       def test_should_replace___instance_exec_with_spec_name
@@ -44,7 +44,7 @@ module Spec
       end
       
       def test_should_not_barf_on_nil_backtrace
-        proc { @tweaker.tweak_backtrace @error, 'spec name' }.should.not.raise
+        proc { @tweaker.tweak_backtrace @error, 'spec name' }.should_not_raise
       end
       
       def test_should_replace___instance_exec_with_spec_name

data/test/spec/runner/context_runner_test.rb

@@ -7,10 +7,10 @@ module Spec
       def test_should_call_run_on_context
         context1 = Api::Mock.new "context1", :null_object=>true
         context2 = Api::Mock.new "context2", :null_object=>true
-        context1.should.receive(:run)
-        context1.should.receive(:number_of_specs).and.return(0)
-        context2.should.receive(:run)
-        context2.should.receive(:number_of_specs).and.return(0)
+        context1.should_receive(:run)
+        context1.should_receive(:number_of_specs).and_return(0)
+        context2.should_receive(:run)
+        context2.should_receive(:number_of_specs).and_return(0)
         
         reporter = Api::Mock.new 'reporter'
         reporter.should_receive(:start).with(0)

data/test/spec/runner/context_test.rb

@@ -14,14 +14,14 @@ module Spec
       end
       
       def test_should_add_itself_to_formatter_on_run
-        @formatter.should.receive(:add_context).with "context"
+        @formatter.should_receive(:add_context).with "context"
         @context.run(@formatter)
       end
       
       def test_should_run_spec
-        @formatter.should.receive(:add_context).with :any_args
-        @formatter.should.receive(:spec_started).with "test"
-        @formatter.should.receive(:spec_finished).with "test", :anything, :anything
+        @formatter.should_receive(:add_context).with :any_args
+        @formatter.should_receive(:spec_started).with "test"
+        @formatter.should_receive(:spec_finished).with "test", :anything, :anything
         $spec_ran = false
         @context.specify("test") {$spec_ran = true}
         @context.run(@formatter)
@@ -29,9 +29,9 @@ module Spec
       end
          
       def test_should_run_spec_dry
-        @formatter.should.receive(:add_context).with :any_args
-        @formatter.should.receive(:spec_started).with "test"
-        @formatter.should.receive(:spec_finished).with "test"
+        @formatter.should_receive(:add_context).with :any_args
+        @formatter.should_receive(:spec_started).with "test"
+        @formatter.should_receive(:spec_finished).with "test"
         $spec_ran = false
         @context.specify("test") {$spec_ran = true}
         @context.run(@formatter, true)
@@ -39,9 +39,9 @@ module Spec
       end
       
       def test_setup
-        @formatter.should.receive(:add_context).with :any_args
-        @formatter.should.receive(:spec_started).with "test"
-        @formatter.should.receive(:spec_finished).with :any_args
+        @formatter.should_receive(:add_context).with :any_args
+        @formatter.should_receive(:spec_started).with "test"
+        @formatter.should_receive(:spec_finished).with :any_args
 
         super_class_setup_ran = false
         super_class = Class.new do
@@ -60,9 +60,9 @@ module Spec
       end
 
       def test_setup__should_allow_method_definitions
-        @formatter.should.receive(:add_context).with :any_args
-        @formatter.should.receive(:spec_started).with "test"
-        @formatter.should.receive(:spec_finished).with :any_args
+        @formatter.should_receive(:add_context).with :any_args
+        @formatter.should_receive(:spec_started).with "test"
+        @formatter.should_receive(:spec_finished).with :any_args
 
         $method_in_setup_called = false
         @context.setup do
@@ -78,9 +78,9 @@ module Spec
       end
 
       def test_teardown
-        @formatter.should.receive(:add_context).with :any_args
-        @formatter.should.receive(:spec_started).with "test"
-        @formatter.should.receive(:spec_finished).with :any_args
+        @formatter.should_receive(:add_context).with :any_args
+        @formatter.should_receive(:spec_started).with "test"
+        @formatter.should_receive(:spec_finished).with :any_args
 
         super_class_teardown_ran = false
         super_class = Class.new do
@@ -100,9 +100,9 @@ module Spec
       end
 
       def test_inherit__superclass_methods_should_be_accessible
-        @formatter.should.receive(:add_context).with :any_args
-        @formatter.should.receive(:spec_started).with "test"
-        @formatter.should.receive(:spec_finished).with :any_args
+        @formatter.should_receive(:add_context).with :any_args
+        @formatter.should_receive(:spec_started).with "test"
+        @formatter.should_receive(:spec_finished).with :any_args
 
         helper_method_ran = false
         super_class = Class.new do
@@ -144,9 +144,9 @@ module Spec
       end
 
       def test_include
-        @formatter.should.receive(:add_context).with :any_args
-        @formatter.should.receive(:spec_started).with "test"
-        @formatter.should.receive(:spec_finished).with :any_args
+        @formatter.should_receive(:add_context).with :any_args
+        @formatter.should_receive(:spec_started).with "test"
+        @formatter.should_receive(:spec_finished).with :any_args
 
         mod1_method_called = false
         mod1 = Module.new do

data/test/spec/runner/execution_context_test.rb

@@ -6,7 +6,7 @@ module Spec
 
       def test_should_add_new_mock_to_spec_when_mock_message_received
         spec = Api::Mock.new "spec"
-        spec.should.receive(:add_mock) {|mock| mock.instance_of? Api::Mock}
+        spec.should_receive(:add_mock) {|mock| mock.instance_of? Api::Mock}
         ec = ExecutionContext.new spec
         mock = ec.mock("a mock", :null_object=>true)
       end

data/test/spec/runner/reporter_test.rb

@@ -55,7 +55,7 @@ module Spec
         @formatter.should_receive(:start_dump)
         @formatter.should_receive(:dump_failure).with(1, :anything)
         @formatter.should_receive(:dump_summary).with(:anything, 1, 1)
-        @backtrace_tweaker.should.receive(:tweak_backtrace)
+        @backtrace_tweaker.should_receive(:tweak_backtrace)
         @reporter.add_context "context"
         @reporter.spec_started "spec"
         @reporter.spec_finished "spec", RuntimeError.new
@@ -64,8 +64,8 @@ module Spec
       
       def test_should_handle_multiple_contexts_with_same_name
         @formatter.should_receive(:add_context).exactly(3).times
-        @formatter.should.receive(:spec_started).exactly(3).times
-        @formatter.should.receive(:spec_passed).exactly(3).times
+        @formatter.should_receive(:spec_started).exactly(3).times
+        @formatter.should_receive(:spec_passed).exactly(3).times
         @formatter.should_receive(:start_dump)
         @formatter.should_receive(:dump_summary).with(:anything, 3, 0)
         @reporter.add_context "context"
@@ -83,14 +83,14 @@ module Spec
       def test_should_handle_multiple_specs_same_name
         error = RuntimeError.new
         @formatter.should_receive(:add_context).exactly(2).times
-        @formatter.should.receive(:spec_started).with("spec").exactly(4).times
+        @formatter.should_receive(:spec_started).with("spec").exactly(4).times
         @formatter.should_receive(:spec_passed).with("spec").exactly(2).times
         @formatter.should_receive(:spec_failed).with("spec", 1, failure) 
         @formatter.should_receive(:spec_failed).with("spec", 2, failure)
         @formatter.should_receive(:dump_failure).exactly(2).times
         @formatter.should_receive(:start_dump)
         @formatter.should_receive(:dump_summary).with(:anything, 4, 2)
-        @backtrace_tweaker.should.receive(:tweak_backtrace)
+        @backtrace_tweaker.should_receive(:tweak_backtrace)
         @reporter.add_context "context"
 
         @reporter.spec_started "spec"
@@ -113,7 +113,7 @@ module Spec
       def test_should_delegate_to_backtrace_tweaker
         @formatter.should_receive(:add_context)
         @formatter.should_receive(:spec_failed)
-        @backtrace_tweaker.should.receive(:tweak_backtrace)
+        @backtrace_tweaker.should_receive(:tweak_backtrace)
         @reporter.add_context "context"
         @reporter.spec_finished "spec", RuntimeError.new
         @backtrace_tweaker.__verify

data/test/spec/runner/specification_test.rb

@@ -9,45 +9,45 @@ module Spec
 
       def test_should_run_spec_in_scope_of_execution_context
         spec = Specification.new("should pass") do
-          self.should.not.be.instance_of Specification
-          self.should.be.instance_of ExecutionContext
+          self.should_not_be_an_instance_of Specification
+          self.should_be_an_instance_of ExecutionContext
         end
-        @reporter.should.receive(:spec_started).with "should pass"
-        @reporter.should.receive(:spec_finished).with "should pass", nil, nil
+        @reporter.should_receive(:spec_started).with "should pass"
+        @reporter.should_receive(:spec_finished).with "should pass", nil, nil
         spec.run @reporter
       end
 
       def test_should_add_itself_to_reporter_when_passes
         spec = Specification.new("spec") {}
-        @reporter.should.receive(:spec_started).with "spec"
-        @reporter.should.receive(:spec_finished).with "spec", nil, nil
+        @reporter.should_receive(:spec_started).with "spec"
+        @reporter.should_receive(:spec_finished).with "spec", nil, nil
         spec.run(@reporter)
       end
 
       def test_should_add_itself_to_reporter_when_fails
         error = RuntimeError.new
         spec = Specification.new("spec") { raise error }
-        @reporter.should.receive(:spec_started).with "spec"
-        @reporter.should.receive(:spec_finished).with "spec", error, "spec"
+        @reporter.should_receive(:spec_started).with "spec"
+        @reporter.should_receive(:spec_finished).with "spec", error, "spec"
         spec.run(@reporter)
       end
       
       def test_should_add_itself_to_reporter_when_calling_run_dry
         spec = Specification.new("spec") {}
-        @reporter.should.receive(:spec_started).with "spec"
-        @reporter.should.receive(:spec_finished).with "spec"
+        @reporter.should_receive(:spec_started).with "spec"
+        @reporter.should_receive(:spec_finished).with "spec"
         spec.run(@reporter, nil, nil, true)
       end
 
       def test_should_verify_mocks_after_teardown
         spec = Specification.new("spec") do
           mock = mock("a mock")
-          mock.should.receive(:poke)
+          mock.should_receive(:poke)
         end
-        @reporter.should.receive(:spec_started).with "spec"
-        @reporter.should.receive(:spec_finished) do |spec_name, error|
-          spec_name.should.equal "spec"
-          error.message.should.match /expected 'poke' once, but received it 0 times/
+        @reporter.should_receive(:spec_started).with "spec"
+        @reporter.should_receive(:spec_finished) do |spec_name, error|
+          spec_name.should_equal "spec"
+          error.message.should_match /expected 'poke' once, but received it 0 times/
         end
         spec.run @reporter
       end
@@ -59,11 +59,11 @@ module Spec
         teardown = lambda do
           raise "in teardown"
         end
-        @reporter.should.receive(:spec_started).with "spec"
-        @reporter.should.receive(:spec_finished) do |spec, error, location|
-          spec.should.equal "spec"
-          location.should.equal "spec" 
-          error.message.should.equal "in body"
+        @reporter.should_receive(:spec_started).with "spec"
+        @reporter.should_receive(:spec_finished) do |spec, error, location|
+          spec.should_equal "spec"
+          location.should_equal "spec" 
+          error.message.should_equal "in body"
         end
         spec.run @reporter, nil, teardown
       end
@@ -74,11 +74,11 @@ module Spec
         setup = lambda do
           raise "in setup"
         end
-        @reporter.should.receive(:spec_started).with "spec"
-        @reporter.should.receive(:spec_finished) do |name, error, location|
-          name.should.equal "spec"
-          error.message.should.equal "in setup"
-          location.should.equal "setup"
+        @reporter.should_receive(:spec_started).with "spec"
+        @reporter.should_receive(:spec_finished) do |name, error, location|
+          name.should_equal "spec"
+          error.message.should_equal "in setup"
+          location.should_equal "setup"
         end
         spec.run @reporter, setup
       end
@@ -89,11 +89,11 @@ module Spec
         teardown = lambda do
           raise "in teardown"
         end
-        @reporter.should.receive(:spec_started).with "spec"
-        @reporter.should.receive(:spec_finished) do |name, error, location|
-          name.should.equal "spec"
-          error.message.should.equal "in teardown"
-          location.should.equal "teardown"
+        @reporter.should_receive(:spec_started).with "spec"
+        @reporter.should_receive(:spec_finished) do |name, error, location|
+          name.should_equal "spec"
+          error.message.should_equal "in teardown"
+          location.should_equal "teardown"
         end
         spec.run @reporter, nil, teardown
       end

data/test/test_classes.rb

@@ -3,6 +3,15 @@
 # be accessed by the test2spec-translated specs
 module Spec
   module Api
+    class Person
+      attr_reader :name
+      def initialize name
+        @name = name
+      end
+      def == other
+        return @name == other.name
+      end
+    end
     class ClassWithMultiWordPredicate
       def multi_word_predicate?
         true 
@@ -51,15 +60,15 @@ module Spec
         end
 
         def hungry?(a, b, c)
-          a.should.be 1
-          b.should.be 2
-          c.should.be 3
+          a.should_be 1
+          b.should_be 2
+          c.should_be 3
           @funny_called = true
           @return_val
         end
 
         def __verify
-          @funny_called.should.be true
+          @funny_called.should_be true
         end
       end
     end

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.8.11
+rubygems_version: 0.9.0
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.5.16
-date: 2006-07-31 00:00:00 -05:00
-summary: RSpec-0.5.16 - BDD for Ruby http://rspec.rubyforge.org/
+  version: 0.6.0
+date: 2006-08-09 00:00:00 -05:00
+summary: RSpec-0.6.0 - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org
@@ -25,6 +25,7 @@ required_ruby_version: !ruby/object:Gem::Version::Requirement
 platform: ruby
 signing_key: 
 cert_chain: 
+post_install_message: 
 authors: 
 - Steven Baker, Aslak Hellesoy, Dave Astels, David Chelimsky
 files: 
@@ -42,12 +43,6 @@ files:
 - lib/spec/api/sugar.rb
 - lib/spec/api/helper/diff.rb
 - lib/spec/api/helper/have_helper.rb
-- lib/spec/api/helper/instance_helper.rb
-- lib/spec/api/helper/instance_negator.rb
-- lib/spec/api/helper/kind_helper.rb
-- lib/spec/api/helper/kind_negator.rb
-- lib/spec/api/helper/respond_helper.rb
-- lib/spec/api/helper/respond_negator.rb
 - lib/spec/api/helper/should_base.rb
 - lib/spec/api/helper/should_helper.rb
 - lib/spec/api/helper/should_negator.rb
@@ -80,7 +75,6 @@ files:
 - lib/spec/test_to_spec/translation_test_runner.rb
 - test/test_classes.rb
 - test/test_helper.rb
-- test/spec/api/duck_type_test.rb
 - test/spec/api/sugar_test.rb
 - test/spec/api/helper/arbitrary_predicate_test.rb
 - test/spec/api/helper/containment_test.rb
@@ -95,6 +89,7 @@ files:
 - test/spec/api/helper/true_false_special_case_test.rb
 - test/spec/api/helper/typing_test.rb
 - test/spec/api/mocks/mock_arg_constraints_test.rb
+- test/spec/api/mocks/mock_counts_test.rb
 - test/spec/api/mocks/mock_ordering_test.rb
 - test/spec/api/mocks/mock_test.rb
 - test/spec/api/mocks/null_object_test.rb

data/lib/spec/api/helper/instance_helper.rb

@@ -1,15 +0,0 @@
-module Spec
-
-  class InstanceHelper < ShouldBase
-  
-    def initialize(target)
-      @target = target
-    end
-    
-    def of(expected_class)
-      fail_with_message(default_message("should be an instance of", expected_class)) unless @target.instance_of? expected_class
-    end
-    
-  end
-
-end

data/lib/spec/api/helper/instance_negator.rb

@@ -1,15 +0,0 @@
-module Spec
-
-  class InstanceNegator < ShouldBase
-  
-    def initialize(target)
-      @target = target
-    end
-    
-    def of(expected_class)
-      fail_with_message(default_message("should not be an instance of", expected_class)) if @target.instance_of? expected_class
-    end
-    
-  end
-
-end

data/lib/spec/api/helper/kind_helper.rb

@@ -1,15 +0,0 @@
-module Spec
-
-  class KindHelper < ShouldBase
-  
-    def initialize(target)
-      @target = target
-    end
-    
-    def of(expected_class)
-      fail_with_message(default_message("should be a kind of", expected_class)) unless @target.kind_of? expected_class
-    end
-    
-  end
-
-end

data/lib/spec/api/helper/kind_negator.rb

@@ -1,15 +0,0 @@
-module Spec
-
-  class KindNegator < ShouldBase
-  
-    def initialize(target)
-      @target = target
-    end
-    
-    def of(expected_class)
-      fail_with_message(default_message("should not be a kind of", expected_class)) if @target.kind_of? expected_class
-    end
-    
-  end
-
-end