rspec-core 2.8.0 → 2.9.0.rc2

data/README.md

@@ -32,7 +32,7 @@ describe Order do
 end
 ```
 
-The `describe` method creates an [ExampleGroup](../RSpec/Core/ExampleGroup).  Within the
+The `describe` method creates an [ExampleGroup](http://rubydoc.info/gems/rspec-core/RSpec/Core/ExampleGroup).  Within the
 block passed to `describe` you can declare examples using the `it` method.
 
 Under the hood, an example group is a class in which the block passed to

data/features/mock_framework_integration/use_flexmock.feature

@@ -9,7 +9,7 @@ Feature: mock with flexmock
         config.mock_framework = :flexmock
       end
 
-      describe "mocking with RSpec" do
+      describe "mocking with Flexmock" do
         it "passes when it should" do
           receiver = flexmock('receiver')
           receiver.should_receive(:message).once
@@ -27,7 +27,7 @@ Feature: mock with flexmock
         config.mock_framework = :flexmock
       end
 
-      describe "mocking with RSpec" do
+      describe "mocking with Flexmock" do
         it "fails when it should" do
           receiver = flexmock('receiver')
           receiver.should_receive(:message).once

data/features/step_definitions/additional_cli_steps.rb

@@ -11,8 +11,8 @@ Then /^the output should not contain any of these:$/ do |table|
 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}
+  step %q{the output should contain "0 failures"}
+  step %q{the exit status should be 0}
 end
 
 Then /^the file "([^"]*)" should contain:$/ do |file, partial_content|

data/features/subject/attribute_of_subject.feature

@@ -1,10 +1,12 @@
 Feature: attribute of subject
 
-  Use the its() method as a short-hand to generate a nested example group with
+  WARNING: `its` will be extracted from rspec-core-3.0 into its own gem.
+
+  Use the `its` method as a short-hand to generate a nested example group with
   a single example that specifies the expected value of an attribute of the
   subject.  This can be used with an implicit or explicit subject.
 
-  its() accepts a symbol or a string, and a block representing the example.
+  `its` accepts a symbol or a string, and a block representing the example.
 
       its(:size)    { should eq(1) }
       its("length") { should eq(1) }

data/features/subject/explicit_subject.feature

@@ -1,7 +1,11 @@
 Feature: explicit subject
 
-  Use subject() in the group scope to explicitly define the value that is
-  returned by the subject() method in the example scope.
+  Use `subject` in the group scope to explicitly define the value that is
+  returned by the `subject` method in the example scope.
+
+  Note that while the examples below demonstrate how `subject` can be used as a
+  user-facing concept, we recommend that you reserve it for support of custom
+  matchers and/or extension libraries that hide its use from examples.
 
   Scenario: subject in top level group
     Given a file named "top_level_subject_spec.rb" with:

data/features/subject/implicit_receiver.feature

@@ -1,6 +1,6 @@
 Feature: implicit receiver
 
-  When should() is called in an example without an explicit receiver, it is
+  When `should` is called in an example without an explicit receiver, it is
   invoked against the subject (explicit or implicit).
 
   Scenario: implicit subject

data/features/subject/implicit_subject.feature

@@ -1,14 +1,18 @@
-Feature: implicit subject
+Feature: implicitly defined subject
 
   If the first argument to the outermost example group is a class, an instance
-  of that class is exposed to each example via the subject() method.
+  of that class is exposed to each example via the `subject` method.
+
+  While the examples below demonstrate how `subject` can be used as a
+  user-facing concept, we recommend that you reserve it for support of custom
+  matchers and/or extension libraries that hide its use from examples.
   
-  Scenario: subject in top level group
+  Scenario: subject exposed in top level group
     Given a file named "top_level_subject_spec.rb" with:
       """
-      describe Array, "when first created" do
-        it "should be empty" do
-          subject.should eq([])
+      describe Array do
+        it "should be empty when first created" do
+          subject.should be_empty
         end
       end
       """
@@ -21,7 +25,36 @@ Feature: implicit subject
       describe Array do
         describe "when first created" do
           it "should be empty" do
-            subject.should eq([])
+            subject.should be_empty
+          end
+        end
+      end
+      """
+    When I run `rspec nested_subject_spec.rb`
+    Then the examples should all pass
+
+  Scenario: subject in a nested group with a different class (outermost wins)
+    Given a file named "nested_subject_spec.rb" with:
+      """
+      class ArrayWithOneElement < Array
+        def initialize(*)
+          super
+          unshift "first element"
+        end
+      end
+
+      describe Array do
+        describe ArrayWithOneElement do
+          context "referenced as subject" do
+            it "should be empty (because it is the Array declared at the top)" do
+              subject.should be_empty
+            end
+          end
+
+          context "created in the example" do
+            it "should not be empty" do
+              ArrayWithOneElement.new.should_not be_empty
+            end
           end
         end
       end

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

@@ -10,6 +10,7 @@ else
   end
 end
 
+require 'set'
 require_rspec 'core/filter_manager'
 require_rspec 'core/dsl'
 require_rspec 'core/extensions'
@@ -104,4 +105,3 @@ module RSpec
 end
 
 require_rspec 'core/backward_compatibility'
-require_rspec 'monkey'

data/lib/rspec/core/configuration.rb

@@ -534,10 +534,26 @@ EOM
       # or config files (e.g. `.rspec`).
       #
       # @example
-      #     filter_run_including :x => 'y'
+      #     # given this declaration
+      #     describe "something", :foo => 'bar' do
+      #       # ...
+      #     end
+      #
+      #     # any of the following will include that group
+      #     config.filter_run_including :foo => 'bar'
+      #     config.filter_run_including :foo => /^ba/
+      #     config.filter_run_including :foo => lambda {|v| v == 'bar'}
+      #     config.filter_run_including :foo => lambda {|v,m| m[:foo] == 'bar'}
+      #
+      #     # given a proc with an arity of 1, the lambda is passed the value related to the key, e.g.
+      #     config.filter_run_including :foo => lambda {|v| v == 'bar'}
+      #
+      #     # given a proc with an arity of 2, the lambda is passed the value related to the key,
+      #     # and the metadata itself e.g.
+      #     config.filter_run_including :foo => lambda {|v,m| m[:foo] == 'bar'}
       #
       #     # with treat_symbols_as_metadata_keys_with_true_values = true
-      #     filter_run_including :foo # results in {:foo => true}
+      #     filter_run_including :foo # same as filter_run_including :foo => true
       def filter_run_including(*args)
         filter_manager.include_with_low_priority build_metadata_hash_from(args)
       end
@@ -576,10 +592,26 @@ EOM
       # or config files (e.g. `.rspec`).
       #
       # @example
-      #     filter_run_excluding :x => 'y'
+      #     # given this declaration
+      #     describe "something", :foo => 'bar' do
+      #       # ...
+      #     end
+      #
+      #     # any of the following will exclude that group
+      #     config.filter_run_excluding :foo => 'bar'
+      #     config.filter_run_excluding :foo => /^ba/
+      #     config.filter_run_excluding :foo => lambda {|v| v == 'bar'}
+      #     config.filter_run_excluding :foo => lambda {|v,m| m[:foo] == 'bar'}
+      #
+      #     # given a proc with an arity of 1, the lambda is passed the value related to the key, e.g.
+      #     config.filter_run_excluding :foo => lambda {|v| v == 'bar'}
+      #
+      #     # given a proc with an arity of 2, the lambda is passed the value related to the key,
+      #     # and the metadata itself e.g.
+      #     config.filter_run_excluding :foo => lambda {|v,m| m[:foo] == 'bar'}
       #
       #     # with treat_symbols_as_metadata_keys_with_true_values = true
-      #     filter_run_excluding :foo # results in {:foo => true}
+      #     filter_run_excluding :foo # same as filter_run_excluding :foo => true
       def filter_run_excluding(*args)
         filter_manager.exclude_with_low_priority build_metadata_hash_from(args)
       end
@@ -677,7 +709,23 @@ EOM
       def configure_group(group)
         include_or_extend_modules.each do |include_or_extend, mod, filters|
           next unless filters.empty? || group.any_apply?(filters)
-          group.send(include_or_extend, mod)
+          send("safe_#{include_or_extend}", mod, group)
+        end
+      end
+
+      # @private
+      def safe_include(mod, host)
+        host.send(:include,mod) unless host < mod
+      end
+
+      # @private
+      if RUBY_VERSION.to_f >= 1.9
+        def safe_extend(mod, host)
+          host.extend(mod) unless (class << host; self; end) < mod
+        end
+      else
+        def safe_extend(mod, host)
+          host.extend(mod) unless (class << host; self; end).included_modules.include?(mod)
         end
       end
 

data/lib/rspec/core/configuration_options.rb

@@ -33,12 +33,15 @@ module RSpec
       end
 
       def filter_manager
-        @filter_manager ||= FilterManager.new
+        @filter_manager ||= RSpec::configuration.filter_manager
       end
 
     private
 
-      NON_FORCED_OPTIONS = [:debug, :requires, :libs, :files_or_directories_to_run, :line_numbers, :full_description]
+      NON_FORCED_OPTIONS = [
+        :debug, :requires, :libs, :profile, :drb, :files_or_directories_to_run,
+        :line_numbers, :full_description, :full_backtrace, :tty
+      ].to_set
 
       def force?(key)
         !NON_FORCED_OPTIONS.include?(key)

data/lib/rspec/core/drb_options.rb

@@ -52,9 +52,11 @@ module RSpec::Core
       end
     end
 
+    CONDITIONAL_FILTERS = [:if, :unless]
+
     def add_filter(argv, name, hash)
       hash.each_pair do |k, v|
-        next if [:if,:unless].include?(k)
+        next if CONDITIONAL_FILTERS.include?(k)
         tag = name == :inclusion ? k.to_s : "~#{k}"
         tag << ":#{v}" if v.is_a?(String)
         argv << "--tag" << tag

data/lib/rspec/core/filter_manager.rb

@@ -67,7 +67,7 @@ module RSpec
     # @see Configuration#filter_run_excluding
     class FilterManager
       DEFAULT_EXCLUSIONS = {
-        :if     => lambda { |value, metadata| metadata.has_key?(:if) && !value },
+        :if     => lambda { |value| !value },
         :unless => lambda { |value| value }
       }
 

data/lib/rspec/core/formatters/base_text_formatter.rb

@@ -35,7 +35,7 @@ module RSpec
           super(duration, example_count, failure_count, pending_count)
           # Don't print out profiled info if there are failures, it just clutters the output
           dump_profile if profile_examples? && failure_count == 0
-          output.puts "\nFinished in #{format_seconds(duration)} seconds\n"
+          output.puts "\nFinished in #{format_duration(duration)}\n"
           output.puts colorise_summary(summary_line(example_count, failure_count, pending_count))
           dump_commands_to_rerun_failed_examples
         end
@@ -142,10 +142,6 @@ module RSpec
 
       private
 
-        def pluralize(count, string)
-          "#{count} #{string}#{'s' unless count == 1}"
-        end
-
         def format_caller(caller_info)
           backtrace_line(caller_info.to_s.split(':in `block').first)
         end

