rspec 1.2.8 → 1.2.9

data/features/subject/implicit_subject.feature

@@ -14,7 +14,7 @@ Feature: implicit subject
       end
       """
     When I run "spec top_level_subject_spec.rb"
-    Then the stdout should match "1 example, 0 failures"
+    Then the stdout should include "1 example, 0 failures"
 
   Scenario: subject in a nested group
     Given a file named "nested_subject_spec.rb" with:
@@ -28,4 +28,16 @@ Feature: implicit subject
       end
       """
     When I run "spec nested_subject_spec.rb"
-    Then the stdout should match "1 example, 0 failures"
+    Then the stdout should include "1 example, 0 failures"
+
+  Scenario: subject with getters
+    Given a file named "subject_with_getter_spec.rb" with:
+      """
+      describe Array do
+        describe "when first created" do
+          its(:length) { should == 0 }
+        end
+      end
+      """
+    When I run "spec subject_with_getter_spec.rb"
+    Then the stdout should include "1 example, 0 failures"

data/features/support/env.rb

@@ -3,9 +3,8 @@ $:.unshift File.join(File.dirname(__FILE__), "/../../lib")
 require 'spec/expectations'
 require 'forwardable'
 require 'tempfile'
-require File.dirname(__FILE__) + '/../../spec/ruby_forker'
-require File.dirname(__FILE__) + '/matchers/smart_match'
-
+require 'spec/ruby_forker'
+require 'features/support/matchers/smart_match'
 
 class RspecWorld
   include Spec::Expectations
@@ -44,6 +43,10 @@ class RspecWorld
     File.open(file_path, "w") { |f| f << contents }
   end
 
+  def create_directory(dirname)
+    FileUtils.mkdir_p File.join(working_dir, dirname)
+  end
+
   def last_stdout
     @stdout
   end

data/lib/spec/adapters/mock_frameworks/mocha.rb

@@ -5,7 +5,12 @@ require 'mocha/object'
 module Spec
   module Adapters
     module MockFramework
-      include Mocha::Standalone
+      # Mocha::Standalone was deprecated as of Mocha 0.9.7.  
+      begin
+        include Mocha::API
+      rescue NameError
+        include Mocha::Standalone
+      end
       def setup_mocks_for_rspec
         mocha_setup
       end

data/lib/spec/example/example_group_methods.rb

@@ -165,6 +165,13 @@ module Spec
         include mod if (Spec::Ruby.version.to_f >= 1.9) & (Module === mod) & !(Class === mod)
       end
 
+      def let(name, &block)
+        define_method name do
+          @assignments ||= {}
+          @assignments[name] ||= instance_eval(&block)
+        end
+      end
+
     private
 
       def subclass(*args, &example_group_block)

data/lib/spec/example/example_methods.rb

@@ -113,7 +113,7 @@ module Spec
         @_implementation = implementation
         @_backtrace = caller
       end
-
+      
     private
 
       include Matchers

data/lib/spec/example/subject.rb

@@ -11,6 +11,7 @@ module Spec
         #     subject { CheckingAccount.new(:amount => 50, :currency => :USD) }
         #     it { should have_a_balance_of(50, :USD) }
         #     it { should_not be_overdrawn }
+        #     its(:currency) { should == :USD }
         #   end
         #
         # See +ExampleMethods#should+ for more information about this approach.
@@ -18,6 +19,13 @@ module Spec
           block.nil? ?
             explicit_subject || implicit_subject : @explicit_subject_block = block
         end
+        
+        def its(attribute, &block)
+          describe(attribute) do
+            define_method(:subject) { super().send(attribute) }
+            it(&block)
+          end
+        end
 
         attr_reader :explicit_subject_block # :nodoc:
 

data/lib/spec/interop/test.rb

@@ -1,10 +1,36 @@
 require 'spec'
 
 if Spec::Ruby.version.to_f >= 1.9
-  gem 'test-unit','1.2.3'
+  gem 'test-unit','= 1.2.3'
 end
 
 require 'test/unit'
+
+if Spec::Ruby.version.to_f >= 1.9
+  require 'test/unit/version'
+  if Test::Unit::VERSION > '1.2.3'
+    raise <<-MESSAGE
+#{'*' * 50}
+Required: test-unit-1.2.3
+Loaded:   test-unit-#{Test::Unit::VERSION}
+
+With ruby-1.9, rspec-#{Spec::VERSION::STRING} requires test-unit-1.2.3, and
+tries to force it with "gem 'test-unit', '= 1.2.3'" in:
+
+  #{__FILE__}
+  
+Unfortunately, test-unit-#{Test::Unit::VERSION} was loaded anyway. While we are
+aware of this bug we have not been able to track down its source.
+Until we do, you have two alternatives:
+
+* uninstall test-unit-2.0.3
+* use 'script/spec' instead of 'rake spec'
+#{'*' * 50}
+MESSAGE
+  end
+end
+
+
 require 'test/unit/testresult'
 
 require 'spec/interop/test/unit/testcase'

data/lib/spec/interop/test/unit/testcase.rb

@@ -31,7 +31,7 @@ module Test
       end
 
       def self.test_method?(method_name)
