rspec-core 2.0.0.beta.7 → 2.0.0.beta.8

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.7
+2.0.0.beta.8

data/cucumber.yml

@@ -4,4 +4,4 @@ rerun_opts = rerun.to_s.strip.empty? ? "--format progress features" : "--format
 std_opts = "#{rerun_opts} --require features --format rerun --out rerun.txt --strict --tags ~@wip"
 %>
 default: <%= std_opts %>
-wip: --tags @wip:3 --wip features
+wip: --require features --tags @wip:3 --wip features

data/features/hooks/before_and_after_hooks.feature

@@ -28,8 +28,8 @@ Feature: before and after hooks
     applied to all groups or subsets of all groups defined by example group
     types.
 
-  Scenario: define before(:each) block in example group
-    Given a file named "before_each_in_example_group_spec.rb" with:
+  Scenario: define before(:each) block
+    Given a file named "before_each_spec.rb" with:
       """
       require "rspec/expectations"
 
@@ -59,11 +59,11 @@ Feature: before and after hooks
         end
       end
       """
-    When I run "rspec before_each_in_example_group_spec.rb"
+    When I run "rspec before_each_spec.rb"
     Then I should see "3 examples, 0 failures"
 
   Scenario: define before(:all) block in example group
-    Given a file named "before_all_in_example_group_spec.rb" with:
+    Given a file named "before_all_spec.rb" with:
       """
       require "rspec/expectations"
 
@@ -93,9 +93,12 @@ Feature: before and after hooks
         end
       end
       """
-    When I run "rspec before_all_in_example_group_spec.rb"
+    When I run "rspec before_all_spec.rb"
     Then I should see "3 examples, 0 failures"
 
+    When I run "rspec before_all_spec.rb:15"
+    Then I should see "1 example, 0 failures"
+
   @wip
   Scenario: define before and after blocks in configuration
     Given a file named "befores_in_configuration_spec.rb" with:
@@ -135,21 +138,11 @@ Feature: before and after hooks
     When I run "rspec befores_in_configuration_spec.rb"
     Then I should see "3 examples, 0 failures"
 
-  @wip
   Scenario: before/after blocks are run in order
     Given a file named "ensure_block_order_spec.rb" with:
       """
       require "rspec/expectations"
 
-      Rspec.configure do |config|
-        config.before(:suite) do
-          puts "before suite"
-        end
-        config.after(:suite) do
-          puts "after suite"
-        end
-      end
-  
       describe "before and after callbacks" do
         before(:all) do
           puts "before all"
@@ -173,5 +166,38 @@ Feature: before and after hooks
       end
       """
     When I run "rspec ensure_block_order_spec.rb"
-    Then I should see /before suite\nbefore all\nbefore each\nafter each\n\.after all\n.*after suite/m
+    Then I should see matching "before all\nbefore each\nafter each\n.after all"
+  
+@wip
+  Scenario: before/after all blocks are run once
+    Given a file named "before_and_after_all_spec.rb" with:
+      """
+      describe "before and after callbacks" do
+        before(:all) do
+          puts "before all"
+        end
+  
+        after(:all) do
+          puts "after all"
+        end
+  
+        example "in outer group" do
+  
+        end
+
+        describe "nested group" do
+          
+          example "in nested group" do
+
+          end
+
+        end
+
+      end
+      """
+    When I run "rspec before_and_after_all_spec.rb:16"
+    Then I should see matching "before all\n.after all"
+
+    When I run "rspec before_and_after_all_spec.rb"
+    Then I should see matching "before all\n..after all"
   

data/features/pending/pending_examples.feature

@@ -1,4 +1,3 @@
-@wip
 Feature: pending examples
 
   Rspec offers three ways to indicate that an example is disabled pending
@@ -8,10 +7,10 @@ Feature: pending examples
     Given a file named "example_without_block_spec.rb" with:
       """
       describe "an example" do
-        it "has not yet been implemented"
+        it "is a pending example"
       end
       """