data/lib/rspec/core/formatters/documentation_formatter.rb

@@ -3,9 +3,7 @@ require 'rspec/core/formatters/base_text_formatter'
 module RSpec
   module Core
     module Formatters
-
       class DocumentationFormatter < BaseTextFormatter
-
         def initialize(output)
           super(output)
           @group_level = 0
@@ -15,7 +13,7 @@ module RSpec
           super(example_group)
 
           output.puts if @group_level == 0
-          output.puts "#{current_indentation}#{example_group.description}"
+          output.puts "#{current_indentation}#{example_group.description.strip}"
 
           @group_level += 1
         end
@@ -40,7 +38,7 @@ module RSpec
         end
 
         def failure_output(example, exception)
-          red("#{current_indentation}#{example.description} (FAILED - #{next_failure_index})")
+          red("#{current_indentation}#{example.description.strip} (FAILED - #{next_failure_index})")
         end
 
         def next_failure_index
@@ -49,11 +47,11 @@ module RSpec
         end
 
         def passed_output(example)
-          green("#{current_indentation}#{example.description}")
+          green("#{current_indentation}#{example.description.strip}")
         end
 
         def pending_output(example, message)
-          yellow("#{current_indentation}#{example.description} (PENDING: #{message})")
+          yellow("#{current_indentation}#{example.description.strip} (PENDING: #{message})")
         end
 
         def current_indentation
