rspec-core 2.0.0.a5 → 2.0.0.a6

data/example_specs/failing/diffing_spec.rb

@@ -1,3 +1,5 @@
+require File.dirname(__FILE__) + '/spec_helper'
+
 describe "Running specs with --diff" do
   it "should print diff of different strings" do
     uk = <<-EOF
@@ -31,6 +33,6 @@ species=#{@species}
   it "should print diff of different objects' pretty representation" do
     expected = Animal.new "bob", "giraffe"
     actual   = Animal.new "bob", "tortoise"
-    expected.should eql(actual)
+    expected.should eq(actual)
   end
 end

data/example_specs/spec_helper.rb

@@ -4,7 +4,7 @@ $LOAD_PATH << File.expand_path('../../../rspec-mocks/lib', __FILE__)
 require 'rspec/expectations'
 require 'rspec/autorun'
 
-Rspec::Core.configure do |c|
+Rspec.configure do |c|
   c.mock_with :rspec
   c.include Rspec::Matchers
 end

data/features/configuration/spec_opts.feature

@@ -5,15 +5,15 @@ Feature: spec/spec.opts
   automatically.
 
   Options declared in spec/spec.opts will override configuration
-  set up in Rspec::Core.configure blocks.
+  set up in Rspec.configure blocks.
 
   Background:
     Given a directory named "spec"
 
-  Scenario: color set in Rspec::Core.configure
+  Scenario: color set in Rspec.configure
     Given a file named "spec/spec_helper.rb" with:
       """
-      Rspec::Core.configure do |c|
+      Rspec.configure do |c|
         c.color_enabled = true
       end
       """
@@ -21,7 +21,7 @@ Feature: spec/spec.opts
       """
       require "spec_helper"
       describe "color_enabled" do
-        context "when set with Rspec::Core.configure" do
+        context "when set with Rspec.configure" do
           it "is true" do
             Rspec::Core.configuration.color_enabled?.should be_true
           end
@@ -39,7 +39,7 @@ Feature: spec/spec.opts
     And a file named "spec/example_spec.rb" with:
       """
       describe "color_enabled" do
-        context "when set with Rspec::Core.configure" do
+        context "when set with Rspec.configure" do
           it "is true" do
             Rspec::Core.configuration.color_enabled?.should be_true
           end
@@ -57,14 +57,14 @@ Feature: spec/spec.opts
 
     And a file named "spec/spec_helper.rb" with:
       """
-      Rspec::Core.configure do |c|
+      Rspec.configure do |c|
         c.formatter = 'pretty'
       end
       """
     And a file named "spec/example_spec.rb" with:
       """
       describe "formatter" do
-        context "when set with Rspec::Core.configure and in spec.opts" do
+        context "when set with Rspec.configure and in spec.opts" do
           it "takes the value set in spec.opts" do
             Rspec::Core.configuration.formatter.should be_an(Rspec::Core::Formatters::DocumentationFormatter)
           end

data/features/example_groups/describe_aliases.feature

@@ -4,7 +4,7 @@ Feature: Nested example groups
   I want to use alternate names for describe
   So that I can better organize my examples
 
-  Scenario Outline: Using context
+  Scenario: Using context
     Given a file named "context_instead_of_describe_spec.rb" with:
     """
     context "Using context" do

data/features/example_groups/nested_groups.feature

@@ -4,13 +4,10 @@ Feature: Nested example groups
   I want to nest examples groups
   So that I can better organize my examples
 
-  Scenario Outline: Nested example groups
+  @wip
+  Scenario: Nested example groups
     Given a file named "nested_example_groups.rb" with:
     """
-    require 'rspec/autorun'
-    require 'rspec/expectations'
-    Rspec::Core::ExampleGroup.send(:include, Rspec::Matchers)
-
     describe "Some Object" do
       describe "with some more context" do
         it "should do this" do
@@ -24,7 +21,7 @@ Feature: Nested example groups
       end
     end
     """
-    When I run "rspec nested_example_groups.rb -fn"
+    When I run "rspec nested_example_groups.rb -fdoc"
     Then the stdout should match /^Some Object/
     And the stdout should match /^\s+with some more context/
     And the stdout should match /^\s+with some other context/

