rspec-core 2.11.1 → 2.12.0

data/features/mock_framework_integration/use_flexmock.feature

@@ -4,7 +4,7 @@ Feature: mock with flexmock
 
   Scenario: passing message expectation
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :flexmock
       end
@@ -22,7 +22,7 @@ Feature: mock with flexmock
 
   Scenario: failing message expecation
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :flexmock
       end
@@ -39,7 +39,7 @@ Feature: mock with flexmock
 
   Scenario: failing message expectation in pending block (remains pending)
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :flexmock
       end
@@ -59,7 +59,7 @@ Feature: mock with flexmock
 
   Scenario: passing message expectation in pending block (fails)
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :flexmock
       end
@@ -81,7 +81,7 @@ Feature: mock with flexmock
 
   Scenario: accessing RSpec.configuration.mock_framework.framework_name 
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :flexmock
       end

data/features/mock_framework_integration/use_mocha.feature

@@ -4,7 +4,7 @@ Feature: mock with mocha
 
   Scenario: passing message expectation
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :mocha
       end
@@ -22,7 +22,7 @@ Feature: mock with mocha
 
   Scenario: failing message expecation
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :mocha
       end
@@ -39,7 +39,7 @@ Feature: mock with mocha
 
   Scenario: failing message expectation in pending block (remains pending)
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :mocha
       end
@@ -59,7 +59,7 @@ Feature: mock with mocha
 
   Scenario: passing message expectation in pending block (fails)
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :mocha
       end
@@ -81,7 +81,7 @@ Feature: mock with mocha
 
   Scenario: accessing RSpec.configuration.mock_framework.framework_name 
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :mocha
       end

data/features/mock_framework_integration/use_rr.feature

@@ -4,7 +4,7 @@ Feature: mock with rr
 
   Scenario: passing message expectation
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :rr
       end
@@ -22,7 +22,7 @@ Feature: mock with rr
 
   Scenario: failing message expecation
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :rr
       end
@@ -39,7 +39,7 @@ Feature: mock with rr
 
   Scenario: failing message expectation in pending block (remains pending)
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :rr
       end
@@ -59,7 +59,7 @@ Feature: mock with rr
 
   Scenario: passing message expectation in pending block (fails)
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :rr
       end
@@ -81,7 +81,7 @@ Feature: mock with rr
 
   Scenario: accessing RSpec.configuration.mock_framework.framework_name 
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :rr
       end

data/features/mock_framework_integration/use_rspec.feature

@@ -5,7 +5,7 @@ Feature: mock with rspec
 
   Scenario: passing message expectation
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :rspec
       end
@@ -23,7 +23,7 @@ Feature: mock with rspec
 
   Scenario: failing message expecation
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :rspec
       end
@@ -40,7 +40,7 @@ Feature: mock with rspec
 
   Scenario: failing message expectation in pending block (remains pending)
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :rspec
       end
@@ -60,7 +60,7 @@ Feature: mock with rspec
 
   Scenario: passing message expectation in pending block (fails)
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :rspec
       end
@@ -82,7 +82,7 @@ Feature: mock with rspec
 
   Scenario: accessing RSpec.configuration.mock_framework.framework_name 
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       RSpec.configure do |config|
         config.mock_framework = :rspec
       end

data/features/pending/pending_examples.feature

@@ -5,7 +5,7 @@ Feature: pending examples
 
   Scenario: pending implementation
     Given a file named "example_without_block_spec.rb" with:
-      """
+      """ruby
       describe "an example" do
         it "is a pending example"
       end
@@ -16,9 +16,9 @@ Feature: pending examples
     And the output should contain "Not yet implemented"
     And the output should contain "example_without_block_spec.rb:2"
 
-  Scenario: pending any arbitary reason, with no block
+  Scenario: pending any arbitrary reason, with no block
     Given a file named "pending_without_block_spec.rb" with:
-      """
+      """ruby
       describe "an example" do
         it "is implemented but waiting" do
           pending("something else getting finished")
@@ -37,9 +37,9 @@ Feature: pending examples
           # ./pending_without_block_spec.rb:2
       """
 
-  Scenario: pending any arbitary reason, with a block that fails
+  Scenario: pending any arbitrary reason, with a block that fails
     Given a file named "pending_with_failing_block_spec.rb" with:
-      """
+      """ruby
       describe "an example" do
         it "is implemented but waiting" do
           pending("something else getting finished") do
@@ -59,9 +59,9 @@ Feature: pending examples
           # ./pending_with_failing_block_spec.rb:2
       """
 
-  Scenario: pending any arbitary reason, with a block that passes
+  Scenario: pending any arbitrary reason, with a block that passes
     Given a file named "pending_with_passing_block_spec.rb" with:
-      """
+      """ruby
       describe "an example" do
         it "is implemented but waiting" do
           pending("something else getting finished") do
