rspec 0.6.3 → 0.6.4

data/test/spec/{api/helper → expectations}/should_satisfy_test.rb

@@ -1,9 +1,7 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
-
-
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Expectations
     module Helper
       class ShouldSatisfyTest < Test::Unit::TestCase
 

data/test/spec/{api → expectations}/sugar_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Expectations
     class SugarTest < Test::Unit::TestCase
       
       def test_should_allow_underscored_shoulds_on_regular_objects
@@ -10,21 +10,21 @@ module Spec
       end
       
       def test_should_allow_underscored_shoulds_on_mocks
-        sweetener = Mock.new "sweetener"
+        sweetener = Mocks::Mock.new "sweetener"
         sweetener.should_receive(:natural?)
         sweetener.natural?
         sweetener.__verify
       end
       
       def test_should_allow_underscored_ats_on_mocks
-        sweetener = Mock.new "sweetener"
+        sweetener = Mocks::Mock.new "sweetener"
         sweetener.should_receive(:natural?).at_least(:once)
         sweetener.natural?
         sweetener.__verify
       end
       
       def test_should_allow_underscored_ands_on_mocks
-        sweetener = Mock.new "sweetener"
+        sweetener = Mocks::Mock.new "sweetener"
         sweetener.should_receive(:natural?).at_least(:once).and_return(true)
         natural = sweetener.natural?
         natural.should_be true
@@ -32,14 +32,14 @@ module Spec
       end
       
       def test_should_allow_underscored_anys_on_mocks
-        sweetener = Mock.new "sweetener"
+        sweetener = Mocks::Mock.new "sweetener"
         sweetener.should_receive(:natural?).any_number_of_times
         sweetener.natural?
         sweetener.__verify
       end
 
       def test_should_allow_underscored_anys_on_mocks
-        sweetener = Mock.new "sweetener"
+        sweetener = Mocks::Mock.new "sweetener"
         sweetener.should_receive(:natural?).once.and_return(false)
         natural = sweetener.natural?
         natural.should_be false
@@ -69,7 +69,7 @@ module Spec
       
       def test_is_an_instance_of_should_work_when_failing
         n = 10
-        assert_raises(Spec::Api::ExpectationNotMetError) do
+        assert_raises(Spec::Expectations::ExpectationNotMetError) do
           n.should_be_an_instance_of String
         end
       end
@@ -83,7 +83,7 @@ module Spec
       
       def test_is_a_kind_of_should_work_when_failing
         n = 10
-        assert_raises(Spec::Api::ExpectationNotMetError) do
+        assert_raises(Spec::Expectations::ExpectationNotMetError) do
           n.should_be_a_kind_of Float
         end
       end

data/test/spec/expectations/supported_symbols_test.rb

@@ -0,0 +1,33 @@
+require File.dirname(__FILE__) + '/../../test_helper'
+
+module Spec
+  module Expectations
+    module Helper
+      class SupportedSymbolsTest < Test::Unit::TestCase
+        def test_should_support_less_than
+          "<".to_sym.should_be_supported_by_rspec
+        end
+        def test_should_support_less_than_or_equal_to
+          "<=".to_sym.should_be_supported_by_rspec
+        end
+        def test_should_support_greater_than_or_equal_to
+          ">=".to_sym.should_be_supported_by_rspec
+        end
+        def test_should_support_greater_than
+          ">".to_sym.should_be_supported_by_rspec
+        end
+        def test_should_support_equals_operator
+          "==".to_sym.should_be_supported_by_rspec
+        end
+        def test_should_support_regex_match_operator
+          "=~".to_sym.should_be_supported_by_rspec
+        end
+      end
+      class SupportedSymbolsTest < Test::Unit::TestCase
+        def test_should_not_support_not_equals_operator
+          "!=".to_sym.should_not_be_supported_by_rspec
+        end
+      end
+    end
+  end
+end

data/test/spec/{api/helper → expectations}/throwing_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Expectations
     module Helper
       class ShouldThrowTest < Test::Unit::TestCase
 

data/test/spec/{api/helper → expectations}/true_false_special_case_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Expectations
     module Helper
       class ShouldBeTrueTest < Test::Unit::TestCase
 

data/test/spec/{api/helper → expectations}/typing_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Expectations
     module Helper
       class ShouldBeAnInstanceOfTest < Test::Unit::TestCase
 

data/test/spec/{api/mocks → mocks}/mock_arg_constraints_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Mocks
     class PassingMockArgumentConstraintsTest < Test::Unit::TestCase
       
       def setup
@@ -63,8 +63,8 @@ module Spec
       end
       
       def test_should_match_user_defined_type
-        @mock.should_receive(:random_call).with(Person.new("David"))
-        @mock.random_call(Person.new("David"))
+        @mock.should_receive(:random_call).with(Expectations::Person.new("David"))
+        @mock.random_call(Expectations::Person.new("David"))
         @mock.__verify
       end
       

data/test/spec/{api/mocks → mocks}/mock_counts_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Mocks
     class OnceCountsTest < Test::Unit::TestCase
       
       def setup