-    When I run "spec example_without_block_spec.rb"
+    When I run "rspec example_without_block_spec.rb"
     Then the exit status should be 0
     And I should see "1 example, 0 failures, 1 pending"
     And I should see "Not Yet Implemented"
@@ -23,10 +22,11 @@ Feature: pending examples
       describe "an example" do
         it "is implemented but waiting" do
           pending("something else getting finished")
+          this_should_not_get_executed
         end
       end
       """
-    When I run "spec pending_without_block_spec.rb"
+    When I run "rspec pending_without_block_spec.rb"
     Then the exit status should be 0
     And I should see "1 example, 0 failures, 1 pending"
     And I should see "(something else getting finished)"
@@ -43,7 +43,7 @@ Feature: pending examples
         end
       end
       """
-    When I run "spec pending_with_failing_block_spec.rb"
+    When I run "rspec pending_with_failing_block_spec.rb"
     Then the exit status should be 0
     And I should see "1 example, 0 failures, 1 pending"
     And I should see "(something else getting finished)"
@@ -60,7 +60,7 @@ Feature: pending examples
         end
       end
       """
-    When I run "spec pending_with_passing_block_spec.rb"
+    When I run "rspec pending_with_passing_block_spec.rb"
     Then the exit status should not be 0
     And I should see "1 example, 1 failure"
     And I should see "FIXED"

data/features/subject/explicit_subject.feature

@@ -34,19 +34,18 @@ Feature: explicit subject
     When I run "rspec nested_subject_spec.rb"
     Then I should see "1 example, 0 failures"
 
-@wip
   Scenario: access subject from before block
     Given a file named "top_level_subject_spec.rb" with:
       """
       describe Array, "with some elements" do
         subject { [] }
-        before { subject += [1,2,3] }
+        before { subject.push(1,2,3) }
         it "should have the prescribed elements" do
           subject.should == [1,2,3]
         end
       end
       """
-    When I run "spec top_level_subject_spec.rb"
+    When I run "rspec top_level_subject_spec.rb"
     Then I should see "1 example, 0 failures"
 
   Scenario: subject using helper method

data/features/subject/implicit_subject.feature

@@ -7,8 +7,6 @@ Feature: implicit subject
   Scenario: subject in top level group
     Given a file named "top_level_subject_spec.rb" with:
       """
-      require 'rspec/expectations'
-
       describe Array, "when first created" do
         it "should be empty" do
           subject.should == []