data/features/{before_and_after_blocks/around.feature → hooks/around_hook.feature}

@@ -1,4 +1,4 @@
-Feature: before and after blocks
+Feature: around hook
 
   Scenario: define around(:each) block in example group
     Given a file named "around_each_in_example_group_spec.rb" with:

data/features/{before_and_after_blocks/before_and_after_blocks.feature → hooks/before_and_after_hooks.feature}

@@ -1,4 +1,4 @@
-Feature: before and after blocks
+Feature: before and after hooks
 
   As a developer using RSpec
   I want to execute arbitrary code before and after each example
@@ -96,7 +96,7 @@ Feature: before and after blocks
   Scenario: define before and after blocks in configuration
     Given a file named "befores_in_configuration_spec.rb" with:
       """
-      Rspec::Core.configure do |config|
+      Rspec.configure do |config|
         config.before(:suite) do
           $before_suite = "before suite"
         end
@@ -133,7 +133,7 @@ Feature: before and after blocks
   Scenario: before/after blocks are run in order
     Given a file named "ensure_block_order_spec.rb" with:
       """
-      Rspec::Core.configure do |config|
+      Rspec.configure do |config|
         config.before(:suite) do
           puts "before suite"
         end

data/features/hooks/halt.feature

@@ -0,0 +1,27 @@
+Feature: halt
+  
+  In an example, before hook, after hook, or around hook, you can
+  halt the current example, group, or suite based on arbitrary
+  criteria.
+
+  @wip
+  Scenario: halt group on failure
+    Given a directory named "spec"
+    And a file named "spec/example_spec.rb" with:
+      """
+      Rspec.configure do |c|
+        c.after(:each) do
+          running_example.halt(:group, :status => 'failed')
+        end
+      end
+      describe "something" do
+        it "fails" do
+          fail 
+        end
+
+        it "does not run this example" do
+        end
+      end
+      """
+    When I run "rspec spec/example_spec.rb"
+    Then the stdout should match "1 example, 1 failure"

data/features/mock_framework_integration/use_flexmock.feature

@@ -6,7 +6,7 @@ Feature: mock with flexmock
   Scenario: Mock with flexmock
     Given a file named "flexmock_example_spec.rb" with:
       """
-      Rspec::Core.configure do |config|
+      Rspec.configure do |config|
         config.mock_framework = :flexmock
       end
 

data/features/mock_framework_integration/use_mocha.feature

@@ -6,7 +6,7 @@ Feature: mock with mocha
   Scenario: Mock with mocha
     Given a file named "mocha_example_spec.rb" with:
       """
-      Rspec::Core.configure do |config|
+      Rspec.configure do |config|
         config.mock_framework = :mocha
       end
 

data/features/mock_framework_integration/use_rr.feature

@@ -6,7 +6,7 @@ Feature: mock with rr
   Scenario: Mock with rr
     Given a file named "rr_example_spec.rb" with:
       """
-      Rspec::Core.configure do |config|
+      Rspec.configure do |config|
         config.mock_framework = :rr
       end
 

data/features/mock_framework_integration/use_rspec.feature

@@ -6,7 +6,7 @@ Feature: mock with rspec
   Scenario: Mock with rspec
     Given a file named "rspec_example_spec.rb" with:
       """
-      Rspec::Core.configure do |config|
+      Rspec.configure do |config|
         config.mock_framework = :rspec
       end
 

data/features/mocks/block_local_expectations.feature

@@ -22,7 +22,7 @@ Feature: block local expectations
       """
       require 'account'
 
-      Rspec::Core.configure do |config|
+      Rspec.configure do |config|
         config.mock_framework = :rspec
       end
 
@@ -47,7 +47,7 @@ Feature: block local expectations
       """
       require 'account'
 
-      Rspec::Core.configure do |config|
+      Rspec.configure do |config|
         config.mock_framework = :rspec
       end
 

data/features/mocks/mix_stubs_and_mocks.feature