@@ -63,9 +61,7 @@ module RSpec
         def example_group_chain
           example_group.ancestors.reverse
         end
-
       end
-
     end
   end
 end

data/lib/rspec/core/formatters/helpers.rb

@@ -6,6 +6,17 @@ module RSpec
         SUB_SECOND_PRECISION = 5
         DEFAULT_PRECISION = 2
 
+        def format_duration(duration)
+          if duration > 60
+            minutes = duration.to_i / 60
+            seconds = duration - minutes * 60
+
+            "#{pluralize(minutes, 'minute')} #{format_seconds(seconds)} seconds"
+          else
+            "#{format_seconds(duration)} seconds"
+          end
+        end
+
         def format_seconds(float)
           precision ||= (float < 1) ? SUB_SECOND_PRECISION : DEFAULT_PRECISION
           formatted = sprintf("%.#{precision}f", float)
@@ -17,6 +28,10 @@ module RSpec
           stripped.empty? ? "0" : stripped
         end
 
+        def pluralize(count, string)
+          "#{count} #{string}#{'s' unless count == 1}"
+        end
+
       end
 
     end

data/lib/rspec/core/hooks.rb

@@ -398,8 +398,10 @@ module RSpec
 
     private
 
+      SCOPES = [:each, :all, :suite]
+
       def scope_and_options_from(*args)