@@ -21,8 +19,6 @@ Feature: implicit subject
   Scenario: subject in a nested group
     Given a file named "nested_subject_spec.rb" with:
       """
-      require 'rspec/expectations'
-
       describe Array do
         describe "when first created" do
           it "should be empty" do

data/features/support/env.rb

@@ -5,7 +5,7 @@ require 'aruba'
 module ArubaOverrides
   def detect_ruby_script(cmd)
     if cmd =~ /^rspec /
-      "ruby -I../../lib -S ../../bin/#{cmd}"
+      "ruby -I. -I../../lib -S ../../bin/#{cmd}"
     else
       super(cmd)
     end

data/lib/rspec/core.rb

@@ -5,6 +5,7 @@ require 'rspec/core/hooks'
 require 'rspec/core/subject'
 require 'rspec/core/let'
 require 'rspec/core/metadata'
+require 'rspec/core/pending'
 
 require 'rspec/core/around_proxy'
 require 'rspec/core/world'
@@ -18,6 +19,7 @@ require 'rspec/core/example_group'
 require 'rspec/core/formatters'
 require 'rspec/core/backward_compatibility'
 require 'rspec/core/version'
+require 'rspec/core/errors'
 
 module Rspec
   module Core

data/lib/rspec/core/errors.rb

@@ -0,0 +1,14 @@
+module Rspec
+  module Core
+    # If Test::Unit is loaed, we'll use its error as baseclass, so that Test::Unit
+    # will report unmet RSpec expectations as failures rather than errors.
+    superclass = ['Test::Unit::AssertionFailedError', '::StandardError'].map do |c|
+      eval(c) rescue nil
+    end.compact.first
+    
+    class PendingExampleFixedError < superclass
+    end
+  end
+end
+
+

data/lib/rspec/core/example.rb

@@ -4,55 +4,90 @@ module Rspec
 
       attr_reader :metadata, :example_block
 
-      def example_group
-        @example_group_class
+      def self.delegate_to_metadata(*keys)
+        keys.each do |key|
+          define_method(key) {@metadata[key]}
+        end
       end
 
-      alias_method :behaviour, :example_group
+      delegate_to_metadata :description, :full_description, :execution_result, :file_path, :pending
+
+      alias_method :inspect, :full_description
+      alias_method :to_s, :full_description
 
       def initialize(example_group_class, desc, options, example_block=nil)
         @example_group_class, @options, @example_block = example_group_class, options, example_block
         @metadata = @example_group_class.metadata.for_example(desc, options)
       end
 
-      def description
-        @metadata[:description]
+      def example_group
+        @example_group_class
       end
 
-      def record_results(results={})
-        @metadata[:execution_result].update(results)
-      end
+      alias_method :behaviour, :example_group
 
-      def execution_result
-        @metadata[:execution_result]
-      end
+      def run(example_group_instance, reporter)
+        @example_group_instance = example_group_instance
+        @example_group_instance.running_example = self
 
-      def file_path
-        @metadata[:file_path] || example_group.file_path
-      end
+        run_started
 
-      def inspect
-        @metadata[:full_description]
-      end
+        exception = nil
+
+        begin
+          run_before_each
+          pending_declared_in_example = catch(:pending_declared_in_example) do
+            if @example_group_class.around_eachs.empty?
+              @example_group_instance.instance_eval(&example_block) unless pending
+            else
+              @example_group_class.around_eachs.first.call(AroundProxy.new(self, &example_block))
+            end
+            throw :pending_declared_in_example, false
+          end
+        rescue Exception => e
+          exception = e
+        ensure
+          assign_auto_description
+        end
+
+        begin
+          run_after_each
+        rescue Exception => e
+          exception ||= e
+        ensure
+          @example_group_instance.running_example = nil
+        end
 
-      def to_s
-        inspect
+        if exception
+          run_failed(reporter, exception) 
+        elsif pending_declared_in_example
+          run_pending(reporter, pending_declared_in_example)
+        elsif pending
+          run_pending(reporter, 'Not Yet Implemented')
+        else
+          run_passed(reporter) 
+        end
       end
 
+    private
+
       def run_started
         record_results :started_at => Time.now
       end
 
       def run_passed(reporter=nil)
         run_finished reporter, 'passed'
+        true
       end
 
-      def run_pending(reporter=nil, message='Not yet implemented')
+      def run_pending(reporter, message)
         run_finished reporter, 'pending', :pending_message => message
+        true
       end
 
       def run_failed(reporter, exception)
         run_finished reporter, 'failed', :exception_encountered => exception
+        false
       end
 
       def run_finished(reporter, status, results={})
@@ -81,52 +116,10 @@ module Rspec
         end
       end
 
-      def runnable?
-        !metadata[:pending]
-      end
-
-      def run(example_group_instance, reporter)
-        @example_group_instance = example_group_instance
-        @example_group_instance.running_example = self
-
-        run_started
-
-        all_systems_nominal = true
-        exception_encountered = nil
-
-        begin
-          run_before_each
-          if @example_group_class.around_eachs.empty?
-            @example_group_instance.instance_eval(&example_block) if runnable?
-          else
-            @example_group_class.around_eachs.first.call(AroundProxy.new(self, &example_block))
-          end
-        rescue Exception => e
-          exception_encountered = e
-          all_systems_nominal = false
-        end
-
-        assign_auto_description
-
-        begin
-          run_after_each
-        rescue Exception => e
-          exception_encountered ||= e
-          all_systems_nominal = false
-        ensure
-          @example_group_instance.running_example = nil
-        end
-
-        if exception_encountered
-          run_failed(reporter, exception_encountered) 
-        else
-          runnable? ? run_passed(reporter) : run_pending(reporter)
-        end
-
-        all_systems_nominal
+      def record_results(results={})
+        execution_result.update(results)
       end
 
     end
-
   end
 end

data/lib/rspec/core/example_group.rb

@@ -4,6 +4,7 @@ module Rspec
       extend  Hooks
       include Subject
       include Let
+      include Pending
 
       attr_accessor :running_example
 
@@ -12,9 +13,21 @@ module Rspec
         Rspec::Core.world.example_groups << klass
       end
 
+      class << self
+        def self.delegate_to_metadata(*names)
+          names.each do |name|
+            define_method name do
+              metadata[:example_group][name]
+            end
+          end
+        end
+
+        delegate_to_metadata :description, :describes, :file_path
+        alias_method :display_name, :description
+      end
+
       def self.extended_modules #:nodoc:
-        ancestors = class << self; ancestors end
-        ancestors.select { |mod| mod.class == Module } - [ Object, Kernel ]
+        @extended_modules ||= ancestors.select { |mod| mod.class == Module } - [ Object, Kernel ]
       end
 
       def self.define_example_method(name, extra_options={})
@@ -24,6 +37,7 @@ module Rspec
             options.update(:caller => caller)
             options.update(#{extra_options.inspect})
             examples << Rspec::Core::Example.new(self, desc, options, block)
+            examples.last
           end
         END_RUBY
       end
@@ -82,69 +96,34 @@ module Rspec
         @metadata 
       end
 
-      def self.display_name
-        metadata[:example_group][:description]
-      end
-
-      def self.description
-        metadata[:example_group][:description]
-      end
-
-      def self.describes
-        metadata[:example_group][:describes]
-      end
-
-      def self.file_path
-        metadata[:example_group][:file_path]
-      end
-
       def self.describe(*args, &example_group_block)
-        raise(ArgumentError, "No arguments given.  You must a least supply a type or description") if args.empty? 
-        raise(ArgumentError, "You must supply a block when calling describe") if example_group_block.nil?
         @_subclass_count ||= 0
         @_subclass_count += 1
+        args << {} unless args.last.is_a?(Hash)
+        args.last.update(:example_group_block => example_group_block)
+        args.last.update(:caller => caller)
+        args.unshift Rspec.configuration unless args.first.is_a?(Rspec::Core::Configuration)
         const_set(
           "Nested_#{@_subclass_count}",
-          _build(Class.new(self), caller, args, &example_group_block)
+          subclass(self, args, &example_group_block)
         )
       end
 
-      def self.create(*args, &example_group_block)
-        _build(dup, caller, args, &example_group_block)
+      def self.subclass(parent, args, &example_group_block)
+        subclass = Class.new(parent)
+        subclass.set_it_up(*args) 
+        subclass.module_eval(&example_group_block) if example_group_block
+        subclass
       end
 
-      def self._build(klass, given_caller, args, &example_group_block)
-        args << {} unless args.last.is_a?(Hash)
-        args.last.update(:example_group_block => example_group_block, :caller => given_caller)
-        args.unshift Rspec.configuration unless args.first.is_a?(Rspec::Core::Configuration)
-        klass.set_it_up(*args) 
-        klass.module_eval(&example_group_block) if example_group_block
-        klass
+      def self.ancestors
+        @_ancestors ||= super().select {|a| a < Rspec::Core::ExampleGroup}
       end
 
       class << self
         alias_method :context, :describe
       end
 
-      def self.ancestors(superclass_last=false)
-        current_class = self
-
-        classes = []
-        while current_class < Rspec::Core::ExampleGroup
-          superclass_last ? classes << current_class : classes.unshift(current_class)
-          current_class = current_class.superclass
-        end
-        classes
-      end
-
-      def self.before_ancestors
-        @_before_ancestors ||= ancestors 
-      end
-
-      def self.after_ancestors
-        @_after_ancestors ||= ancestors(true)
-      end
-
       def self.before_all_ivars
         @before_all_ivars ||= {}
       end
@@ -155,43 +134,55 @@ module Rspec
         end
         configuration.find_hook(:before, :all, self).each { |blk| running_example.instance_eval(&blk) }
 
-        before_alls.each { |blk| running_example.instance_eval(&blk) }
+        ancestors.reverse.each do |ancestor|
+          until ancestor.before_alls.empty?
+            running_example.instance_eval &ancestor.before_alls.shift
+          end
+        end
         running_example.instance_variables.each { |ivar| before_all_ivars[ivar] = running_example.instance_variable_get(ivar) }
       end
 
       def self.eval_before_eachs(running_example)
         configuration.find_hook(:before, :each, self).each { |blk| running_example.instance_eval(&blk) }
-        before_ancestors.each { |ancestor| ancestor.before_eachs.each { |blk| running_example.instance_eval(&blk) } }
+        ancestors.reverse.each { |ancestor| ancestor.before_eachs.each { |blk| running_example.instance_eval(&blk) } }
+      end
+
+      def self.eval_after_eachs(running_example)
+        ancestors.each { |ancestor| ancestor.after_eachs.each { |blk| running_example.instance_eval(&blk) } }
+        configuration.find_hook(:after, :each, self).each { |blk| running_example.instance_eval(&blk) }
       end
 
       def self.eval_after_alls(running_example)
-        after_alls.each { |blk| running_example.instance_eval(&blk) }
+        ancestors.each do |ancestor|
+          after_alls = ancestor.after_alls.dup
+          until after_alls.empty?
+            running_example.instance_eval &after_alls.shift
+          end
+        end
         configuration.find_hook(:after, :all, self).each { |blk| running_example.instance_eval(&blk) }
         before_all_ivars.keys.each { |ivar| before_all_ivars[ivar] = running_example.instance_variable_get(ivar) }
       end
 
-      def self.eval_after_eachs(running_example)
-        after_ancestors.each { |ancestor| ancestor.after_eachs.each { |blk| running_example.instance_eval(&blk) } }
-        configuration.find_hook(:after, :each, self).each { |blk| running_example.instance_eval(&blk) }
-      end
-
       def self.run(reporter)
         example_group_instance = new
         reporter.add_example_group(self)
-        eval_before_alls(example_group_instance)
-        success = run_examples(example_group_instance, reporter)
-        eval_after_alls(example_group_instance)
-
-        success
+        begin
+          eval_before_alls(example_group_instance)
+          run_examples(example_group_instance, reporter)
+        ensure
+          eval_after_alls(example_group_instance)
+        end
       end
 
       # Runs all examples, returning true only if all of them pass
       def self.run_examples(instance, reporter)
         examples_to_run.map do |example|
-          success = example.run(instance, reporter)
-          instance.__reset__
-          before_all_ivars.each {|k, v| instance.instance_variable_set(k, v)}
-          success
+          begin
+            example.run(instance, reporter)
+          ensure
+            instance.__reset__
+            before_all_ivars.each {|k, v| instance.instance_variable_set(k, v)}
+          end
         end.all?
       end
 
@@ -208,6 +199,10 @@ module Rspec
           examples.collect {|e| e.metadata[:line_number]}
       end
 
+      def self.top_level_description
+        ancestors.last.description
+      end
+
       def described_class
         self.class.describes
       end