rspec-core 2.2.1 → 2.3.0

data/Gemfile

@@ -1,5 +1,6 @@
 source "http://rubygems.org"
 
+### rspec libs
 %w[rspec-core rspec-expectations rspec-mocks].each do |lib|
   library_path = File.expand_path("../../#{lib}", __FILE__)
   if File.exist?(library_path)
@@ -9,28 +10,38 @@ source "http://rubygems.org"
   end
 end
 
-gem "rake"
+### dev dependencies
+gem "rake", "0.8.7"
 gem "cucumber", "0.9.4"
 gem "aruba", "0.2.2"
-gem "autotest"
-gem "rcov"
-gem "mocha"
-gem "rr"
-gem "flexmock"
-gem "nokogiri"
-gem "syntax"
-gem "relish", "~> 0.0.3"
-gem "guard-rspec"
-gem "growl"
+gem "rcov", "0.9.9"
+gem "relish", "0.2.0"
+gem "guard-rspec", "0.1.9"
+gem "growl", "1.0.3"
+gem "ZenTest", "~> 4.4.2"
+gem "nokogiri", "1.4.4"
+
+if RUBY_PLATFORM =~ /darwin/
+  gem "autotest-fsevent", "~> 0.2.4"
+  gem "autotest-growl", "~> 0.2.9"
+end
 
 gem "ruby-debug", :platforms => :ruby_18
-gem "ruby-debug19", :platforms => :ruby_19
+gem "ruby-debug19", "~> 0.11.6", :platforms => :ruby_19
 
 platforms :ruby_18, :ruby_19 do
-  gem "rb-fsevent"
-  gem "ruby-prof"
+  gem "rb-fsevent", "~> 0.3.9"
+  gem "ruby-prof", "~> 0.9.2"
 end
 
 platforms :jruby do
   gem "jruby-openssl"
 end
+
+### rspec-core only
+gem "mocha", "~> 0.9.10"
+gem "rr", "~> 1.0.2"
+gem "flexmock", "~> 0.8.11"
+
+### optional runtime deps
+gem "syntax", "1.0.0"

data/History.markdown

@@ -1,8 +1,26 @@
 ## rspec-core release history (incomplete)
 
-### 2.2.1 / in development
+### 2.3.0 / 2010-12-12
 
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.2.0...master)
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.2.1...v2.3.0)
+
+* Enhancements
+  * tell autotest to use "rspec2" if it sees a .rspec file in the project's
+    root directory
+    * replaces the need for ./autotest/discover.rb, which will not work with
+      all versions of ZenTest and/or autotest
+  * config.expect_with
+    * :rspec          # => rspec/expectations
+    * :stdlib         # => test/unit/assertions
+    * :rspec, :stdlib # => both
+
+* Bug fixes
+  * fix dev Gemfile to work on non-mac-os machines (Lake Denman)
+  * ensure explicit subject is only eval'd once (Laszlo Bacsi)
+
+### 2.2.1 / 2010-11-28
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.2.0...v2.2.1)
 
 * Bug fixes
   * alias_method instead of override Kernel#method_missing (John Wilger)

data/README.md

@@ -4,10 +4,10 @@ Behaviour Driven Development for Ruby
 
 ## Documentation
 