-        method_name =~ /^test[_A-Z]./ && (
+        method_name =~ /^test./ && (
           instance_method(method_name).arity == 0 ||
           instance_method(method_name).arity == -1
         )

data/lib/spec/matchers/exist.rb

@@ -5,10 +5,10 @@ module Spec
     #   should_not exist
     #
     # Passes if actual.exist?
-    def exist
+    def exist(arg=nil)
       Matcher.new :exist do
         match do |actual|
-          actual.exist?
+          arg ? actual.exist?(arg) : actual.exist?
         end
       end
     end

data/lib/spec/matchers/extensions/instance_exec.rb

@@ -1,23 +1,31 @@
-unless respond_to?(:instance_exec)
-  # based on Bounded Spec InstanceExec (Mauricio Fernandez)
-  # http://eigenclass.org/hiki/bounded+space+instance_exec
-  class Object
-    module InstanceExecHelper; end
-    include InstanceExecHelper
-    def instance_exec(*args, &block)
-      begin
-        orig_critical, Thread.critical = Thread.critical, true
-        n = 0
-        n += 1 while respond_to?(method_name="__instance_exec#{n}")
-        InstanceExecHelper.module_eval{ define_method(method_name, &block) }
-      ensure
-        Thread.critical = orig_critical
-      end
-      begin
-        return send(method_name, *args)
-      ensure
-        InstanceExecHelper.module_eval{ remove_method(method_name) } rescue nil
+module Spec
+  module Matchers
+    module InstanceExec
+      unless respond_to?(:instance_exec)
+        # based on Bounded Spec InstanceExec (Mauricio Fernandez)
+        # http://eigenclass.org/hiki/bounded+space+instance_exec
+        # - uses singleton_class of matcher instead of global
+        #   InstanceExecHelper module
+        # - this keeps it scoped to this class only, which is the
+        #   only place we need it
+        # - only necessary for ruby 1.8.6
+        def instance_exec(*args, &block)
+          singleton_class = (class << self; self; end)
+          begin
+            orig_critical, Thread.critical = Thread.critical, true
+            n = 0
+            n += 1 while respond_to?(method_name="__instance_exec#{n}")
+            singleton_class.module_eval{ define_method(:__instance_exec, &block) }
+          ensure
+            Thread.critical = orig_critical
+          end
+          begin
+            return send(:__instance_exec, *args)
+          ensure
+            singleton_class.module_eval{ remove_method(:__instance_exec) } rescue nil
+          end
+        end
       end
     end
   end
-end
+end

data/lib/spec/matchers/matcher.rb

@@ -1,10 +1,12 @@
 module Spec
   module Matchers
     class Matcher
+      include Spec::Matchers::InstanceExec
       include Spec::Matchers::Pretty
-      
+      include Spec::Matchers
+
       attr_reader :expected, :actual
-      
+
       def initialize(name, *expected, &declarations)
         @name     = name
         @expected = expected
@@ -19,36 +21,35 @@ module Spec
           instance_exec(*@expected, &declarations)
         end
       end
-      
+
       def matches?(actual)
-        @actual = actual
-        instance_exec(@actual,    &@match_block)
+        instance_exec(@actual = actual, &@match_block)
       end
-      
+
       def description(&block)
         cache_or_call_cached(:description, &block)
       end
-      
+
       def failure_message_for_should(&block)
-        cache_or_call_cached(:failure_message_for_should, @actual, &block)
+        cache_or_call_cached(:failure_message_for_should, actual, &block)
       end
-      
+
       def failure_message_for_should_not(&block)
-        cache_or_call_cached(:failure_message_for_should_not, @actual, &block)
+        cache_or_call_cached(:failure_message_for_should_not, actual, &block)
       end
-      
+
       def match(&block)
         @match_block = block
       end
-      
+
       def diffable?
         @diffable
       end
-      
+
       def diffable
         @diffable = true
       end
-            
+
     private
 
       def making_declared_methods_public # :nodoc:
@@ -56,7 +57,7 @@ module Spec
         # declared in the block eval'd by instance_exec in the block to which we
         # are yielding here are scoped private. This is NOT the case for Ruby
         # 1.8.7 or 1.9.
-        # 
+        #
         # Also, due some crazy scoping that I don't understand, these methods
         # are actually available in the specs (something about the matcher being
         # defined in the scope of Spec::Matchers or within an example), so not
@@ -69,18 +70,18 @@ module Spec
       end
 
       def cache_or_call_cached(key, actual=nil, &block)
-        block ? @messages[key] = block : 
+        block ? @messages[key] = block :
                 actual.nil? ? @messages[key].call : @messages[key].call(actual)
       end
-    
+
       def name_to_sentence
         split_words(@name)
       end
-      
+
       def expected_to_sentence
         to_sentence(@expected)
       end
-    
+
     end
   end
-end
+end

data/lib/spec/mocks/argument_matchers.rb

@@ -15,6 +15,12 @@ module Spec
         end
       end
 
+      class NoArgsMatcher
+        def description
+          "no args"
+        end
+      end
+
       class AnyArgMatcher
         def initialize(ignore)
         end
@@ -22,11 +28,9 @@ module Spec
         def ==(other)
           true
         end
-      end
-
-      class NoArgsMatcher
+        
         def description
-          "no args"
+          "anything"
         end
       end
 
@@ -138,6 +142,14 @@ module Spec
         end
       end
 
+      # :call-seq:
+      #   object.should_receive(:message).with(no_args())
+      #
+      # Passes if no arguments are passed along with the message
+      def no_args
+        NoArgsMatcher.new
+      end
+      
       # :call-seq:
       #   object.should_receive(:message).with(any_args())
       #
@@ -155,14 +167,6 @@ module Spec
         AnyArgMatcher.new(nil)
       end
       
-      # :call-seq:
-      #   object.should_receive(:message).with(no_args)
-      #
-      # Passes if no arguments are passed along with the message
-      def no_args
-        NoArgsMatcher.new
-      end
-      
       # :call-seq:
       #   object.should_receive(:message).with(duck_type(:hello))
       #   object.should_receive(:message).with(duck_type(:hello, :goodbye))
@@ -221,7 +225,7 @@ module Spec
       
       alias_method :a_kind_of, :kind_of
       
-      private
+    private
       
       def anythingize_lonely_keys(*args)
         hash = args.last.class == Hash ? args.delete_at(-1) : {}

data/lib/spec/mocks/error_generator.rb

@@ -3,7 +3,8 @@ module Spec
     class ErrorGenerator
       attr_writer :opts
       
-      def initialize(target, name)
+      def initialize(target, name, options={})
+        @declared_as = options[:__declared_as] || 'Mock'
         @target = target
         @name = name
       end
@@ -19,7 +20,7 @@ module Spec
       def raise_unexpected_message_args_error(expectation, *args)
         expected_args = format_args(*expectation.expected_args)
         actual_args = args.empty? ? "(no args)" : format_args(*args)
-        __raise "#{intro} expected #{expectation.sym.inspect} with #{expected_args} but received it with #{actual_args}"
+        __raise "#{intro} received #{expectation.sym.inspect} with unexpected arguments\n  expected: #{expected_args}\n       got: #{actual_args}"
       end
       
       def raise_expectation_error(sym, expected_received_count, actual_received_count, *args)
@@ -45,7 +46,17 @@ module Spec
     private
 
       def intro
-        @name ? "Mock '#{@name}'" : @target.class == Class ? "<#{@target.inspect} (class)>" : (@target.nil? ? "nil" : @target)
+        if @name
+          "#{@declared_as} #{@name.inspect}"
+        elsif Mock === @target
+          @declared_as
+        elsif Class === @target
+          "<#{@target.inspect} (class)>"
+        elsif @target
+          @target
+        else
+          "nil"
+        end
       end
       
       def __raise(message)

data/lib/spec/mocks/{spec_methods.rb → example_methods.rb}

@@ -6,7 +6,7 @@ module Spec
       # Shortcut for creating an instance of Spec::Mocks::Mock.
       #
       # +name+ is used for failure reporting, so you should use the
-      # role that the mock is playing in the example.
+      # role that the double is playing in the example.
       #
       # +stubs_and_options+ lets you assign options and stub values
       # at the same time. The only option available is :null_object.
@@ -14,19 +14,33 @@ module Spec
       #
       # == Examples
       #
-      #   stub_thing = mock("thing", :a => "A")
-      #   stub_thing.a == "A" => true
+      #   thing = double("thing", :a => "A")
+      #   thing.a == "A" => true
       #
-      #   stub_person = stub("thing", :name => "Joe", :email => "joe@domain.com")
-      #   stub_person.name => "Joe"
-      #   stub_person.email => "joe@domain.com"
+      #   person = double("thing", :name => "Joe", :email => "joe@domain.com")
+      #   person.name => "Joe"
+      #   person.email => "joe@domain.com"
+      def double(*args)
+        __declare_double('Double', *args)
+      end
+
+      # Alias for double
       def mock(*args)
-        Spec::Mocks::Mock.new(*args)
+        __declare_double('Mock', *args)
       end
 
-      alias :stub :mock
+      # Alias for double
+      def stub(*args)
+        __declare_double('Stub', *args)
+      end
+
+      def __declare_double(declared_as, *args) # :nodoc:
+        args << {} unless Hash === args.last
+        args.last[:__declared_as] = declared_as
+        Spec::Mocks::Mock.new(*args)
+      end
 
-      # DEPRECATED - use mock('name').as_null_object instead
+      # DEPRECATED - use double('name').as_null_object instead
       #
       # Shortcut for creating a mock object that will return itself in response
       # to any message it receives that it hasn't been explicitly instructed
@@ -35,8 +49,8 @@ module Spec
         Spec.warn(<<-WARNING)
 
 DEPRECATION: stub_everything('#{name}') is deprecated and will be removed
-from a future version of rspec. Please use mock('#{name}').as_null_object
-or stub('#{name}').as_null_object instead.
+from a future version of rspec. Please use double('#{name}').as_null_object
+(or stub('#{name}').as_null_object or mock('#{name}').as_null_object instead.
 
 WARNING
         mock(name, :null_object => true)