@@ -8,7 +8,7 @@ Feature: Spec and test together
       """
       require 'rspec/expectations'
 
-      Rspec::Core.configure do |config|
+      Rspec.configure do |config|
         config.mock_framework = :rspec
       end
 

data/lib/rspec/core.rb

@@ -1,6 +1,7 @@
 require 'rspec/core/load_path'
 require 'rspec/core/deprecation'
 require 'rspec/core/mocking/with_absolutely_nothing'
+require 'rspec/core/around_proxy'
 require 'rspec/core/world'
 require 'rspec/core/configuration'
 require 'rspec/core/command_line_options'
@@ -27,6 +28,7 @@ module Rspec
     end
 
     def self.configure
+      Rspec.deprecate('Rspec::Core.configure', 'Rspec.configure', '2.0.0')
       yield configuration if block_given?
     end
 
@@ -35,4 +37,8 @@ module Rspec
     end
 
   end
+
+  def self.configure
+    yield Core.configuration if block_given?
+  end
 end

data/lib/rspec/core/around_proxy.rb

@@ -0,0 +1,14 @@
+module Rspec
+  module Core
+    class AroundProxy
+      def initialize(example_group_instance, &example_block)
+        @example_group_instance, @example_block = example_group_instance, example_block
+      end
+
+      def run
+        @example_group_instance.instance_eval(&@example_block)
+      end
+    end
+  end
+end
+

data/lib/rspec/core/deprecation.rb

@@ -1,47 +1,46 @@
 module Rspec
-  module Core
   
-    class << self
-      def deprecate(method, alternate_method=nil)
-         message = <<-NOTICE
+  class << self
+    def deprecate(method, alternate_method=nil, version=nil)
+      version_string = version ? "rspec-#{version}" : "a future version of Rspec" 
+
+      message = <<-NOTICE
 
 *****************************************************************
 DEPRECATION WARNING: you are using deprecated behaviour that will
-be removed from a future version of RSpec.
+be removed from #{version_string}.
 
 #{caller(0)[2]}
 
 * #{method} is deprecated.
 NOTICE
-        if alternate_method
-          message << <<-ADDITIONAL
+      if alternate_method
+        message << <<-ADDITIONAL
 * please use #{alternate_method} instead.
 ADDITIONAL
-        end
-
-        message << "*****************************************************************"
-        warn(message)
       end
 
-      def warn(message)
-        Kernel.warn(message)
-      end
+      message << "*****************************************************************"
+      warn(message)
+    end
 
+    def warn(message)
+      Kernel.warn(message)
     end
 
-    class HashWithDeprecationNotice < Hash
-    
-      def initialize(method, alternate_method=nil, &block)
-        @method, @alternate_method = method, alternate_method
-      end
-    
-      def []=(k,v)
-        Rspec.deprecate(@method, @alternate_method)
-        super
-      end
-    
+  end
+
+  class HashWithDeprecationNotice < Hash
+  
+    def initialize(method, alternate_method=nil, &block)
+      @method, @alternate_method = method, alternate_method
+    end
+  
+    def []=(k,v)
+      Rspec.deprecate(@method, @alternate_method)
+      super
     end
   
   end
   
-end
+end

data/lib/rspec/core/example.rb

@@ -35,23 +35,23 @@ module Rspec
         record_results :started_at => Time.now
       end
 
-      def run_passed
-        run_finished 'passed'
+      def run_passed(reporter=nil)
+        run_finished reporter, 'passed'
       end
 
-      def run_pending(message='Not yet implemented')
-        run_finished 'pending', :pending_message => message
+      def run_pending(reporter=nil, message='Not yet implemented')
+        run_finished reporter, 'pending', :pending_message => message
       end
 
-      def run_failed(exception)
-        run_finished 'failed', :exception_encountered => exception
+      def run_failed(reporter, exception)
+        run_finished reporter, 'failed', :exception_encountered => exception
       end
 
-      def run_finished(status, results={})
+      def run_finished(reporter, status, results={})
         record_results results.update(:status => status)
         finish_time = Time.now
         record_results :finished_at => finish_time, :run_time => (finish_time - execution_result[:started_at])
-        Rspec::Core.configuration.formatter.example_finished(self)
+        reporter.example_finished(self)
       end
 
       def run_before_each
@@ -73,21 +73,11 @@ module Rspec
         end
       end
 
-      class AroundProxy
-        def initialize(example_group_instance, &example_block)
-          @example_group_instance, @example_block = example_group_instance, example_block
-        end
-
-        def run
-          @example_group_instance.instance_eval(&@example_block)
-        end
-      end
-
       def runnable?
         !metadata[:pending]
       end
 
-      def run(example_group_instance)
+      def run(example_group_instance, reporter)
         @example_group_instance = example_group_instance
         @example_group_instance.running_example = self
 
@@ -120,9 +110,9 @@ module Rspec
         end
 
         if exception_encountered
-          run_failed(exception_encountered) 
+          run_failed(reporter, exception_encountered) 
         else
-          runnable? ? run_passed : run_pending
+          runnable? ? run_passed(reporter) : run_pending(reporter)
         end
 
         all_systems_nominal

data/lib/rspec/core/example_group.rb

@@ -8,7 +8,7 @@ module Rspec
       extend Advice
       include ExampleGroupSubject
 
-      attr_accessor :running_example, :reporter
+      attr_accessor :running_example
 
       def self.inherited(klass)
         super
@@ -58,8 +58,12 @@ module Rspec
         @_examples_to_run ||= []
       end
 
+      def self.superclass_metadata
+        self.superclass.respond_to?(:metadata) ? self.superclass.metadata : nil
+      end
+
       def self.set_it_up(*args)
-        @metadata = Rspec::Core::Metadata.process(self.superclass.metadata, *args)
+        @metadata = Rspec::Core::Metadata.process(superclass_metadata, *args)
 
         Rspec::Core.configuration.find_modules(self).each do |include_or_extend, mod, opts|
           if include_or_extend == :extend
@@ -97,15 +101,24 @@ module Rspec
       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
+        const_set(
+          "NestedLevel_#{@_subclass_count}",
+          _build(Class.new(self), caller, args, &example_group_block)
+        )
+      end
 
-        # TODO: Pull out the below into a metadata object, that we can defer the subclassing if necessary
-        # describe 'foo', :shared => true will need this to be completed first
-        subclass('NestedLevel') do
-          args << {} unless args.last.is_a?(Hash)
-          args.last.update(:example_group_block => example_group_block, :caller => caller)
-          set_it_up(*args)
-          module_eval(&example_group_block)
-        end
+      def self.create(*args, &example_group_block)
+        _build(dup, caller, args, &example_group_block)
+      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)
+        klass.set_it_up(*args) 
+        klass.module_eval(&example_group_block) if example_group_block
+        klass
       end
 
       class << self
@@ -137,7 +150,9 @@ module Rspec
       end
 
       def self.eval_before_alls(running_example)
-        superclass.before_all_ivars.each { |ivar, val| running_example.instance_variable_set(ivar, val) }
+        if superclass.respond_to?(:before_all_ivars)
+          superclass.before_all_ivars.each { |ivar, val| running_example.instance_variable_set(ivar, val) }
+        end
         Rspec::Core.configuration.find_advice(:before, :all, self).each { |blk| running_example.instance_eval(&blk) }
 
         before_alls.each { |blk| running_example.instance_eval(&blk) }
@@ -173,23 +188,13 @@ module Rspec
       # Runs all examples, returning true only if all of them pass
       def self.run_examples(example_world, reporter)
         examples_to_run.map do |ex| 
-          result = ex.run(example_world) 
+          result = ex.run(example_world, reporter) 
           example_world.__reset__
           before_all_ivars.each { |k, v| example_world.instance_variable_set(k, v) } 
           result
         end.all?
       end
 
-      def self.subclass(base_name, &body) # :nodoc:
-        @_subclass_count ||= 0
-        @_subclass_count += 1
-        klass = Class.new(self)
-        class_name = "#{base_name}_#{@_subclass_count}"
-        const_set(class_name, klass)
-        klass.instance_eval(&body)
-        klass
-      end
-
       def self.to_s
         self == Rspec::Core::ExampleGroup ? 'Rspec::Core::ExampleGroup' : name
       end