-The [Cucumber features](http://relishapp.com/rspec/rspec-core/v/2-1) are the
+The [Cucumber features](http://relishapp.com/rspec/rspec-core) are the
 most comprehensive and up-to-date docs for end-users.
 
-The [RDoc](http://rubydoc.info/gems/rspec-core/2.1/frames) provides
+The [RDoc](http://rubydoc.info/gems/rspec-core/2.3.0/frames) provides
 additional information for contributors and/or extenders.
 
 All of the documentation is open source and a work in progress. If you find it

data/Upgrade.markdown

@@ -1,3 +1,26 @@
+# rspec-core-2.3
+
+## autotest integration
+
+Add a .rspec file to the project's root directory to tell RSpec to tell
+Autotest to use RSpec's specialized Autotest class.
+
+NOTE that rspec-core-2.0, 2.1, and 2.2 required an autotest/discover.rb file in
+the project's root directory. This worked with some, but not all versions of
+autotest and/or the autotest command that ships with ZenTest. This new approach
+will work regardless of which version of autotest/ZenTest you are using.
+
+## config.expect_with
+
+Use this to configure RSpec to use rspec/expectations (default),
+test/unit/assertions, or both:
+
+    RSpec.configure do |config|
+      config.expect_with :rspec          # => rspec/expectations
+      config.expect_with :stdlib         # => test/unit/assertions
+      config.expect_with :rspec, :stdlib # => both
+    end
+
 # rspec-core-2.2
 
 ## FASTER!

data/features/README.markdown

@@ -8,6 +8,34 @@ rspec-core provides the structure for RSpec code examples:
       end
     end
 
+### Autotest integration
+
+RSpec ships with a specialized subclass of Autotest. You can pass the --style
+option to the autotest command to tell Autotest to load this subclass:
+
+    $ autotest --style rspec2
+
+Alternatively, you can configure your project such that this happens
+automatically, in which case you can just type:
+
+    $ autotest
+
+Here's how:
+
+#### rspec-2.3 and up
+
+Add a .rspec file to the project's root directory if it's not already there.
+You can use this to configure RSpec options, but you don't have to. As long as
+RSpec sees this file, it will tell Autotest to use the "rspec2" style.
+
+#### rspec-2.2 and down
+
+Add an autotest directory to the project root, and add a file named discover.rb to
+that directory with the following:
+
+    # in ./autotest/discover.rb
+    Autotest.add_discovery {"rspec2"}
+
 ## Issues
 
 The documentation for rspec-core is a work in progress. We'll be adding

data/features/example_groups/basic_structure.feature

@@ -1,18 +1,23 @@
 Feature: basic structure
 
-  RSpec provides a DSL for creating executable examples of how code is expected
-  to behave, organized in groups. It uses the words "describe" and "it" so we can
+  RSpec is a DSL for creating executable examples of how code is expected to
+  behave, organized in groups. It uses the words "describe" and "it" so we can
   express concepts like a conversation:
 
     "Describe an account when it is first opened."
     "It has a balance of zero."
 
-  Use the describe() method to declare an example group. This defines a
-  subclass of RSpec's ExampleGroup class. Within a group, you can declare
-  nested groups using the describe() or context() methods.
+  The describe() method creates a subclass of RSpec::Core::ExampleGroup. The
+  block passed to describe() is evaluated in the context of that class, so any
+  class methods of ExampleGroup are at your disposal within that block.
 
-  Use the it() method to declare an example. This, effectively, defines a
-  method that is run in an instance of the group in which it is declared.
+  Within a group, you can declare nested groups using the describe() or
+  context() methods. A nested group is actually a subclass of the outer group,
+  so it has access to same methods as the outer group, as well as any class
+  methods defined in the outer group.
+
+  The it() method accepts a block, which is later executed in the context of
+  an instance of the group in which it is declared.
 
   Scenario: one group, one example
     Given a file named "sample_spec.rb" with:

data/features/expectation_framework_integration/configure_expectation_framework.feature

@@ -0,0 +1,63 @@
+Feature: configure expectation framework
+
+  By default, RSpec is configured to include rspec-expectations for expressing
+  desired outcomes. You can also configure RSpec to use:
+
+    rspec/expectations (explicitly)
+    test/unit/assertions
+    rspec/expecations _and_ test/unit assertions
+
+  Scenario: configure rspec-expectations (explicitly)
+    Given a file named "example_spec.rb" with:
+      """
+      RSpec.configure do |config|
+        config.expect_with :rspec
+      end
+
+      describe 5 do
+        it "is greater than 4" do
+          5.should be > 4
+        end
+      end
+      """
+    When I run "rspec example_spec.rb"
+    Then the output should contain "1 example, 0 failures"
+    And the exit status should be 0
+
+  Scenario: configure test/unit assertions
+    Given a file named "example_spec.rb" with:
+      """
+      RSpec.configure do |config|
+        config.expect_with :stdlib
+      end
+
+      describe 5 do
+        it "is greater than 4" do
+          assert 5 > 4, "expected 5 to be greater than 4"
+        end
+      end
+      """
+    When I run "rspec example_spec.rb"
+    Then the output should contain "1 example, 0 failures"
+    And the exit status should be 0
+
+  Scenario: configure rspec/expecations AND test/unit assertions
+    Given a file named "example_spec.rb" with:
+      """
+      RSpec.configure do |config|
+        config.expect_with :rspec, :stdlib
+      end
+
+      describe 5 do
+        it "is greater than 4" do
+          assert 5 > 4, "expected 5 to be greater than 4"
+        end
+
+        it "is less than 4" do
+          5.should be < 6
+        end
+      end
+      """
+    When I run "rspec example_spec.rb"
+    Then the output should contain "2 examples, 0 failures"
+    And the exit status should be 0

data/features/hooks/around_hooks.feature

@@ -236,36 +236,36 @@ Feature: around hooks
 
   Scenario: multiple around hooks in the same scope
     Given a file named "example_spec.rb" with:
-    """
-    describe "if there are multiple around hooks in the same scope" do
-      around(:each) do |example|
-        puts "first around hook before"
-        example.run
-        puts "first around hook after"
-      end
+      """
+      describe "if there are multiple around hooks in the same scope" do
+        around(:each) do |example|
+          puts "first around hook before"
+          example.run
+          puts "first around hook after"
+        end
 
-      around(:each) do |example|
-        puts "second around hook before"
-        example.run
-        puts "second around hook after"
-      end
+        around(:each) do |example|
+          puts "second around hook before"
+          example.run
+          puts "second around hook after"
+        end
 
-      it "they should all be run" do
-        puts "in the example"
-        1.should == 1
+        it "they should all be run" do
+          puts "in the example"
+          1.should == 1
+        end
       end
-    end
-    """
+      """
     When I run "rspec example_spec.rb"
     Then the output should contain "1 example, 0 failure"
     And the output should contain:
-    """
-    first around hook before
-    second around hook before
-    in the example
-    second around hook after
-    first around hook after
-    """
+      """
+      first around hook before
+      second around hook before
+      in the example
+      second around hook after
+      first around hook after
+      """
 
   Scenario: around hooks in multiple scopes
     Given a file named "example_spec.rb" with:

data/features/metadata/described_class.feature

@@ -8,7 +8,7 @@ Feature: described class
       """
       describe Fixnum do
         it "is available as described_class" do
-          described_class.should == Fixnum
+          described_class.should eq(Fixnum)
         end
       end
       """

data/features/mock_framework_integration/use_any_framework.feature

@@ -0,0 +1,106 @@
+Feature: mock with an alternative framework
+
+  In addition to rspec, mocha, flexmock, and RR, you can choose an alternate
+  framework as the mocking framework. You (or the framework authors) just needs
+  to provide an adapter that hooks RSpec's events into those of the framework.
+
+  A mock framework adapter must expose three methods:
+    
+  * setup_mocks_for_rspec
+    * called before each example is run
+  * verify_mocks_for_rspec 
+    * called after each example is run
+    * this is where message expectation failures should result in an error with
+      the appropriate failure message
+  * teardown_mocks_for_rspec 
+    * called after verify_mocks_for_rspec
+    * use this to clean up resources, restore objects to earlier state, etc
+    * guaranteed to run even if there are failures
+
+  Scenario: Mock with alternate framework
+    Given a file named "expector.rb" with:
+      """
+      class Expector
+        class << self
+          def expectors
+            @expectors ||= []
+          end
+
+          def clear_expectors
+            expectors.clear
+          end
+
+          def verify_expectors
+            expectors.each {|d| d.verify}
+          end
+        end
+
+        def initialize
+          self.class.expectors << self
+        end
+
+        def expectations
+          @expectations ||= []
+        end
+
+        def expect(message)
+          expectations << message.to_s
+        end
+
+        def verify
+          unless expectations.empty?
+            raise expectations.map {|e|
+              "expected #{e}, but it was never received"
+            }.join("\n")
+          end
+        end
+
+      private
+
+        def method_missing(name, *args, &block)
+          expectations.delete(name.to_s)
+        end
+
+      public
+
+        module RSpecAdapter
+          def setup_mocks_for_rspec
+            # no setup necessary
+          end
+
+          def verify_mocks_for_rspec
+            Expector.verify_expectors.each {|d| d.verify}
+          end
+
+          def teardown_mocks_for_rspec
+            Expector.clear_expectors
+          end
+        end
+      end
+      """
+      
+    Given a file named "example_spec.rb" with:
+      """
+      require File.expand_path("../expector", __FILE__)
+
+      RSpec.configure do |config|
+        config.mock_framework = Expector::RSpecAdapter
+      end
+
+      describe Expector do
+        it "passes when message is received" do
+          expector = Expector.new
+          expector.expect(:foo)
+          expector.foo
+        end
+
+        it "fails when message is received" do
+          expector = Expector.new
+          expector.expect(:foo)
+        end
+      end
+      """
+    When I run "rspec example_spec.rb --format doc"
+    Then the exit status should be 1
+    And the output should contain "2 examples, 1 failure" 
+    And the output should contain "fails when message is received (FAILED - 1)" 

data/features/step_definitions/additional_cli_steps.rb

@@ -9,3 +9,8 @@ Then /^the output should not contain any of these:$/ do |table|
     combined_output.should_not =~ compile_and_escape(string)
   end
 end
+
+Then /^the example(s)? should( all)? pass$/ do |*|
+  Then %q{the output should contain "0 failures"}
+  Then %q{the exit status should be 0}
+end

data/features/subject/explicit_subject.feature

@@ -60,3 +60,19 @@ Feature: explicit subject
       """
     When I run "rspec helper_subject_spec.rb"
     Then the output should contain "1 example, 0 failures"
+
+  Scenario: subject block is invoked at most once per example
+    Given a file named "nil_subject_spec.rb" with:
+      """
+      describe Array do
+        describe "#[]" do
+          context "with index out of bounds" do
+            before { Array.should_receive(:one_two_three).once.and_return([1,2,3]) }
+            subject { Array.one_two_three[42] }
+            it { should be_nil }
+          end
+        end
+      end
+      """
+    When I run "rspec nil_subject_spec.rb"
+    Then the output should contain "1 example, 0 failures"

data/lib/autotest/discover.rb

@@ -0,0 +1 @@
+Autotest.add_discovery { "rspec2" } if File.exist?("./.rspec")

data/lib/rspec/core.rb

@@ -19,6 +19,7 @@ require 'rspec/core/command_line'
 require 'rspec/core/drb_command_line'
 require 'rspec/core/runner'
 require 'rspec/core/example'
+require 'rspec/core/shared_context'
 require 'rspec/core/shared_example_group'
 require 'rspec/core/example_group'
 require 'rspec/core/version'
@@ -27,6 +28,8 @@ require 'rspec/core/errors'
 module RSpec
   autoload :Matchers, 'rspec/matchers'
 
+  SharedContext = Core::SharedContext
+
   module Core
     def self.install_directory
       @install_directory ||= File.expand_path(File.dirname(__FILE__))

data/lib/rspec/core/configuration.rb

@@ -26,8 +26,6 @@ module RSpec
       add_setting :profile_examples
       add_setting :fail_fast, :default => false
       add_setting :run_all_when_everything_filtered
-      add_setting :mock_framework, :default => :rspec
-      add_setting :expectation_framework, :default => :rspec
       add_setting :filter
       add_setting :exclusion_filter
       add_setting :filename_pattern, :default => '**/*_spec.rb'
@@ -112,35 +110,98 @@ module RSpec
         backtrace_clean_patterns.any? { |regex| line =~ regex }
       end
 
-      def mock_with(mock_framework)
-        settings[:mock_framework] = mock_framework
+      # Returns the configured mock framework adapter module
+      def mock_framework
+        settings[:mock_framework] ||= begin
+                                        require 'rspec/core/mocking/with_rspec'
+                                        RSpec::Core::MockFrameworkAdapter
+                                      end
       end
 
-      def require_mock_framework_adapter
-        require case mock_framework.to_s
-        when /rspec/i
-          'rspec/core/mocking/with_rspec'
-        when /mocha/i
-          'rspec/core/mocking/with_mocha'
-        when /rr/i
-          'rspec/core/mocking/with_rr'
-        when /flexmock/i
-          'rspec/core/mocking/with_flexmock'
+      # Delegates to mock_framework=(framework)
+      def mock_with(framework)
+        self.mock_framework = framework
+      end
+
+      # Sets the mock framework adapter module.
+      #
+      # +framework+ can be a Symbol or a Module.
+      #
+      # Given any of :rspec, :mocha, :flexmock, or :rr, configures the named
+      # framework.
+      #
+      # Given :nothing, configures no framework. Use this if you don't use any
+      # mocking framework to save a little bit of overhead.
+      #
+      # Given a Module, includes that module in every example group. The module
+      # should adhere to RSpec's mock framework adapter API:
+      #
+      #   setup_mocks_for_rspec
+      #     - called before each example
+      #
+      #   verify_mocks_for_rspec
+      #     - called after each example. Framework should raise an exception
+      #       when expectations fail
+      #
+      #   teardown_mocks_for_rspec
+      #     - called after verify_mocks_for_rspec (even if there are errors)
+      def mock_framework=(framework)
+        case framework
+        when Module
+          settings[:mock_framework] = framework
+        when String, Symbol
+          require case framework.to_s
+                  when /rspec/i
+                    'rspec/core/mocking/with_rspec'
+                  when /mocha/i
+                    'rspec/core/mocking/with_mocha'
+                  when /rr/i
+                    'rspec/core/mocking/with_rr'
+                  when /flexmock/i
+                    'rspec/core/mocking/with_flexmock'
+                  else
+                    'rspec/core/mocking/with_absolutely_nothing'
+                  end
+          settings[:mock_framework] = RSpec::Core::MockFrameworkAdapter
         else
-          'rspec/core/mocking/with_absolutely_nothing'
         end
       end
 
-      def expect_with(expectation_framework)
-        settings[:expectation_framework] = expectation_framework
+      # Returns the configured expectation framework adapter module(s)
+      def expectation_frameworks
+        settings[:expectation_frameworks] ||= begin
+                                               require 'rspec/core/expecting/with_rspec'
+                                               [RSpec::Core::ExpectationFrameworkAdapter]
+                                             end
       end
 
-      def require_expectation_framework_adapter
-        require case expectation_framework.to_s
-        when /rspec/i
-          'rspec/core/expecting/with_rspec'
-        else
-          raise ArgumentError, "#{expectation_framework.inspect} is not supported"
+      # Delegates to expect_with=([framework])
+      def expectation_framework=(framework)
+        expect_with([framework])
+      end
+
+      # Sets the expectation framework module(s).
+      #
+      # +frameworks+ can be :rspec, :stdlib, or both 
+      #
+      # Given :rspec, configures rspec/expectations.
+      # Given :stdlib, configures test/unit/assertions
+      # Given both, configures both
+      def expect_with(*frameworks)
+        settings[:expectation_frameworks] = []
+        frameworks.each do |framework|
+          case framework
+          when Symbol
+            case framework
+            when :rspec
+              require 'rspec/core/expecting/with_rspec'
+            when :stdlib
+              require 'rspec/core/expecting/with_stdlib'
+            else
+              raise ArgumentError, "#{framework.inspect} is not supported"
+            end
+            settings[:expectation_frameworks] << RSpec::Core::ExpectationFrameworkAdapter
+          end
         end
       end
 
@@ -314,13 +375,13 @@ EOM
       end
 
       def configure_mock_framework
-        require_mock_framework_adapter
-        RSpec::Core::ExampleGroup.send(:include, RSpec::Core::MockFrameworkAdapter)
+        RSpec::Core::ExampleGroup.send(:include, mock_framework)
       end
 
       def configure_expectation_framework
-        require_expectation_framework_adapter
-        RSpec::Core::ExampleGroup.send(:include, RSpec::Core::ExpectationFrameworkAdapter)
+        expectation_frameworks.each do |framework|
+          RSpec::Core::ExampleGroup.send(:include, framework)
+        end
       end
 
       def load_spec_files
@@ -346,8 +407,6 @@ MESSAGE
         end
       end
 
-    private
-
       def output_to_tty?
         begin
           output_stream.tty? || tty?

data/lib/rspec/core/example_group.rb

@@ -177,8 +177,8 @@ module RSpec
         store_before_all_ivars(example_group_instance)
       end
 
-      def self.eval_around_eachs(example_group_instance, procsy)
-        around_hooks.reverse.inject(procsy) do |procsy, around_hook|
+      def self.eval_around_eachs(example_group_instance, initial_procsy)
+        around_hooks.reverse.inject(initial_procsy) do |procsy, around_hook|
           Example::Procsy.new(procsy.metadata) do
             example_group_instance.instance_eval_with_args(procsy, &around_hook)
           end

data/lib/rspec/core/expecting/with_stdlib.rb

@@ -0,0 +1,9 @@
+require 'test/unit/assertions'
+
+module RSpec
+  module Core
+    module ExpectationFrameworkAdapter
+      include Test::Unit::Assertions
+    end
+  end
+end

data/lib/rspec/core/shared_context.rb

@@ -0,0 +1,16 @@
+module RSpec
+  module Core
+    module SharedContext
+      include Hooks
+
+      def included(group)
+        [:before, :after].each do |type|
+          [:all, :each].each do |scope|
+            group.hooks[type][scope].concat hooks[type][scope]
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/rspec/core/shared_example_group.rb

@@ -7,6 +7,8 @@ module RSpec
         RSpec.world.shared_example_groups[name] = block
       end
 
+      alias :shared_examples_for :share_examples_for
+
       def share_as(name, &block)
         if Object.const_defined?(name)
           mod = Object.const_get(name)
@@ -31,7 +33,6 @@ module RSpec
         RSpec.world.shared_example_groups[shared_const] = block
       end
 
-      alias :shared_examples_for :share_examples_for
 
     private
 

data/lib/rspec/core/subject.rb

@@ -28,7 +28,11 @@ module RSpec
         #     end
         #   end
         def subject
-          @original_subject ||= instance_eval(&self.class.subject)
+          if defined?(@original_subject)
+            @original_subject
+          else
+            @original_subject = instance_eval(&self.class.subject)
+          end
         end
 
         begin
@@ -86,7 +90,7 @@ module RSpec
         # The attribute can be a +Symbol+ or a +String+. Given a +String+
         # with dots, the result is as though you concatenated that +String+
         # onto the subject in an expression.
-        #   
+        #
         #   describe Person do
         #     subject do
         #       Person.new.tap do |person|

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      STRING = '2.2.1'
+      STRING = '2.3.0'
     end
   end
 end

data/spec/autotest/discover_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe "autotest/discover.rb" do
+  context "with /.rspec present" do
+    it "adds 'rspec2' to the list of discoveries" do
+      File.stub(:exist?).with("./.rspec") { true }
+      Autotest.should_receive(:add_discovery)
+      load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
+    end
+  end
+
+  context "with /.rspec absent" do
+    it "does not add 'rspec2' to the list of discoveries" do
+      File.stub(:exist?) { false }
+      Autotest.should_not_receive(:add_discovery)
+      load File.expand_path("../../../lib/autotest/discover.rb", __FILE__)
+    end
+  end
+end

data/spec/rspec/core/configuration_spec.rb

@@ -29,64 +29,74 @@ module RSpec::Core
       end
     end
 
-    describe "mock_framework" do
-      before(:each) do
-        config.stub(:require)
-      end
-
+    describe "#mock_framework" do
       it "defaults to :rspec" do
         config.should_receive(:require).with('rspec/core/mocking/with_rspec')
-        config.require_mock_framework_adapter
+        config.mock_framework
       end
+    end
 
+    describe "#mock_framework=" do
       [:rspec, :mocha, :rr, :flexmock].each do |framework|
-        it "uses #{framework.inspect} framework when set explicitly" do
-          config.should_receive(:require).with("rspec/core/mocking/with_#{framework}")
-          config.mock_framework = framework
-          config.require_mock_framework_adapter
+        context "with #{framework}" do
+          it "requires the adapter for #{framework.inspect}" do
+            config.should_receive(:require).with("rspec/core/mocking/with_#{framework}")
+            config.mock_framework = framework
+          end
+        end
+      end
+
+      context "with a module" do
+        it "sets the mock_framework_adapter to that module" do
+          config.stub(:require)
+          mod = Module.new
+          config.mock_framework = mod
+          config.mock_framework.should eq(mod)
         end
       end
 
       it "uses the null adapter when set to any unknown key" do
         config.should_receive(:require).with('rspec/core/mocking/with_absolutely_nothing')
         config.mock_framework = :crazy_new_mocking_framework_ive_not_yet_heard_of
-        config.require_mock_framework_adapter
       end
+    end
 
-      it "supports mock_with for backward compatibility with rspec-1.x" do
-        config.should_receive(:require).with('rspec/core/mocking/with_rspec')
+    describe "#mock_with" do
+      it "delegates to mock_framework=" do
+        config.should_receive(:mock_framework=).with(:rspec)
         config.mock_with :rspec
-        config.require_mock_framework_adapter
       end
-
     end
 
-    describe "expectation_framework" do
-
+    describe "#expectation_framework" do
       it "defaults to :rspec" do
         config.should_receive(:require).with('rspec/core/expecting/with_rspec')
-        config.require_expectation_framework_adapter
+        config.expectation_frameworks
       end
+    end
 
-      [:rspec].each do |framework|
-        it "uses #{framework.inspect} framework when set explicitly" do
-          config.should_receive(:require).with("rspec/core/expecting/with_#{framework}")
-          config.mock_framework = framework
-          config.require_expectation_framework_adapter
-        end
+    describe "#expectation_framework=" do
+      it "delegates to expect_with=" do
+        config.should_receive(:expect_with).with([:rspec])
+        config.expectation_framework = :rspec
       end
+    end
 
-      it "supports expect_with for backward compatibility with rspec-1.x" do
-        config.should_receive(:require).with('rspec/core/expecting/with_rspec')
-        config.mock_with :rspec
-        config.require_expectation_framework_adapter
+    describe "#expect_with" do
+      [:rspec, :stdlib].each do |framework|
+        context "with #{framework}" do
+          it "requires the adapter for #{framework.inspect}" do
+            config.should_receive(:require).with("rspec/core/expecting/with_#{framework}")
+            config.expect_with framework
+          end
+        end
       end
 
       it "raises ArgumentError if framework is not supported" do
-        config.expectation_framework = :not_supported
-        expect { config.require_expectation_framework_adapter }.to raise_error(ArgumentError)
+        expect do
+          config.expect_with :not_supported
+        end.to raise_error(ArgumentError)
       end
-
     end
 
     context "setting the files to run" do

data/spec/rspec/core/shared_context_spec.rb

@@ -0,0 +1,30 @@
+require "spec_helper"
+
+describe RSpec::Core::SharedContext do
+  describe "hooks" do
+    it "creates a before hook" do
+      before_all_hook = false
+      before_each_hook = false
+      after_each_hook = false
+      after_all_hook = false
+      shared = Module.new do
+        extend RSpec::Core::SharedContext
+        before(:all) { before_all_hook = true }
+        before(:each) { before_each_hook = true }
+        after(:each)  { after_each_hook = true }
+        after(:all)  { after_all_hook = true }
+      end
+      group = RSpec::Core::ExampleGroup.describe do
+        include shared
+        example { }
+      end
+
+      group.run
+
+      before_all_hook.should be_true
+      before_each_hook.should be_true
+      after_each_hook.should be_true
+      after_all_hook.should be_true
+    end
+  end
+end

data/spec/rspec/core/subject_spec.rb

@@ -32,6 +32,25 @@ module RSpec::Core
     end
 
     describe "explicit subject" do
+      [false, nil].each do |falsy_value|
+        context "with a value of #{falsy_value.inspect}" do
+          it "is evaluated once per example" do
+            group = ExampleGroup.describe(Array)
+            group.before do
+              Object.should_receive(:this_question?).once.and_return(falsy_value)
+            end
+            group.subject do
+              Object.this_question?
+            end
+            group.example do
+              subject
+              subject
+            end
+            group.run.should be_true, "expected subject block to be evaluated only once"
+          end
+        end
+      end
+
       describe "defined in a top level group" do
         it "replaces the implicit subject in that group" do
           group = ExampleGroup.describe(Array)

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
+  hash: 3
   prerelease: false
   segments: 
   - 2
-  - 2
-  - 1
-  version: 2.2.1
+  - 3
+  - 0
+  version: 2.3.0
 platform: ruby
 authors: 
 - Chad Humphries
@@ -15,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-28 00:00:00 -06:00
+date: 2010-12-12 00:00:00 -06:00
 default_executable: rspec
 dependencies: []
 
@@ -31,6 +32,7 @@ extra_rdoc_files:
 files: 
 - .document
 - .gitignore
+- .rspec
 - Gemfile
 - Guardfile
 - History.markdown
@@ -38,7 +40,6 @@ files:
 - README.md
 - Rakefile
 - Upgrade.markdown
-- autotest/discover.rb
 - bin/autospec
 - bin/rspec
 - cucumber.yml
@@ -55,6 +56,7 @@ files:
 - features/configuration/read_options_from_file.feature
 - features/example_groups/basic_structure.feature
 - features/example_groups/shared_example_group.feature
+- features/expectation_framework_integration/configure_expectation_framework.feature
 - features/filtering/exclusion_filters.feature
 - features/filtering/implicit_filters.feature
 - features/filtering/inclusion_filters.feature
@@ -63,6 +65,7 @@ files:
 - features/hooks/around_hooks.feature
 - features/hooks/before_and_after_hooks.feature
 - features/metadata/described_class.feature
+- features/mock_framework_integration/use_any_framework.feature
 - features/mock_framework_integration/use_flexmock.feature
 - features/mock_framework_integration/use_mocha.feature
 - features/mock_framework_integration/use_rr.feature
@@ -75,6 +78,7 @@ files:
 - features/subject/implicit_receiver.feature
 - features/subject/implicit_subject.feature
 - features/support/env.rb
+- lib/autotest/discover.rb
 - lib/autotest/rspec2.rb
 - lib/rspec/autorun.rb
 - lib/rspec/core.rb
@@ -89,6 +93,7 @@ files:
 - lib/rspec/core/example.rb
 - lib/rspec/core/example_group.rb
 - lib/rspec/core/expecting/with_rspec.rb
+- lib/rspec/core/expecting/with_stdlib.rb
 - lib/rspec/core/extensions.rb
 - lib/rspec/core/extensions/instance_eval_with_args.rb
 - lib/rspec/core/extensions/kernel.rb
@@ -117,6 +122,7 @@ files:
 - lib/rspec/core/reporter.rb
 - lib/rspec/core/ruby_project.rb
 - lib/rspec/core/runner.rb
+- lib/rspec/core/shared_context.rb
 - lib/rspec/core/shared_example_group.rb
 - lib/rspec/core/subject.rb
 - lib/rspec/core/version.rb
@@ -125,6 +131,7 @@ files:
 - lib/rspec/monkey/spork/test_framework/rspec.rb
 - rspec-core.gemspec
 - script/console
+- spec/autotest/discover_spec.rb
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
 - spec/rspec/core/command_line_configuration_spec.rb
@@ -171,6 +178,7 @@ files:
 - spec/rspec/core/resources/utf8_encoded.rb
 - spec/rspec/core/ruby_project_spec.rb
 - spec/rspec/core/runner_spec.rb
+- spec/rspec/core/shared_context_spec.rb
 - spec/rspec/core/shared_example_group_spec.rb
 - spec/rspec/core/subject_spec.rb
 - spec/rspec/core/world_spec.rb
@@ -185,7 +193,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-core-2.2.1
+    Thank you for installing rspec-core-2.3.0
   
     Please be sure to look at the upgrade instructions to see what might have
     changed since the last release:
@@ -203,7 +211,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1903527801491701524
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -212,7 +220,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1903527801491701524
+      hash: 3
       segments: 
       - 0
       version: "0"
@@ -222,7 +230,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.2.1
+summary: rspec-core-2.3.0
 test_files: 
 - features/README.markdown
 - features/command_line/configure.feature
@@ -237,6 +245,7 @@ test_files:
 - features/configuration/read_options_from_file.feature
 - features/example_groups/basic_structure.feature
 - features/example_groups/shared_example_group.feature
+- features/expectation_framework_integration/configure_expectation_framework.feature
 - features/filtering/exclusion_filters.feature
 - features/filtering/implicit_filters.feature
 - features/filtering/inclusion_filters.feature
@@ -245,6 +254,7 @@ test_files:
 - features/hooks/around_hooks.feature
 - features/hooks/before_and_after_hooks.feature
 - features/metadata/described_class.feature
+- features/mock_framework_integration/use_any_framework.feature
 - features/mock_framework_integration/use_flexmock.feature
 - features/mock_framework_integration/use_mocha.feature
 - features/mock_framework_integration/use_rr.feature
@@ -257,6 +267,7 @@ test_files:
 - features/subject/implicit_receiver.feature
 - features/subject/implicit_subject.feature
 - features/support/env.rb
+- spec/autotest/discover_spec.rb
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
 - spec/rspec/core/command_line_configuration_spec.rb
@@ -303,6 +314,7 @@ test_files:
 - spec/rspec/core/resources/utf8_encoded.rb
 - spec/rspec/core/ruby_project_spec.rb
 - spec/rspec/core/runner_spec.rb
+- spec/rspec/core/shared_context_spec.rb
 - spec/rspec/core/shared_example_group_spec.rb
 - spec/rspec/core/subject_spec.rb
 - spec/rspec/core/world_spec.rb

data/autotest/discover.rb

@@ -1,2 +0,0 @@
-Autotest.add_discovery { "rspec2" }
-