-        scope = if [:each, :all, :suite].include?(args.first)
+        scope = if SCOPES.include?(args.first)
           args.shift
         elsif args.any? { |a| a.is_a?(Symbol) }
           raise ArgumentError.new("You must explicitly give a scope (:each, :all, or :suite) when using symbols as metadata for a hook.")

data/lib/rspec/core/metadata.rb

@@ -102,8 +102,8 @@ module RSpec
 
         def described_class
           container_stack.each do |g|
-            return g[:describes]       if g.has_key?(:describes)
             return g[:described_class] if g.has_key?(:described_class)
+            return g[:describes]       if g.has_key?(:describes)
           end
 
           container_stack.reverse.each do |g|
@@ -174,20 +174,15 @@ module RSpec
         return metadata.location_filter_applies?(value)          if key == :locations
         return metadata.filters_apply?(key, value)               if Hash === value
 
+        return false unless metadata.has_key?(key)
+
         case value
         when Regexp
           metadata[key] =~ value
         when Proc
-          if value.arity == 2
-            # Pass the metadata hash to allow the proc to check if it even has the key.
-            # This is necessary for the implicit :if exclusion filter:
-            #   {            } # => run the example
-            #   { :if => nil } # => exclude the example
-            # The value of metadata[:if] is the same in these two cases but
-            # they need to be treated differently.
-            value.call(metadata[key], metadata) rescue false
-          else
-            value.call(metadata[key]) rescue false
+          case value.arity
+          when 1 then value.call(metadata[key])
+          when 2 then value.call(metadata[key], metadata)
           end
         else
           metadata[key].to_s == value.to_s

data/lib/rspec/core/runner.rb

@@ -7,7 +7,7 @@ module RSpec
       # Register an at_exit hook that runs the suite.
       def self.autorun
         return if autorun_disabled? || installed_at_exit? || running_in_drb?
-        at_exit { exit run(ARGV, $stderr, $stdout).to_i }
+        at_exit { exit run(ARGV, $stderr, $stdout).to_i unless $! }
         @installed_at_exit = true
       end
       AT_EXIT_HOOK_BACKTRACE_LINE = "#{__FILE__}:#{__LINE__ - 2}:in `autorun'"
@@ -60,27 +60,17 @@ module RSpec
 
         if options.options[:drb]
           begin
-            run_over_drb(options, err, out)
+            DRbCommandLine.new(options).run(err, out)
           rescue DRb::DRbConnError
             err.puts "No DRb server is running. Running in local process instead ..."
-            run_in_process(options, err, out)
+            CommandLine.new(options).run(err, out)
           end
         else
-          run_in_process(options, err, out)
+          CommandLine.new(options).run(err, out)
         end
       ensure
         RSpec.reset
       end
-
-      def self.run_over_drb(options, err, out)
-        DRbCommandLine.new(options).run(err, out)
-      end
-
-      def self.run_in_process(options, err, out)
-        CommandLine.new(options, RSpec::configuration, RSpec::world).run(err, out)
-      end
-
     end
-
   end
 end