rspec 0.9.2 → 0.9.3

data/CHANGES

@@ -1,5 +1,14 @@
 = RSpec Changelog
 
+== Version 0.9.3
+This is a bugfix release.
+
+* Fixed [#10594] Failing Custom Matcher show NAME NOT GENERATED description
+* describe(SomeType, "#message") will not add a space: "SomeType#message" (likewise for '.')
+* describe(SomeType, "message") will have a decription with a space: "SomeType message"
+* Applied [#10566] prepend_before and prepend_after callbacks
+* Applied [#10567] Call setup and teardown using before and after callbacks
+
 == Version 0.9.2
 This is a quick maintenance release. 
 
@@ -8,6 +17,7 @@ This is a quick maintenance release.
 * Added a spec:translate Rake task to make 0.9 translation easier with Spec:Rails
 * Better translation of should_redirect_to
 * Fixed --colour support for Windows. This is a regression that was introduced in 0.9.1
+* Applied [#10460] Make SpecRunner easier to instantiate without using commandline args
 
 == Version 0.9.1
 
@@ -124,6 +134,7 @@ See Spec::DSL::Behaviour for more on predicate_matchers
 * Updated sample app specs to 0.9 syntax
 * Updated generated specs to 0.9 syntax
 * Applied [#8994] trunk: generated names for be_ specs (Multiple patches from Yurii Rashkovskii)
+* Applied [#9983]: Allow before and after to be called in BehaviourEval. This is useful for shared examples.
 
 == Version 0.8.2
 

data/EXAMPLES.rd

@@ -99,6 +99,6 @@
 # * RSpec should be able to access TestCase methods
 # * RSpec should be able to accept included modules
 
-Finished in 0.045762 seconds
+Finished in 0.030655 seconds
 
 74 examples, 0 failures

data/examples/test_case_spec.rb

@@ -38,6 +38,8 @@ describe "RSpec should integrate with Test::Unit::TestCase" do
   
   fixtures :some_table
 
+  prepend_before(:each) {setup}
+
   before(:each) do
     @rspec_setup_called = true
   end

data/lib/spec/dsl/behaviour_callbacks.rb

@@ -1,41 +1,57 @@
 module Spec
   module DSL
     module BehaviourCallbacks
-      def before(scope=:each, &block)
+      def prepend_before(scope=:each, &block)
+        case scope
+        when :each; before_each_parts.unshift(block)
+        when :all;  before_all_parts.unshift(block)
+        end
+      end
+      def append_before(scope=:each, &block)
         case scope
         when :each; before_each_parts << block
         when :all;  before_all_parts << block
         end
       end
+      alias_method :before, :append_before
 
-      def after(scope=:each, &block)
+      def prepend_after(scope=:each, &block)
         case scope
         when :each; after_each_parts.unshift(block)
         when :all;  after_all_parts.unshift(block)
         end
       end
+      alias_method :after, :prepend_after
+      def append_after(scope=:each, &block)
+        case scope
+        when :each; after_each_parts << block
+        when :all;  after_all_parts << block
+        end
+      end
 
+      # Deprecated. Use before(:each)
       def setup(&block)
         before(:each, &block)
       end
 
+      # Deprecated. Use after(:each)
       def teardown(&block)
         after(:each, &block)
       end
 
-      def before_all_parts
+      def before_all_parts # :nodoc:
         @before_all_parts ||= []
       end
 
-      def after_all_parts
+      def after_all_parts # :nodoc:
         @after_all_parts ||= []
       end
 
-      def before_each_parts
+      def before_each_parts # :nodoc:
         @before_each_parts ||= []
       end
 
-      def after_each_parts
+      def after_each_parts # :nodoc:
         @after_each_parts ||= []
       end
     end

data/lib/spec/dsl/behaviour_eval.rb

@@ -111,7 +111,6 @@ module Spec
 
         def before_each_proc(&error_handler)
           parts = []
-          add_superclass_method(parts, 'setup')
           parts.push(*Behaviour.before_each_parts)
           parts.push(*before_each_parts)
           CompositeProcBuilder.new(parts).proc(&error_handler)
@@ -120,7 +119,6 @@ module Spec
         def after_each_proc(&error_handler)
           parts = []
           parts.push(*after_each_parts)
-          add_superclass_method(parts, 'teardown')
           parts.push(*Behaviour.after_each_parts)
           CompositeProcBuilder.new(parts).proc(&error_handler)
         end
@@ -137,6 +135,8 @@ module Spec
 
         def derive_execution_context_class_from_behaviour_superclass
           @execution_context_class = Class.new(behaviour_superclass)
+          behaviour_superclass.spec_inherited(self) if behaviour_superclass.respond_to?(:spec_inherited)
+          @execution_context_class
         end
 
         def behaviour_superclass

data/lib/spec/dsl/description.rb

@@ -7,7 +7,11 @@ module Spec
         args, @options = args_and_options(*args)
         @described_type = args.first unless args.first.is_a?(String)
         @description = args.shift.to_s
-        @description << args.shift.to_s unless args.empty?
+        unless args.empty?
+          suffix = args.shift.to_s 
+            @description << " " unless suffix =~ /^\s|\.|#/
+          @description << suffix
+        end
       end
   
       def [](key)

data/lib/spec/dsl/example.rb

@@ -12,6 +12,7 @@ module Spec
       end
       
       def run(reporter, before_each_block, after_each_block, dry_run, execution_context, timeout=nil)
+        @dry_run = dry_run
         reporter.example_started(description)
         return reporter.example_finished(description) if dry_run
 
@@ -39,12 +40,21 @@ module Spec
       end
       
       def generated_description
-        @generated_description || "NAME NOT GENERATED"
+        return @generated_description if @generated_description
+        if @dry_run
+          "NO NAME (Because of --dry-run)"
+        else
+          if @failed
+            "NO NAME (Because of Error raised in matcher)"
+          else
+            "NO NAME (Because there were no expectations)"
+          end
+        end
       end
       
       def setup_example(execution_context, errors, &behaviour_before_block)
         setup_mocks(execution_context)
-        Spec::Matchers.description_generated(&@description_generated_proc)
+        Spec::Matchers.description_generated(@description_generated_proc)
         
         builder = CompositeProcBuilder.new
         before_proc = builder.proc(&append_errors(errors))
@@ -53,6 +63,7 @@ module Spec
         execution_context.instance_eval(&behaviour_before_block) if behaviour_before_block
         return errors.empty?
       rescue => e
+        @failed = true
         errors << e
         return false
       end
@@ -62,6 +73,7 @@ module Spec
           execution_context.instance_eval(&@example_block)
           return true
         rescue Exception => e
+          @failed = true
           errors << e
           return false
         end
@@ -84,6 +96,7 @@ module Spec
 
         return errors.empty?
       rescue => e
+        @failed = true
         errors << e
         return false
       end

data/lib/spec/matchers.rb

@@ -118,13 +118,13 @@ module Spec
   #     end
   #   end
   #
-  #   context "Player behaviour" do
+  #   describe "Player behaviour" do
   #     include CustomGameMatchers
   #     ...
   #   end
   module Matchers
     module ModuleMethods
-      def description_generated(&callback)
+      def description_generated(callback)
         description_generated_callbacks << callback
       end
 

data/lib/spec/runner/options.rb

@@ -99,10 +99,6 @@ module Spec
         end
       end
 
-      def parse_line(line_number)
-        @line_number = line_number.to_i
-      end
-
       def parse_format(format, out_stream, error_stream)
         where = out_stream
         # This funky regexp checks whether we have a FILE_NAME or not

data/lib/spec/version.rb

@@ -3,11 +3,11 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 9
-      TINY   = 2
+      TINY   = 3
       RELEASE_CANDIDATE = nil
       
-      # RANDOM_TOKEN: 0.495595173542949
-      REV = "$LastChangedRevision: 1899 $".match(/LastChangedRevision: (\d+)/)[1]
+      # RANDOM_TOKEN: 0.289603753816874
+      REV = "$LastChangedRevision: 1916 $".match(/LastChangedRevision: (\d+)/)[1]
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')

data/spec/spec/dsl/behaviour_spec.rb

@@ -206,9 +206,13 @@ module Spec
         before_all_run_count_run_count.should == 1
       end
 
-      it "should run superclass setup method and before block" do
+      it "calls spec_inherited class method" do
         super_class_before_ran = false
         super_class = Class.new do
+          def self.spec_inherited(mod)
+            mod.before {setup}
+          end
+
           define_method :setup do
             super_class_before_ran = true
           end
@@ -261,12 +265,22 @@ module Spec
         end
         @behaviour.inherit super_class
 
+        Behaviour.prepend_before(:all) { fiddle << "Behaviour.prepend_before(:all)" }
         Behaviour.before(:all) { fiddle << "Behaviour.before(:all)" }
+        @behaviour.prepend_before(:all) { fiddle << "prepend_before(:all)" }
         @behaviour.before(:all) { fiddle << "before(:all)" }
+        @behaviour.prepend_before(:each) { fiddle << "prepend_before(:each)" }
         @behaviour.before(:each) { fiddle << "before(:each)" }
         @behaviour.it("test") {true}
         @behaviour.run(@reporter)
-        fiddle.should == ['Behaviour.before(:all)', 'before(:all)', 'superclass setup', 'before(:each)']
+        fiddle.should == [
+          'Behaviour.prepend_before(:all)',
+          'Behaviour.before(:all)',
+          'prepend_before(:all)',
+          'before(:all)',
+          'prepend_before(:each)',
+          'before(:each)'
+        ]
       end
 
       it "after callbacks are ordered from local to global" do
@@ -281,12 +295,22 @@ module Spec
         end
         @behaviour.inherit super_class
 
+        @behaviour.after(:each) { fiddle << "after(:each)" }
+        @behaviour.append_after(:each) { fiddle << "append_after(:each)" }
         @behaviour.after(:all) { fiddle << "after(:all)" }
+        @behaviour.append_after(:all) { fiddle << "append_after(:all)" }
         Behaviour.after(:all) { fiddle << "Behaviour.after(:all)" }
-        @behaviour.after(:each) { fiddle << "after(:each)" }
+        Behaviour.append_after(:all) { fiddle << "Behaviour.append_after(:all)" }
         @behaviour.it("test") {true}
         @behaviour.run(@reporter)
-        fiddle.should == ['after(:each)', 'superclass teardown', 'after(:all)', 'Behaviour.after(:all)']
+        fiddle.should == [
+          'after(:each)',
+          'append_after(:each)',
+          'after(:all)',
+          'append_after(:all)',
+          'Behaviour.after(:all)',
+          'Behaviour.append_after(:all)'
+        ]
       end
     
       it "should run superclass teardown method and after block" do
@@ -302,7 +326,7 @@ module Spec
         @behaviour.after {teardown_ran = true}
         @behaviour.it("test") {true}
         @behaviour.run(@reporter)
-        super_class_teardown_ran.should be_true
+        super_class_teardown_ran.should be_false
         teardown_ran.should be_true
         @reporter.rspec_verify
       end

data/spec/spec/dsl/description_spec.rb

@@ -2,7 +2,9 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 
 module Spec
   module DSL
-    describe Description, " constructed with a single String" do before(:each) {@description = Description.new("abc")}
+    describe Description, " constructed with a single String" do 
+      before(:each) {@description = Description.new("abc")}
+      
       it "should provide that string as its name" do
         @description.description.should == "abc"
       end
@@ -24,7 +26,9 @@ module Spec
       end
     end
     
-    describe Description, " constructed with a Type" do before(:each) {@description = Description.new(Behaviour)}
+    describe Description, " constructed with a Type" do 
+      before(:each) {@description = Description.new(Behaviour)}
+
       it "should provide a String representation of that type (fully qualified) as its name" do
         @description.description.should == "Spec::DSL::Behaviour"
       end
@@ -33,7 +37,9 @@ module Spec
       end
     end
     
-    describe Description, " constructed with a Type and a String" do before(:each) {@description = Description.new(Behaviour, " behaving")}
+    describe Description, " constructed with a Type and a String" do 
+      before(:each) {@description = Description.new(Behaviour, " behaving")}
+      
       it "should include the type and second String in its name" do
         @description.description.should == "Spec::DSL::Behaviour behaving"
       end
@@ -42,6 +48,30 @@ module Spec
       end
     end
 
+    describe Description, "constructed with a Type and a String not starting with a space" do 
+      before(:each) {@description = Description.new(Behaviour, "behaving")}
+
+      it "should include the type and second String with a space in its name" do
+        @description.description.should == "Spec::DSL::Behaviour behaving"
+      end
+    end
+
+    describe Description, "constructed with a Type and a String starting with a ." do 
+      before(:each) {@description = Description.new(Behaviour, ".behaving")}
+
+      it "should include the type and second String with a space in its name" do
+        @description.description.should == "Spec::DSL::Behaviour.behaving"
+      end
+    end
+
+    describe Description, "constructed with a Type and a String starting with a #" do 
+      before(:each) {@description = Description.new(Behaviour, "#behaving")}
+
+      it "should include the type and second String with a space in its name" do
+        @description.description.should == "Spec::DSL::Behaviour#behaving"
+      end
+    end
+
     describe Description, " constructed with options" do before(:each) {@description = Description.new(Behaviour, :a => "b")}
       it "should provide its options" do
         @description[:a].should == "b"

data/spec/spec/dsl/example_instance_spec.rb

@@ -116,9 +116,31 @@ module Spec
         example = Example.new("name", :key => 'value')
       end
 
-      it "should report NAME NOT GENERATED when told to use generated description but none is generated" do
-        example = Example.new(:__generate_description)
-        @reporter.should_receive(:example_finished).with("NAME NOT GENERATED", :anything, :anything)
+      it "should report NO NAME when told to use generated description with --dry-run" do
+        example = Example.new(:__generate_description) {
+          5.should == 5
+        }
+        @reporter.should_receive(:example_finished) do |desc, error, location|
+          desc.should == "NO NAME (Because of --dry-run)"
+        end
+        example.run(@reporter, lambda{}, lambda{}, true, Object.new)
+      end
+
+      it "should report NO NAME when told to use generated description with no expectations" do
+        example = Example.new(:__generate_description) {}
+        @reporter.should_receive(:example_finished) do |desc, error, location|
+          desc.should == "NO NAME (Because there were no expectations)"
+        end
+        example.run(@reporter, lambda{}, lambda{}, false, Object.new)
+      end
+
+      it "should report NO NAME when told to use generated description and matcher fails" do
+        example = Example.new(:__generate_description) do
+          5.should "" # Has no matches? method..
+        end
+        @reporter.should_receive(:example_finished) do |desc, error, location|
+          desc.should == "NO NAME (Because of Error raised in matcher)"
+        end
         example.run(@reporter, nil, nil, nil, Object.new)
       end
 

data/spec/spec/matchers/description_generation_spec.rb

@@ -4,7 +4,7 @@ describe "Matchers should be able to generate their own descriptions" do
   before(:each) do
     @desc = nil
     @callback = lambda { |desc| @desc = desc }
-    Spec::Matchers.description_generated(&@callback)
+    Spec::Matchers.description_generated(@callback)
   end
   
   it "should == expected" do

data/spec/spec/matchers/handler_spec.rb

@@ -3,8 +3,8 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module ExampleExpectations
   
   class ArbitraryMatcher
-    def initialize(*args,&block)
-      if args.last.is_a?Hash
+    def initialize(*args, &block)
+      if args.last.is_a? Hash
         @expected = args.last[:expected]
       end
       if block_given?

data/spec/spec/runner/option_parser_spec.rb

@@ -128,7 +128,7 @@ describe "OptionParser" do
     options = parse(["--format", "html:test.html"])
     File.should be_exist('test.html')
     options.formatters[0].class.should equal(Spec::Runner::Formatter::HtmlFormatter)
-    FileUtils.rm 'test.html'
+    FileUtils.rm 'test.html' rescue nil # Help windows
   end
 
   it "should use noisy backtrace tweaker with b option" do

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.9.1
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
-date: 2007-05-03 00:00:00 +02:00
-summary: RSpec-0.9.2 (r1899) - BDD for Ruby http://rspec.rubyforge.org/
+  version: 0.9.3
+date: 2007-05-06 00:00:00 +02:00
+summary: RSpec-0.9.3 (r1916) - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org