rspec 1.0.5 → 1.0.6

data/CHANGES

@@ -1,7 +1,84 @@
+== Version 1.0.6
+
+The "holy cow, batman, it's been a long time since we released and there are a ton of bug
+fixes, patches and even new features" release.
+
+Warning: Spec::Rails users: In fixing 11508, we've removed the raise_controller_errors method. As long as you
+follow the upgrade instructions and run 'script/generate rspec' you'll be fine, but if you skip this
+step you need to manually go into spec_helper.rb and remove the call to that method (if present - it
+might not be if you haven't upgraded in a while).
+
+Warning: Implementors of custom formatters. Formatters will now be sent an Example object instead of just a 
+String for #example_started, #example_passed and #example_failed. In certain scenarios 
+(Spec::Ui with Spec::Distributed), the formatter must ask the Example for its sequence number instead of
+keeping track of a sequence number internal to the formatter. Most of you shouldn't need to upgrade
+your formatters though - the Example#to_s method returns the example name/description, so you should be
+able to use the passed Example instance as if it were a String.
+
+* Applied [#12986] Autotest Specs + Refactoring (Patch from Scott Tayler)
+* Added a #close method to formatters, which allows them to gracefully close streams.
+* Applied [#12935] Remove requirement that mocha must be installed as a gem when used as mocking framework. (Patch from Ryan Kinderman).
+* Fixed [#12893] RSpec's Autotest should work with rspec's trunk
+* Fixed [#12865] Partial mock error when object has an @options instance var
+* Applied [#12701] Allow checking of content captured with content_for in view specs (Patch from Jens Kr�mer)
+* Applied [#12817] Cannot include same shared behaviour when required with absolute paths (Patch from Ian Leitch)
+* Applied [#12719] rspec_on_rails should not include pagination helper (Patch from Matthijs Langenberg)
+* Fixed [#12714] helper spec not finding rails core helpers
+* Applied [#12611] should_not redirect_to implementation (Patch from Yurii Rashkovskii)
+* Applied [#12682] Not correctly aliasing original 'stub!' and 'should_receive' methods for ApplicationController (Patch from Matthijs Langenberg)
+* Disabled controller.should_receive(:render) and controller.stub!(:render). Use expect_render or stub_render instead.
+* Applied [#12484] Allow a Behaviour's Description to flow through to the Formatter (Patch from Bob Cotton)
+* Fixed [#12448] The spec:plugins rake task from rspec_on_rails should ignore specs from the rspec_on_rails plugin
+* Applied [#12300] rr integration (patch from Kyle Hargraves)
+* Implemented [#12284] mock_with :rr (integration with RR mock framework: http://rubyforge.org/projects/pivotalrb/)
+* Applied [#12237] (tiny) added full path to mate in switch_command (Patch from Carl Porth)
+* Formatters will now be sent an Example object instead of just a String for certain methods
+* All Spec::Rake::SpecTask attributes can now be procs, which allows for lazy evaluation.
+* Changed the Spec::Ui interfaces slightly. See examples.
+* Applied [#12174] mishandling of paths with spaces in spec_mate switch_command (Patch from Carl Porth)
+* Implemented [#8315] File "Go to..." functionality
+* Applied [#11917] Cleaner Spec::Ui error for failed Selenium connection (Patch from Ian Dees)
+* Applied [#11888] rspec_on_rails spews out warnings when assert_select is used with an XML response (Patch from Ian Leitch)
+* Applied [#12010] Nicer failure message formatting (Patch from Wincent Colaiuta)
+* Applied [#12156] smooth open mate patch (Patch from Ienaga Eiji)
+* Applied [#10577] Rails with Oracle breaks 0.9.2. (Patch from Sinclair Bain)
+* Fixed [#12079] auto-generated example name incomplete: should have 1 error on ....]
+* Applied [#12066] Docfix for mocks/mocks.page (Patch from Kyle Hargraves)
+* Fixed [#11891] script/generate rspec_controller fails to create appropriate views (from templates) on edge rails
+* Applied [#11921] Adds the correct controller_name from derived_controller_name() to the ViewExampleController (Patch from Eloy Duran)
+* Fixed [#11903] config.include with behaviour_type 'hash' does not work
+* Examples without blocks and pending is now reported with a P instead of a *
+* Pending blocks that now pass are rendered blue
+* New behaviour for after: If an after block raises an error, the other ones will still run instead of bailing at the first. 
+* Made it possible to run spec from RSpec.tmbundle with --drb against a Rails spec_server.
+* Applied [#11868] Add ability for pending to optionally hold a failing block and to fail when it passes (Patch from Bob Cotton)
+* Fixed [#11843] watir_behaviour missing from spec_ui gem
+* Added 'switch between source and spec file' command in Spec::Mate (based on code from Ruy Asan)
+* Applied [#11509] Documentation - RSpec requires hpricot
+* Applied [#11807] Daemonize spec_server and rake tasks to manage them. (patch from Kyosuke MOROHASHI)
+* Added pending(message) method
+* Fixed [#11777] should render_template doesn't check paths correctly
+* Fixed [#11749] Use of 'rescue => e' does not catch all exceptions
+* Fixed [#11793] should raise_error('with a message') does not work correctly
+* Fixed [#11774] Mocks should respond to :kind_of? in the same way they respond to :is_a?
+* Fixed [#11508] Exceptions are not raised for Controller Specs (removed experimental raise_controller_errors)
+* Applied [#11615] Partial mock methods give ambiguous failures when given a method name as a String (Patch from Jay Phillips)
+* Fixed [#11545] Rspec doesn't handle should_receive on ActiveRecord associations (Patch from Ian White)
+* Fixed [#11514] configuration.use_transactional_fixtures is ALWAYS true, regardless of assignment
+* Improved generated RESTful controller examples to cover both successful and unsuccessful POST and PUT
+* Changed TextMate snippets for controllers to pass controller class names to #describe rather than controller_name.
+* Changed TextMate snippets for mocks to use no_args() and any_args() instead of the deprecated Symbols.
+* Applied [#11500] Documentation: no rails integration specs in 1.0
+* Renamed SpecMate's shortcuts for running all examples and focused examples to avoid conflicts (CMD-d and CMD-i)
+* Added a TextMate snippet for custom matchers, lifted from Geoffrey Grosenbach's RSpec peepcode show.
+* The translator translates mock constraints to the new matchers that were introduced in 1.0.4
+* Documented environment variables for Spec::Rake::SpecTask. Renamed SPECOPTS and RCOVOPTS to SPEC_OPTS and RCOV_OPTS.
+* Fixed [#10534] Windows: undefined method 'controller_name'
+
 == Version 1.0.5
 Bug fixes. Autotest plugin tweaks.
 
-* Fixed [#11378] fix to 10814 broke drb
+* Fixed [#11378] fix to 10814 broke drb (re-opened #10814)
 * Fixed [#11223] Unable to access flash from rails helper specs
 * Fixed [#11337] autotest runs specs redundantly
 * Fixed [#11258] windows: autotest won't run

data/EXAMPLES.rd

@@ -43,13 +43,16 @@
 # a mock
 # * should be able to mock the same message twice w/ different args
 # * should be able to mock the same message twice w/ different args in reverse order
-# Stack (not implemented features)
-# * should transform to xml using #to_xml [NOT IMPLEMENTED]
-# * should convert from xml using #from_xml [NOT IMPLEMENTED]
 # A partial mock
 # * should work at the class level
 # * should revert to the original after each spec
 # * can be mocked w/ ordering
+# pending example (using pending method)
+# * pending example (using pending method) should be reported as "PENDING: for some reason" [PENDING: for some reason]
+# pending example (with no block)
+# * pending example (with no block) should be reported as "PENDING: Not Yet Implemented" [PENDING: Not Yet Implemented]
+# pending example (with block for pending)
+# * pending example (with block for pending) should have a failing block, passed to pending, reported as "PENDING: for some reason" [PENDING: for some reason]
 # BDD framework
 # * should be adopted quickly
 # * should be intuitive
@@ -103,6 +106,6 @@
 # * RSpec should be able to access TestCase methods
 # * RSpec should be able to accept included modules
 
-Finished in 0.024612 seconds
+Finished in 0.030625 seconds
 
-77 examples, 0 failures, 2 not implemented
+78 examples, 0 failures, 3 pending

data/README

@@ -46,6 +46,7 @@ In order to run RSpec's full suite of specs (rake pre_commit) you must install t
 * win32console  # Required by the --colour switch if you're on Windows
 * meta_project  # Required in order to make releases at RubyForge
 * heckle        # Required if you use the --heckle switch
+* hpricot       # Used for parsing HTML from the HTML output formatter in RSpec's own specs
 
 Once those are all installed, you should be able to run the suite with the following steps:
 

data/Rakefile

@@ -107,7 +107,7 @@ spec = Gem::Specification.new do |s|
   s.bindir = 'bin'
   s.executables = ['spec', 'spec_translator']
   s.default_executable = 'spec'
-  s.author = ["RSpec Development Team"]
+  s.author = "RSpec Development Team"
   s.email = "rspec-devel@rubyforge.org"
   s.homepage = "http://rspec.rubyforge.org"
   s.rubyforge_project = "rspec"

data/examples/pending_example.rb

@@ -0,0 +1,20 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
+describe "pending example (using pending method)" do
+  it %Q|should be reported as "PENDING: for some reason"| do
+    pending("for some reason")
+  end
+end
+
+describe "pending example (with no block)" do
+  it %Q|should be reported as "PENDING: Not Yet Implemented"|
+end
+
+describe "pending example (with block for pending)" do
+  it %Q|should have a failing block, passed to pending, reported as "PENDING: for some reason"| do
+    pending("for some reason") do
+      raise "some reason"
+    end
+  end
+end
+

data/lib/autotest/rspec.rb

@@ -1,30 +1,42 @@
 require 'autotest'
 
+class RspecCommandError < StandardError; end
+
 class Autotest::Rspec < Autotest
+  
+  def initialize(kernel=Kernel, separator=File::SEPARATOR, alt_separator=File::ALT_SEPARATOR) # :nodoc:
+    super()
+    @kernel, @separator, @alt_separator = kernel, separator, alt_separator
+    @spec_command = spec_command
 
-  def initialize # :nodoc:
-    super
-    @spec_command = "spec"
+    # watch out: Ruby bug (1.8.6):
+    # %r(/) != /\//
+    # since Ruby compares the REGEXP source, not the resulting pattern
     @test_mappings = {
-      %r%^spec/.*\.rb$% => proc { |filename, _|
-        filename
-      },
-      %r%^lib/(.*)\.rb$% => proc { |_, m|
-        ["spec/#{m[1]}_spec.rb"]
+      %r%^spec/.*\.rb$% => kernel.proc { |filename, _| 
+        filename 
       },
-      %r%^spec/(spec_helper|shared/.*)\.rb$% => proc {
-        files_matching %r%^spec/.*_spec\.rb$%
+      %r%^lib/(.*)\.rb$% => kernel.proc { |_, m| 
+        ["spec/#{m[1]}_spec.rb"] 
       },
+      %r%^spec/(spec_helper|shared/.*)\.rb$% => kernel.proc { 
+        files_matching %r%^spec/.*_spec\.rb$% 
+      }
     }
   end
   
   def tests_for_file(filename)
     super.select { |f| @files.has_key? f }
   end
+  
+  alias :specs_for_file :tests_for_file
+  
+  def failed_results(results)
+    results.scan(/^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m)
+  end
 
   def handle_results(results)
-    failed = results.scan(/^\d+\)\n(?:\e\[\d*m)?(?:.*?Error in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n(.*?)\n\n/m)
-    @files_to_test = consolidate_failures failed
+    @files_to_test = consolidate_failures failed_results(results)
     unless @files_to_test.empty? then
       hook :red
     else
@@ -54,14 +66,30 @@ class Autotest::Rspec < Autotest
     File.exist?("spec/spec.opts") ? "-O spec/spec.opts " : ""
   end
 
+  # Finds the proper spec command to use.  Precendence
+  # is set in the lazily-evaluated method spec_commands.  Alias + Override
+  # that in ~/.autotest to provide a different spec command
+  # then the default paths provided.
   def spec_command
-    spec = File.join(Config::CONFIG['bindir'], 'spec')
-
-    unless File::ALT_SEPARATOR.nil? then
-      spec.gsub! File::SEPARATOR, File::ALT_SEPARATOR
+    spec_commands.each do |command|
+      if File.exists?(command)
+        return @alt_separator ? (command.gsub @separator, @alt_separator) : command
+      end
     end
-
-    return spec
+    
+    raise RspecCommandError, "No spec command could be found!"
+  end
+  
+  # Autotest will look for spec commands in the following
+  # locations, in this order:
+  #
+  #   * bin/spec
+  #   * default spec bin/loader installed in Rubygems
+  def spec_commands
+    [
+      File.join('bin', 'spec'),
+      File.join(Config::CONFIG['bindir'], 'spec')
+    ]
   end
 
 end

data/lib/spec/dsl.rb

@@ -1,4 +1,5 @@
 require 'spec/dsl/description'
+require 'spec/dsl/errors'
 require 'spec/dsl/configuration'
 require 'spec/dsl/behaviour_callbacks'
 require 'spec/dsl/behaviour'

data/lib/spec/dsl/behaviour.rb

@@ -7,7 +7,7 @@ module Spec
       class << self
         def add_shared_behaviour(behaviour)
           return if behaviour.equal?(found_behaviour = find_shared_behaviour(behaviour.description))
-          return if found_behaviour and behaviour.description[:spec_path] == found_behaviour.description[:spec_path]
+          return if found_behaviour and File.expand_path(behaviour.description[:spec_path]) == File.expand_path(found_behaviour.description[:spec_path])
           raise ArgumentError.new("Shared Behaviour '#{behaviour.description}' already exists") if found_behaviour
           shared_behaviours << behaviour
         end
@@ -63,18 +63,22 @@ module Spec
 
       def run(reporter, dry_run=false, reverse=false, timeout=nil)
         raise "shared behaviours should never run" if shared?
-        reporter.add_behaviour(description)
+        # TODO - change add_behaviour to add_description ??????
+        reporter.add_behaviour(@description)
         prepare_execution_context_class
-        errors = run_before_all(reporter, dry_run)
+        before_all_errors = run_before_all(reporter, dry_run)
 
-        specs = reverse ? examples.reverse : examples
+        exs = reverse ? examples.reverse : examples
         example_execution_context = nil
          
-        if errors.empty?
-          specs.each do |example|
+        if before_all_errors.empty?
+          exs.each do |example|
             example_execution_context = execution_context(example)
             example_execution_context.copy_instance_variables_from(@before_and_after_all_context_instance) unless before_all_proc(behaviour_type).nil?
-            example.run(reporter, before_each_proc(behaviour_type), after_each_proc(behaviour_type), dry_run, example_execution_context, timeout)
+            
+            befores = before_each_proc(behaviour_type) {|e| raise e}
+            afters = after_each_proc(behaviour_type)
+            example.run(reporter, befores, afters, dry_run, example_execution_context, timeout)
           end
         end
         
@@ -115,20 +119,25 @@ module Spec
 
       # Includes modules in the Behaviour (the <tt>describe</tt> block).
       def include(*args)
-        args << {} unless Hash === args.last
-        modules, options = args_and_options(*args)
-        required_behaviour_type = options[:behaviour_type]
-        if required_behaviour_type.nil? || required_behaviour_type.to_sym == behaviour_type.to_sym
-          @eval_module.include(*modules)
-        end
+        @eval_module.include(*args)
       end
 
       def behaviour_type #:nodoc:
         @description[:behaviour_type]
       end
+      
+      # Sets the #number on each Example and returns the next number
+      def set_sequence_numbers(number, reverse) #:nodoc:
+        exs = reverse ? examples.reverse : examples
+        exs.each do |example|
+          example.number = number
+          number += 1
+        end
+        number
+      end
 
     protected
-
+    
       # Messages that this class does not understand
       # are passed directly to the @eval_module.
       def method_missing(sym, *args, &block)
@@ -143,16 +152,15 @@ module Spec
       end
 
       def weave_in_included_modules
-        mods = included_modules
-        eval_module = @eval_module
+        mods = [@eval_module]
+        mods << included_modules.dup
+        mods << Spec::Runner.configuration.modules_for(behaviour_type)
         execution_context_class.class_eval do
-          include eval_module
-          Spec::Runner.configuration.included_modules.each do |mod|
-            include mod
-          end
-          mods.each do |mod|
-            include mod
-          end
+          # WARNING - the following can be executed in the context of any
+          # class, and should never pass more than one module to include
+          # even though we redefine include in this class. This is NOT
+          # tested anywhere, hence this comment.
+          mods.flatten.each {|mod| include mod}
         end
       end
 
@@ -166,10 +174,12 @@ module Spec
           begin
             @before_and_after_all_context_instance = execution_context(nil)
             @before_and_after_all_context_instance.instance_eval(&before_all_proc(behaviour_type))
-          rescue => e
+          rescue Exception => e
             errors << e
             location = "before(:all)"
-            reporter.example_finished(location, e, location) if reporter
+            # The easiest is to report this as an example failure. We don't have an Example
+            # at this point, so we'll just create a placeholder. 
+            reporter.example_finished(Example.new(location), e, location) if reporter
           end
         end
         errors
@@ -180,9 +190,9 @@ module Spec
           begin 
             @before_and_after_all_context_instance ||= execution_context(nil) 
             @before_and_after_all_context_instance.instance_eval(&after_all_proc(behaviour_type)) 
-          rescue => e
+          rescue Exception => e
             location = "after(:all)"
-            reporter.example_finished(location, e, location) if reporter
+            reporter.example_finished(Example.new(location), e, location) if reporter
           end
         end
       end

data/lib/spec/dsl/behaviour_callbacks.rb

@@ -36,6 +36,10 @@ module Spec
           when :all;  self.__send__("#{where}_all_parts", behaviour_type).__send__(how, block)
         end
       end
+      
+      def remove_after(scope, &block)
+        after_each_parts.delete(block)
+      end
 
       # Deprecated. Use before(:each)
       def setup(&block)

data/lib/spec/dsl/behaviour_eval.rb

@@ -137,6 +137,15 @@ module Spec
           super
         end
 
+        def before_each_proc(behaviour_type, &error_handler)
+          parts = []
+          parts.push(*Behaviour.before_each_parts(nil))
+          parts.push(*Behaviour.before_each_parts(behaviour_type)) unless behaviour_type.nil?
+          parts.push(*before_each_parts(nil))
+          parts.push(*before_each_parts(behaviour_type)) unless behaviour_type.nil?
+          CompositeProcBuilder.new(parts).proc(&error_handler)
+        end
+
         def before_all_proc(behaviour_type, &error_handler)
           parts = []
           parts.push(*Behaviour.before_all_parts(nil))
@@ -146,31 +155,22 @@ module Spec
           CompositeProcBuilder.new(parts).proc(&error_handler)
         end
 
-        def after_all_proc(behaviour_type, &error_handler)
+        def after_all_proc(behaviour_type)
           parts = []
           parts.push(*after_all_parts(behaviour_type)) unless behaviour_type.nil?
           parts.push(*after_all_parts(nil))
           parts.push(*Behaviour.after_all_parts(behaviour_type)) unless behaviour_type.nil?
           parts.push(*Behaviour.after_all_parts(nil))
-          CompositeProcBuilder.new(parts).proc(&error_handler)
+          CompositeProcBuilder.new(parts).proc
         end
 
-        def before_each_proc(behaviour_type, &error_handler)
-          parts = []
-          parts.push(*Behaviour.before_each_parts(nil))
-          parts.push(*Behaviour.before_each_parts(behaviour_type)) unless behaviour_type.nil?
-          parts.push(*before_each_parts(nil))
-          parts.push(*before_each_parts(behaviour_type)) unless behaviour_type.nil?
-          CompositeProcBuilder.new(parts).proc(&error_handler)
-        end
-
-        def after_each_proc(behaviour_type, &error_handler)
+        def after_each_proc(behaviour_type)
           parts = []
           parts.push(*after_each_parts(behaviour_type)) unless behaviour_type.nil?
           parts.push(*after_each_parts(nil))
           parts.push(*Behaviour.after_each_parts(behaviour_type)) unless behaviour_type.nil?
           parts.push(*Behaviour.after_each_parts(nil))
-          CompositeProcBuilder.new(parts).proc(&error_handler)
+          CompositeProcBuilder.new(parts).proc
         end
 
       private
@@ -210,11 +210,22 @@ module Spec
         end
 
         def inspect
-          "[Dynamically generated class for RSpec example]"
+          "[RSpec example]"
+        end
+        
+        def pending(message)
+          if block_given?
+            begin
+              yield
+            rescue Exception => e
+              raise Spec::DSL::ExamplePendingError.new(message)
+            end
+            raise Spec::DSL::PendingFixedError.new("Expected pending '#{message}' to fail. No Error was raised.")
+          else
+            raise Spec::DSL::ExamplePendingError.new(message)
+          end
         end
-
       end
-
     end
   end
 end