data/test/spec/{api/mocks → mocks}/mock_ordering_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Mocks
 
     class MockTest < Test::Unit::TestCase
 

data/test/spec/{api/mocks → mocks}/mock_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Mocks
     class MockTest < Test::Unit::TestCase
 
       def setup
@@ -16,7 +16,7 @@ module Spec
         begin
           @mock.__verify
         rescue MockExpectationError => e
-          e.backtrace[0].should_match /mock_test\.rb:12:in .test_should_report_line/
+          e.backtrace[0].should_match(/mock_test\.rb:12:in .test_should_report_line/)
         end
     
       end
@@ -26,10 +26,26 @@ module Spec
         @mock.__verify
       end
 
+      def test_should_pass_when_receiving_message_specified_as_not_to_be_received_with_different_args
+        @mock.should_not_receive(:message).with("unwanted text")
+        @mock.should_receive(:message).with("other text")
+        @mock.message "other text"
+        @mock.__verify
+      end
+
       def test_should_fail_when_receiving_message_specified_as_not_to_be_received
         @mock.should_not_receive(:not_expected)
+        @mock.not_expected
         assert_raise(MockExpectationError) do
-          @mock.not_expected
+          @mock.__verify
+        end
+      end
+
+      def test_should_fail_when_receiving_message_specified_as_not_to_be_received_with_args
+        @mock.should_not_receive(:not_expected).with("unexpected text")
+        @mock.not_expected "unexpected text"
+        assert_raise(MockExpectationError) do
+          @mock.__verify
         end
       end
 
@@ -75,7 +91,7 @@ module Spec
       end
   
       def test_should_fail_if_expectation_block_fails
-        @mock.should_receive(:random_call) {| a | a.should_be true}
+        @mock.should_receive(:random_call).with(true)# {| a | a.should_be true}
         assert_raise(MockExpectationError) do
           @mock.random_call false
         end
@@ -83,7 +99,6 @@ module Spec
   
       def test_should_fail_when_method_defined_as_never_is_received
         @mock.should_receive(:random_call).never
-        #TODO - @mock.should_not_receive(:random_call)
         assert_raise(MockExpectationError) do
           @mock.random_call
           @mock.__verify