@@ -79,7 +79,7 @@ Feature: pending examples
 
   Scenario: temporarily pending by prefixing `it`, `specify`, or `example` with an x
     Given a file named "temporarily_pending_spec.rb" with:
-      """
+      """ruby
       describe "an example" do
         xit "is pending using xit" do
         end
@@ -110,7 +110,7 @@ Feature: pending examples
 
   Scenario: example with no docstring and pending method using documentation formatter
     Given a file named "pending_with_no_docstring_spec.rb" with:
-      """
+      """ruby
       describe "an example" do
         it "checks something" do
           (3+4).should eq(7)
@@ -132,7 +132,7 @@ Feature: pending examples
 
   Scenario: pending with no docstring using documentation formatter
     Given a file named "pending_with_no_docstring_spec.rb" with:
-      """
+      """ruby
       describe "an example" do
         it "checks something" do
           (3+4).should eq(7)
@@ -154,7 +154,7 @@ Feature: pending examples
 
   Scenario: conditionally pending examples
     Given a file named "conditionally_pending_spec.rb" with:
-      """
+      """ruby
       describe "a failing spec" do
         def run_test; raise "failure"; end
 

data/features/spec_files/arbitrary_file_suffix.feature

@@ -2,7 +2,7 @@ Feature: arbitrary file suffix
 
   Scenario: .spec
     Given a file named "a.spec" with:
-      """
+      """ruby
       describe "something" do
         it "does something" do
           3.should eq(3)

data/features/step_definitions/additional_cli_steps.rb

@@ -1,3 +1,5 @@
+require 'rspec/core'  # to fix annoying "undefined method `configuration' for RSpec:Module (NoMethodError)"
+
 Then /^the output should contain all of these:$/ do |table|
   table.raw.flatten.each do |string|
     assert_partial_output(string, all_output)

data/features/subject/attribute_of_subject.feature

@@ -23,7 +23,7 @@ Feature: attribute of subject
 
   Scenario: specify value of an attribute
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       describe Array do
         context "when first created" do
           its(:size) { should eq(0) }
@@ -41,7 +41,7 @@ Feature: attribute of subject
 
   Scenario: specify value of a nested attribute
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       class Person
         attr_reader :phone_numbers
         def initialize
@@ -72,7 +72,7 @@ Feature: attribute of subject
 
   Scenario: specify value of an attribute of a hash
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       describe Hash do
         context "with two items" do
           subject do
@@ -88,7 +88,7 @@ Feature: attribute of subject
 
   Scenario: specify value for key in a hash
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       describe Hash do
         context "with keys :one and 'two'" do
           subject do
@@ -105,7 +105,7 @@ Feature: attribute of subject
 
   Scenario: specify value for key in a hash-like object
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       require 'matrix'
 
       describe Matrix do

data/features/subject/explicit_subject.feature

@@ -9,7 +9,7 @@ Feature: explicit subject
 
   Scenario: subject in top level group
     Given a file named "top_level_subject_spec.rb" with:
-      """
+      """ruby
       describe Array, "with some elements" do
         subject { [1,2,3] }
         it "should have the prescribed elements" do
@@ -22,7 +22,7 @@ Feature: explicit subject
 
   Scenario: subject in a nested group
     Given a file named "nested_subject_spec.rb" with:
-      """
+      """ruby
       describe Array do
         subject { [1,2,3] }
         describe "with some elements" do
@@ -37,7 +37,7 @@ Feature: explicit subject
 
   Scenario: access subject from before block
     Given a file named "top_level_subject_spec.rb" with:
-      """
+      """ruby
       describe Array, "with some elements" do
         subject { [] }
         before { subject.push(1,2,3) }
@@ -51,7 +51,7 @@ Feature: explicit subject
 
   Scenario: invoke helper method from subject block
     Given a file named "helper_subject_spec.rb" with:
-      """
+      """ruby
       describe Array do
         def prepared_array; [1,2,3] end
         subject { prepared_array }
@@ -67,7 +67,7 @@ Feature: explicit subject
 
   Scenario: subject block is invoked at most once per example
     Given a file named "nil_subject_spec.rb" with:
-      """
+      """ruby
       describe Array do
         describe "#[]" do
           context "with index out of bounds" do

data/features/subject/implicit_receiver.feature

@@ -5,7 +5,7 @@ Feature: implicit receiver
 
   Scenario: implicit subject
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       describe Array do
         describe "when first created" do
           it { should be_empty }
@@ -17,7 +17,7 @@ Feature: implicit receiver
 
   Scenario: explicit subject
     Given a file named "example_spec.rb" with:
-      """
+      """ruby
       describe Array do
         describe "with 3 items" do
           subject { [1,2,3] }

data/features/subject/implicit_subject.feature

@@ -9,7 +9,7 @@ Feature: implicitly defined subject
   
   Scenario: subject exposed in top level group
     Given a file named "top_level_subject_spec.rb" with:
-      """
+      """ruby
       describe Array do
         it "should be empty when first created" do
           subject.should be_empty
