rspec 1.3.0 → 1.3.1.rc

data/History.rdoc

@@ -1,3 +1,20 @@
+=== Version 1.3.1 / (Date TBD)
+
+* enhancements
+  * Array =~ matcher works with subclasses of Array (Matthew Peychich & Pat Maddox)
+  * config.suppress_deprecation_warnings!
+
+* bug fixes
+  * QuitBacktraceTweaker no longer eats all paths with 'lib'
+    (Tim Harper - #912)
+  * Fix delegation of stubbed values on superclass class-level methods.
+    (Scott Taylor - #496 - #957)
+  * Fix pending to work with ruby-1.9
+
+* deprecations
+  * share_as (will be removed from rspec-core-2.0)
+  * simple_matcher (will be removed from rspec-core-2.0)
+
 === Version 1.3.0 / 2010-01-11
 
 * enhancements

data/README.rdoc

@@ -1,24 +1,18 @@
-= RSpec
+== RSpec
 
-* http://rspec.info
-* http://rubyforge.org/projects/rspec
-* http://github.com/dchelimsky/rspec/wikis
-* mailto:rspec-users@rubyforge.org
-* mailto:rspec-devel@rubyforge.org
+http://rspec.info
 
-== DESCRIPTION:
+Behaviour Driven Development for Ruby
 
-RSpec is a Behaviour Driven Development framework for writing executable code
-examples.
+This is the repository for rspec-1.x. If you're looking
+for rspec-2 (and if you're not, what are you waiting for?),
+see http://github.com/rspec/rspec
 
-== FEATURES:
+== Install
 
-* Spec::Example provides a framework for organizing executable code examples
-* Spec::Expectations adds #should and #should_not to every object
-* Spec::Matchers provides Expression Matchers for use with #should and #should_not
-* Spec::Mocks is a full featured mock object/stubbing library
+  gem install rspec
 
-== SYNOPSIS:
+== Synopsis
 
   describe Account do
     context "transfering money" do
@@ -38,17 +32,10 @@ examples.
     end
   end
   
-  $ spec spec/account_spec.rb --format nested
+  $ spec ./spec/account_spec.rb --format nested
   Account
     transfering money
       deposits transfer amount to the other account
       reduces its balance by the transfer amount
     
   2 examples, 0 failures
-
-== INSTALL:
-
-  [sudo] gem install rspec
-
-See http://wiki.github.com/dchelimsky/rspec if you want
-to clone/build/install.

data/examples/passing/shared_example_group_example.rb

@@ -29,18 +29,6 @@ module SharedExampleGroupExample
     end
   end
 
-  # A SharedExampleGroup is also a module. If you create one like this it gets
-  # assigned to the constant MostThings
-  share_as :MostThings do
-    def helper_method
-      "helper method"
-    end
-    
-    it "should do what things do" do
-      @thing.what_things_do.should == "stuff"
-    end
-  end
-  
   describe OneThing do
     # Now you can include the shared example group like this, which 
     # feels more like what you might say ...
@@ -52,28 +40,4 @@ module SharedExampleGroupExample
       helper_method.should == "helper method"
     end
   end
-
-  describe AnotherThing do
-    # ... or you can include the example group like this, which
-    # feels more like the programming language we love.
-    it_should_behave_like MostThings
-    
-    before(:each) { @thing = AnotherThing.new }
-
-    it "should have access to helper methods defined in the shared example group" do
-      helper_method.should == "helper method"
-    end
-  end
-
-  describe YetAnotherThing do
-    # ... or you can include the example group like this, which
-    # feels more like the programming language we love.
-    include MostThings
-    
-    before(:each) { @thing = AnotherThing.new }
-
-    it "should have access to helper methods defined in the shared example group" do
-      helper_method.should == "helper method"
-    end
-  end
 end

data/examples/passing/simple_matcher_example.rb

@@ -1,6 +1,6 @@
 describe "arrays" do
-  def contain_same_elements_as(expected)
-    simple_matcher "array with same elements in any order as #{expected.inspect}" do |actual|
+  Spec::Matchers.define :contain_same_elements_as do |expected|
+    match do |actual|
       if actual.size == expected.size
         a, e = actual.dup, expected.dup
         until e.empty? do
@@ -26,4 +26,4 @@ describe "arrays" do
     it { should_not contain_same_elements_as([1,2,2,3])}
     it { should_not contain_same_elements_as([1,2])}
   end
-end
+end

data/features/interop/test_but_not_test_unit.feature

@@ -1,4 +1,4 @@
-Story: Test is defined, but not Test::Unit
+Feature: Test is defined, but not Test::Unit
 
   As an RSpec user who has my own library named Test (but not Test::Unit)
   I want to run examples without getting Test::Unit NameErrors

data/features/interop/test_case_with_should_methods.feature

@@ -1,4 +1,4 @@
-Story: Test::Unit::TestCase extended by rspec with should methods
+Feature: Test::Unit::TestCase extended by rspec with should methods
 
   As an RSpec adopter with existing Test::Unit tests
   I want to use should_* methods in a Test::Unit::TestCase

data/geminstaller.yml

@@ -18,11 +18,12 @@ gems:
   version: '>= 0.9.5'
 - name: rake
   version: '>= 0.8.4'
-- name: spicycode-rcov
-  version: '>= 0.8.2.1'
+- name: rcov
+  version: '>= 0.9.7.1'
 - name: syntax
   version: '>= 1.0.0'
 - name: rr
   version: '>= 0.10.0'
 - name: ruby-debug
   version: '>= 0.10.3'
+- name: autotest-growl

data/lib/spec/deprecation.rb

@@ -1,7 +1,8 @@
 module Spec
   class << self
     def deprecate(method, alternate_method=nil)
-       message = <<-NOTICE
+      return if Spec::Runner.configuration.suppress_deprecation_warnings?
+      message = <<-NOTICE
 
 *****************************************************************
 DEPRECATION WARNING: you are using deprecated behaviour that will

data/lib/spec/dsl/main.rb

@@ -76,6 +76,7 @@ module Spec
       #    end
       #  end
       def share_as(name, &block)
+        Spec.deprecate("share_as","shared_examples_for")
         begin
           args = [name]
           add_options(args)

data/lib/spec/example/example_group_methods.rb

@@ -77,7 +77,7 @@ module Spec
       end
 
       def pending_implementation
-        lambda { raise(Spec::Example::NotYetImplementedError) }
+        lambda {|*args| raise(Spec::Example::NotYetImplementedError) }
       end
 
       alias_method :it, :example
@@ -172,6 +172,11 @@ module Spec
         end
       end
 
+      def let!(name, &block)
+        let(name, &block)
+        before { __send__(name) }
+      end
+
     private
 
       def subclass(*args, &example_group_block)

data/lib/spec/example/subject.rb

@@ -22,8 +22,14 @@ module Spec
         
         def its(attribute, &block)
           describe(attribute) do
-            define_method(:subject) { super().send(attribute) }
-            it(&block)
+            example do
+              self.class.class_eval do
+                define_method(:subject) do
+                  super().send(attribute)
+                end
+              end
+              instance_eval(&block)
+            end
           end
         end
 

data/lib/spec/matchers.rb

@@ -155,7 +155,7 @@ module Spec
   # This matcher can be used as follows:
   #
   #   describe Customer do
-  #     it { should tip(10).on(50 }
+  #     it { should tip(10).on(50) }
   #   end
   #
   # === Custom Matcher from scratch

data/lib/spec/matchers/operator_matcher.rb

@@ -13,7 +13,12 @@ module Spec
         end
 
         def get(klass, operator)
-          registry[klass] && registry[klass][operator]
+          matcher = registry[klass] && registry[klass][operator]
+          unless matcher
+            parent_class = registry.keys.detect {|pc| klass <= pc }
+            matcher = registry[parent_class] && registry[parent_class][operator]
+          end
+          matcher
         end
       end
 

data/lib/spec/matchers/pretty.rb

@@ -5,7 +5,7 @@ module Spec
         sym.to_s.gsub(/_/,' ')
       end
 
-      def to_sentence(words)
+      def to_sentence(words=[])
         words = words.map{|w| w.inspect}
         case words.length
           when 0
@@ -34,4 +34,4 @@ module Spec
       end
     end
   end
-end
+end

data/lib/spec/matchers/simple_matcher.rb

@@ -127,7 +127,8 @@ module Spec
     # failing), will fail when you want it to pass.
     #
     def simple_matcher(description=nil, &match_block)
+      Spec.deprecate("simple_matcher", "Matcher DSL (http://rspec.rubyforge.org/rspec/1.3.0/classes/Spec/Matchers.html)")
       SimpleMatcher.new(description, &match_block)
     end
   end
-end
+end

data/lib/spec/matchers/throw_symbol.rb

@@ -93,8 +93,8 @@ module Spec
     #   lambda { do_something_risky }.should_not throw_symbol
     #   lambda { do_something_risky }.should_not throw_symbol(:that_was_risky)
     #   lambda { do_something_risky }.should_not throw_symbol(:that_was_risky, culprit)
-    def throw_symbol(sym=nil)
-      Matchers::ThrowSymbol.new(sym)
+    def throw_symbol(expected_symbol = nil, expected_arg=nil)
+      Matchers::ThrowSymbol.new(expected_symbol, expected_arg)
     end
   end
 end

data/lib/spec/mocks/proxy.rb

@@ -111,6 +111,8 @@ module Spec
           invoke_expectation(expectation, *args, &block)
         elsif expectation = find_almost_matching_expectation(sym, *args)
           record_almost_matching_expectation(expectation, sym, *args, &block)
+        elsif @target.is_a?(Class)
+          @target.superclass.send(sym, *args, &block)
         else
           @target.__send__ :method_missing, sym, *args, &block
         end

data/lib/spec/runner/backtrace_tweaker.rb

@@ -38,8 +38,9 @@ module Spec
     # Tweaks raised Exceptions to mask noisy (unneeded) parts of the backtrace
     class QuietBacktraceTweaker < BacktraceTweaker
       unless defined?(IGNORE_PATTERNS)
-        spec_files = Dir["lib/*"].map do |path| 
-          subpath = path[1..-1]
+        root_dir = File.expand_path(File.join(__FILE__, '..', '..', '..', '..'))
+        spec_files = Dir["#{root_dir}/lib/*"].map do |path|
+          subpath = path[root_dir.length..-1]
           /#{subpath}/
         end
         IGNORE_PATTERNS = spec_files + [

data/lib/spec/runner/configuration.rb

@@ -154,6 +154,14 @@ module Spec
       def ignored_backtrace_patterns # :nodoc:
         @ignored_backtrace_patterns ||= []
       end
+
+      def suppress_deprecation_warnings!
+        @suppress_deprecation_warnings = true
+      end
+
+      def suppress_deprecation_warnings?
+        @suppress_deprecation_warnings ||= false
+      end
       
     private
     

data/lib/spec/runner/options.rb

@@ -1,4 +1,5 @@
 require 'ostruct'
+require 'rbconfig'
 
 module Spec
   module Runner
@@ -184,7 +185,7 @@ module Spec
 
       def colour=(colour)
         @colour = colour
-        if @colour && RUBY_PLATFORM =~ /mswin|mingw/ ;\
+        if @colour && Config::CONFIG['host_os'] =~ /mswin|mingw/ ;\
           begin ;\
             replace_output = @output_stream.equal?($stdout) ;\
             require 'rubygems' unless ENV['NO_RUBYGEMS'] ;\

data/lib/spec/version.rb

@@ -3,8 +3,8 @@ module Spec # :nodoc:
     unless defined? MAJOR
       MAJOR  = 1
       MINOR  = 3
-      TINY   = 0
-      PRE    = nil
+      TINY   = 1
+      PRE    = 'rc'
 
       STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')
 

data/spec/spec/dsl/main_spec.rb

@@ -57,7 +57,6 @@ module Spec
         end
       end
 
-    
       describe "#share_as" do
         def self.next_group_name
           @group_number ||= 0
@@ -68,6 +67,15 @@ module Spec
         def group_name
           @group_name ||= self.class.next_group_name
         end
+
+        before(:each) do
+          Spec.stub(:deprecate)
+        end
+
+        it "is deprecated" do
+          Spec.should_receive(:deprecate)
+          share_as group_name do; end
+        end
         
         it "registers a shared ExampleGroup" do
           block = lambda {|a,b|}
@@ -92,4 +100,4 @@ module Spec
     end
   end
 end
-  
+  

data/spec/spec/example/example_group_methods_spec.rb

@@ -753,6 +753,25 @@ module Spec
             counter.count.should == 2
           end
         end
+
+        describe "#let!" do
+          let!(:creator) do
+            class Creator
+              @count = 0
+              def self.count
+                @count += 1
+              end
+            end
+          end
+
+          it "evaluates the value non-lazily" do
+            lambda { Creator.count }.should_not raise_error
+          end
+
+          it "does not interfere between tests" do
+            Creator.count.should == 1
+          end
+        end
       end
     end
   end

data/spec/spec/example/example_matcher_spec.rb

@@ -3,10 +3,9 @@ require 'spec_helper'
 module Spec
   module Example
     describe ExampleMatcher, "#matches?" do
-      def match_examples(examples)
-        simple_matcher do |actual, matcher|
-          matcher.failure_message = "expected matcher.matches?(#{description.inspect}) to return true, got false"
-          matcher.negative_failure_message = "expected matcher.matches?(#{description.inspect}) to return false, got true"
+
+      Spec::Matchers.define :match_examples do |examples|
+        match do |actual|
           actual.matches?(examples)
         end
       end

data/spec/spec/example/subject_spec.rb

@@ -86,6 +86,13 @@ module Spec
 
     describe ".its (to access subject's attributes)" do
       with_sandboxed_options do
+        it "allows before(:each) blocks on subjects in outer scope" do
+          group = Class.new(ExampleGroupDouble).describe(Array)
+          group.before(:each) { subject << 1 }
+          child = group.its(:length) { should == 1 }
+          child.run(options).should == true
+        end 
+        
         it "passes when expectation should pass" do
           group = Class.new(ExampleGroupDouble).describe(Array)
           child = group.its(:length) { should == 0 }

data/spec/spec/expectations/wrap_expectation_spec.rb

@@ -3,6 +3,7 @@ require 'spec_helper'
 module Spec
   module Matchers
     describe "wrap_expectation" do
+      before { Spec.stub(:deprecate) }
       
       def stub_matcher
         @_stub_matcher ||= simple_matcher do
@@ -27,4 +28,4 @@ module Spec
       end
     end
   end
-end
+end