@@ -113,7 +128,7 @@ module Spec
 
       def test_should_raise_when_explicit_return_and_block_constrained
         assert_raise(AmbiguousReturnError) {
-          @mock.should_receive(:fruit){|colour|
+          @mock.should_receive(:fruit) {|colour|
             :strawberry
           }.and_return :apple
         }

data/test/spec/{api/mocks → mocks}/null_object_test.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../../test_helper'
+require File.dirname(__FILE__) + '/../../test_helper'
 
 module Spec
-  module Api
+  module Mocks
 
     class NullObjectMockTest < Test::Unit::TestCase
 
@@ -26,6 +26,12 @@ module Spec
           @mock.__verify
         end
       end
+
+      def test_should_pass_when_receiving_message_specified_as_not_to_be_received_with_different_args
+        @mock.should_not_receive(:message).with("unwanted text")
+        @mock.message "other text"
+        @mock.__verify
+      end
     end
   end
 end

data/test/spec/runner/backtrace_tweaker_test.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/../../test_helper'
 module Spec
-  module Runner
-    class BacktraceTweakerTest < Test::Unit::TestCase
+  module Runner    
+    class NoisyBacktraceTweakerTest < Test::Unit::TestCase
       def setup
         @error = RuntimeError.new
         @tweaker = NoisyBacktraceTweaker.new
@@ -17,16 +17,18 @@ module Spec
         @error.backtrace[0].should_equal "./examples/airport_spec.rb:28:in `spec name'"
       end
 
-      def test_should_leave_anything_in_api_dir_in_full_backtrace_mode
-        @error.set_backtrace ["/lib/spec/api/anything.rb"]
+      def test_should_leave_anything_in_spec_dir
+        @error.set_backtrace ["/lib/spec/expectations/anything.rb"]
         @tweaker.tweak_backtrace @error, 'spec name'
-        @error.backtrace[0].should_equal "/lib/spec/api/anything.rb"
+        @error.backtrace.should_not_be_empty
       end
       
-      def test_should_leave_anything_in_runner_dir_in_full_backtrace_mode
-        @error.set_backtrace ["/lib/spec/runner/anything.rb"]
-        @tweaker.tweak_backtrace @error, 'spec name'
-        @error.backtrace.should_not_be_empty
+      def test_should_leave_anything_in_lib_spec_dir
+        ['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
+        end
       end
       
       def test_should_leave_bin_spec
@@ -53,16 +55,16 @@ module Spec
         @error.backtrace[0].should_equal "./examples/airport_spec.rb:28:in `spec name'"
       end
 
-      def test_should_remove_anything_in_api_dir
-        @error.set_backtrace ["/lib/spec/api/anything.rb"]
-        @tweaker.tweak_backtrace @error, 'spec name'
-        @error.backtrace.should_be_empty
-      end
-
-      def test_should_remove_anything_in_runner_dir
-        @error.set_backtrace ["/lib/spec/runner/anything.rb"]
-        @tweaker.tweak_backtrace @error, 'spec name'
-        @error.backtrace.should_be_empty
+      def test_should_remove_anything_in_lib_spec_dir
+        element = nil # Workaround to make test2spec work for our own tests
+        ['expectations', 'mocks', 'runner', 'stubs'].each do |child|
+          element = "/lib/spec/#{child}/anything.rb"
+          @error.set_backtrace [element]
+          @tweaker.tweak_backtrace @error, 'spec name'
+          if !@error.backtrace.empty?
+            raise "Should have tweaked away '#{element}'"
+          end
+        end
       end
 
       def test_should_remove_bin_spec

data/test/spec/runner/context_matching_test.rb

@@ -5,9 +5,9 @@ module Spec
     class ContextMatchingTest < Test::Unit::TestCase
       
       def setup
-        @formatter = Api::Mock.new "formatter"
+        @formatter = Spec::Mocks::Mock.new "formatter"
         @context = Context.new("context") {}
-        @matcher = Spec::Api::Mock.new("matcher")
+        @matcher = Spec::Mocks::Mock.new("matcher")
       end
       
       def test_should_use_spec_matcher

data/test/spec/runner/context_runner_test.rb

@@ -5,14 +5,14 @@ module Spec
     class ContextRunnerTest < Test::Unit::TestCase
     
       def test_should_call_run_on_context
-        context1 = Api::Mock.new "context1", :null_object=>true
-        context2 = Api::Mock.new "context2", :null_object=>true
+        context1 = Spec::Mocks::Mock.new "context1", :null_object=>true
+        context2 = Spec::Mocks::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)
         
-        reporter = Api::Mock.new 'reporter'
+        reporter = Spec::Mocks::Mock.new 'reporter'
         reporter.should_receive(:start).with(0)
         reporter.should_receive(:end)
         reporter.should_receive(:dump)
@@ -29,18 +29,18 @@ module Spec
       end
       
       def test_should_support_single_spec
-        desired_context = Api::Mock.new "desired context"
+        desired_context = Spec::Mocks::Mock.new "desired context"
         desired_context.should_receive(:matches?).at_least(:once).and_return(true)
         desired_context.should_receive(:run)
         desired_context.should_receive(:run_single_spec)
         desired_context.should_receive(:number_of_specs).and_return(1)
         
-        other_context = Api::Mock.new "other context"
+        other_context = Spec::Mocks::Mock.new "other context"
         other_context.should_receive(:matches?).and_return(false)
         other_context.should_receive(:run).never
         other_context.should_receive(:number_of_specs).never
         
-        reporter = Api::Mock.new 'reporter'
+        reporter = Spec::Mocks::Mock.new 'reporter'
 
         runner = ContextRunner.new(reporter, false, false, "desired context legal spec")
         runner.add_context desired_context

data/test/spec/runner/context_test.rb

@@ -5,7 +5,7 @@ module Spec
     class ContextTest < Test::Unit::TestCase
       
       def setup
-        @formatter = Api::Mock.new "formatter"
+        @formatter = Spec::Mocks::Mock.new "formatter"
         @context = Context.new("context") {}
       end
 

data/test/spec/runner/execution_context_test.rb

@@ -5,22 +5,39 @@ module Spec
     class ExecutionContextTest < Test::Unit::TestCase
 
       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 = Spec::Mocks::Mock.new "spec"
+        spec.should_receive(:add_mock) {|mock| mock.instance_of? Spec::Mocks::Mock}
         ec = ExecutionContext.new spec
         mock = ec.mock("a mock", :null_object=>true)
       end
+
+      def test_stub__should_stub_object_with_a_method
+        spec = Spec::Mocks::Mock.new "spec"
+        stub_space = Spec::Mocks::Mock.new "stub_space"
+        spec.should_receive(:stub_space) {stub_space}
+        target = Object.new
+        name = "foobar"
+        expected_stub = Object.new
+        stub_space.
+          should_receive(:create_stub).
+          once.
+          with(target, name).
+          and_return {expected_stub}
+        ec = ExecutionContext.new spec
+        stub = ec.stub(target, name)
+        assert_equal expected_stub, stub
+      end
       
       def test_violated
-        assert_raise(Spec::Api::ExpectationNotMetError) do
+        assert_raise(Spec::Expectations::ExpectationNotMetError) do
           ExecutionContext.new(nil).violated
         end
       end
       
       def test_duck_type
-        ec = ExecutionContext.new(Api::Mock.new("spec", :null_object => true))
+        ec = ExecutionContext.new(Spec::Mocks::Mock.new("spec", :null_object => true))
         duck_type = ec.duck_type(:length)
-        assert duck_type.is_a?(Api::DuckTypeArgConstraint)
+        assert duck_type.is_a?(Spec::Mocks::DuckTypeArgConstraint)
         assert duck_type.matches?([])
       end
     end