@@ -21,7 +21,7 @@ Feature: implicitly defined subject
 
   Scenario: subject in a nested group
     Given a file named "nested_subject_spec.rb" with:
-      """
+      """ruby
       describe Array do
         describe "when first created" do
           it "should be empty" do
@@ -35,7 +35,7 @@ Feature: implicitly defined subject
 
   Scenario: subject in a nested group with a different class (outermost wins)
     Given a file named "nested_subject_spec.rb" with:
-      """
+      """ruby
       class ArrayWithOneElement < Array
         def initialize(*)
           super

data/lib/autotest/rspec2.rb

@@ -47,7 +47,7 @@ class Autotest::Rspec2 < Autotest
   # Overrides Autotest's implementation to generate the rspec command to run
   def make_test_cmd(files_to_test)
     files_to_test.empty? ? '' :
-      "#{prefix}#{ruby}#{suffix} -S '#{RSPEC_EXECUTABLE}' --tty #{normalize(files_to_test).keys.flatten.map { |f| "'#{f}'"}.join(' ')}"
+      "#{prefix}'#{ruby}'#{suffix} -S '#{RSPEC_EXECUTABLE}' --tty #{normalize(files_to_test).keys.flatten.map { |f| "'#{f}'"}.join(' ')}"
   end
 
   # Generates a map of filenames to Arrays for Autotest

data/lib/rspec/core.rb

@@ -1,43 +1,45 @@
-if defined?(require_relative)
-  # @private
-  def require_rspec(path)
+require_rspec = if defined?(require_relative)
+  lambda do |path|
     require_relative path
   end
 else
-  # @private
-  def require_rspec(path)
+  lambda do |path|
     require "rspec/#{path}"
   end
 end
 
 require 'set'
 require 'rbconfig'
-require_rspec 'core/filter_manager'
-require_rspec 'core/dsl'
-require_rspec 'core/extensions'
-require_rspec 'core/load_path'
-require_rspec 'core/deprecation'
-require_rspec 'core/backward_compatibility'
-require_rspec 'core/reporter'
-
-require_rspec 'core/metadata_hash_builder'
-require_rspec 'core/hooks'
-require_rspec 'core/subject'
-require_rspec 'core/let'
-require_rspec 'core/metadata'
-require_rspec 'core/pending'
-
-require_rspec 'core/world'
-require_rspec 'core/configuration'
-require_rspec 'core/project_initializer'
-require_rspec 'core/option_parser'
-require_rspec 'core/configuration_options'
-require_rspec 'core/command_line'
-require_rspec 'core/runner'
-require_rspec 'core/example'
-require_rspec 'core/shared_example_group'
-require_rspec 'core/example_group'
-require_rspec 'core/version'
+require_rspec['core/filter_manager']
+require_rspec['core/dsl']
+require_rspec['core/extensions/kernel']
+require_rspec['core/extensions/instance_eval_with_args']
+require_rspec['core/extensions/module_eval_with_args']
+require_rspec['core/extensions/ordered']
+require_rspec['core/load_path']
+require_rspec['core/deprecation']
+require_rspec['core/backward_compatibility']
+require_rspec['core/reporter']
+
+require_rspec['core/metadata_hash_builder']
+require_rspec['core/hooks']
+require_rspec['core/subject']
+require_rspec['core/let']
+require_rspec['core/metadata']
+require_rspec['core/pending']
+require_rspec['core/formatters']
+
+require_rspec['core/world']
+require_rspec['core/configuration']
+require_rspec['core/project_initializer']
+require_rspec['core/option_parser']
+require_rspec['core/configuration_options']
+require_rspec['core/command_line']
+require_rspec['core/runner']
+require_rspec['core/example']
+require_rspec['core/shared_example_group']
+require_rspec['core/example_group']
+require_rspec['core/version']
 
 module RSpec
   autoload :SharedContext, 'rspec/core/shared_context'
@@ -77,6 +79,20 @@ module RSpec
   # @see RSpec.configure
   # @see Core::Configuration
   def self.configuration
+    if block_given?
+      RSpec.warn_deprecation <<-WARNING
+
+*****************************************************************
+DEPRECATION WARNING
+
+* RSpec.configuration with a block is deprecated and has no effect.
+* please use RSpec.configure with a block instead.
+
+Called from #{caller(0)[1]}
+*****************************************************************
+
+WARNING
+    end
     @configuration ||= RSpec::Core::Configuration.new
   end
 
@@ -104,6 +120,11 @@ module RSpec
   end
 
   module Core
+    # @private
+    # This avoids issues with reporting time caused by examples that
+    # change the value/meaning of Time.now without properly restoring
+    # it.
+    Time = ::Time.dup
   end
 
   def self.const_missing(name)
@@ -123,4 +144,4 @@ module RSpec
   end
 end
 
-require_rspec 'core/backward_compatibility'
+require_rspec['core/backward_compatibility']