rspec-core 2.8.0 → 2.9.0

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

data/lib/rspec/core/subject.rb

@@ -67,6 +67,16 @@ module RSpec
           end
         rescue LoadError
         end
+
+        def _attribute_chain(attribute)
+          attribute.to_s.split('.')
+        end
+
+        def _nested_attribute(subject, attribute)
+          _attribute_chain(attribute).inject(subject) do |subject, attr|
+            subject.send(attr)
+          end
+        end
       end
 
       module ExampleGroupMethods
@@ -122,13 +132,11 @@ module RSpec
             example do
               self.class.class_eval do
                 define_method(:subject) do
-                  @_subject ||= if attribute.is_a?(Array)
-                                  super()[*attribute]
-                                else
-                                  attribute.to_s.split('.').inject(super()) do |target, method|
-                                    target.send(method)
-                                  end
-                                end
+                  if defined?(@_subject)
+                    @_subject
+                  else
+                    @_subject = Array === attribute ? super()[*attribute] : _nested_attribute(super(), attribute)
+                  end
                 end
               end
               instance_eval(&block)

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec
   module Core
     module Version
-      STRING = '2.8.0'
+      STRING = '2.9.0'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -4,12 +4,13 @@ module RSpec
 
       include RSpec::Core::Hooks
 
-      attr_reader :example_groups, :filtered_examples, :wants_to_quit
-      attr_writer :wants_to_quit
+      attr_reader :example_groups, :shared_example_groups, :filtered_examples
+      attr_accessor :wants_to_quit
 
       def initialize(configuration=RSpec.configuration)
         @configuration = configuration
         @example_groups = [].extend(Extensions::Ordered)
+        @shared_example_groups = {}
         @filtered_examples = Hash.new { |hash,group|
           hash[group] = begin
             examples = group.examples.dup
@@ -22,6 +23,7 @@ module RSpec
 
       def reset
         example_groups.clear
+        shared_example_groups.clear
       end
 
       def filter_manager
@@ -45,12 +47,10 @@ module RSpec
         @configuration.configure_group(group)
       end
 
-      def shared_example_groups
-        @shared_example_groups ||= {}
-      end
-
       def example_count
-        example_groups.collect {|g| g.descendants}.flatten.inject(0) { |sum, g| sum += g.filtered_examples.size }
+        example_groups.collect {|g| g.descendants}.flatten.inject(0) do |sum, g|
+          sum += g.filtered_examples.size
+        end
       end
 
       def preceding_declaration_line(filter_line)

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/spec/autotest/rspec_spec.rb

@@ -30,7 +30,7 @@ describe Autotest::Rspec2 do
 
     it "makes the appropriate test command" do
       actual_command = rspec_autotest.make_test_cmd(@files_to_test)
-      expected_command = /#{ruby_cmd}.*#{spec_cmd} (.*)/
+      expected_command = /#{ruby_cmd}.*'#{spec_cmd}' (.*)/
 
       actual_command.should match(expected_command)
 

data/spec/rspec/core/configuration_options_spec.rb

@@ -74,13 +74,9 @@ describe RSpec::Core::ConfigurationOptions do
       ["--pattern", "foo/bar", :pattern, "foo/bar"],
       ["--failure-exit-code", "37", :failure_exit_code, 37],
       ["--default_path", "behavior", :default_path, "behavior"],
-      ["--drb", nil, :drb, true],
       ["--order", "rand", :order, "rand"],
       ["--seed", "37", :order, "rand:37"],
-      ["--drb-port", "37", :drb_port, 37],
-      ["--backtrace", nil, :full_backtrace, true],
-      ["--profile", nil, :profile_examples, true],
-      ["--tty", nil, :tty, true]
+      ["--drb-port", "37", :drb_port, 37]
     ].each do |cli_option, cli_value, config_key, config_value|
       it "forces #{config_key}" do
         opts = config_options_object(*[cli_option, cli_value].compact)
@@ -305,6 +301,13 @@ describe RSpec::Core::ConfigurationOptions do
     end
   end
 
+  describe "#filter_manager" do
+    it "returns the same object as RSpec::configuration.filter_manager" do
+      config_options_object.filter_manager.
+        should be(RSpec::configuration.filter_manager)
+    end
+  end
+
   describe "sources: ~/.rspec, ./.rspec, custom, CLI, and SPEC_OPTS" do
     before(:each) do
       FileUtils.mkpath(File.expand_path("~"))

data/spec/rspec/core/configuration_spec.rb

@@ -713,20 +713,16 @@ module RSpec::Core
       end
 
       describe "the default :if filter" do
-        it "does not exclude a spec with no :if metadata" do
-          config.exclusion_filter[:if].call(nil, {}).should be_false
+        it "does not exclude a spec with  { :if => true } metadata" do
+          config.exclusion_filter[:if].call(true).should be_false
         end
 
-        it "does not exclude a spec with { :if => true } metadata" do
-          config.exclusion_filter[:if].call(true, {:if => true}).should be_false
+        it "excludes a spec with  { :if => false } metadata" do
+          config.exclusion_filter[:if].call(false).should be_true
         end
 
-        it "excludes a spec with { :if => false } metadata" do
-          config.exclusion_filter[:if].call(false, {:if => false}).should be_true
-        end
-
-        it "excludes a spec with { :if => nil } metadata" do
-          config.exclusion_filter[:if].call(false, {:if => nil}).should be_true
+        it "excludes a spec with  { :if => nil } metadata" do
+          config.exclusion_filter[:if].call(nil).should be_true
         end
       end
 
@@ -1005,6 +1001,38 @@ module RSpec::Core
         group.included_modules.should include(mod1)
         group.included_modules.should include(mod2)
       end
+
+      module IncludeOrExtendMeOnce
+        def self.included(host)
+          raise "included again" if host.instance_methods.include?(:foobar)
+          host.class_eval { def foobar; end }
+        end
+
+        def self.extended(host)
+          raise "extended again" if host.respond_to?(:foobar)
+          def host.foobar; end
+        end
+      end
+
+      it "doesn't include a module when already included in ancestor" do
+        config.include(IncludeOrExtendMeOnce, :foo => :bar)
+
+        group = ExampleGroup.describe("group", :foo => :bar)
+        child = group.describe("child")
+
+        config.configure_group(group)
+        config.configure_group(child)
+      end
+
+      it "doesn't extend when ancestor is already extended with same module" do
+        config.extend(IncludeOrExtendMeOnce, :foo => :bar)
+
+        group = ExampleGroup.describe("group", :foo => :bar)
+        child = group.describe("child")
+
+        config.configure_group(group)
+        config.configure_group(child)
+      end
     end
 
     describe "#alias_example_to" do

data/spec/rspec/core/example_group_spec.rb

@@ -293,6 +293,22 @@ module RSpec::Core
             group.run.should be_true
           end
         end
+
+        context "and metadata redefinition after `described_class` call" do
+          it "is the redefined level constant" do
+            group = ExampleGroup.describe(String) do
+              described_class
+              metadata[:example_group][:described_class] = Object
+              describe :symbol do
+                example "described_class is Object" do
+                  described_class.should eq(Object)
+                end
+              end
+            end
+
+            group.run.should be_true
+          end
+        end
       end
 
       context "in a nested group" do

data/spec/rspec/core/formatters/documentation_formatter_spec.rb

@@ -28,7 +28,6 @@ module RSpec::Core::Formatters
     end
 
     it "represents nested group using hierarchy tree" do
-
       output = StringIO.new
       RSpec.configuration.stub(:color_enabled?) { false }
 
@@ -60,6 +59,29 @@ root
   context 2
     nested example 2.1
     nested example 2.2
+")
+    end
+
+    it "strips whitespace for each row" do
+      output = StringIO.new
+      RSpec.configuration.stub(:color_enabled?) { false }
+
+      formatter = RSpec::Core::Formatters::DocumentationFormatter.new(output)
+
+      group = RSpec::Core::ExampleGroup.describe(" root ")
+      context1 = group.describe(" nested ")
+      context1.example(" example 1 ") {}
+      context1.example(" example 2 ", :pending => true){}
+      context1.example(" example 3 ") { fail }
+
+      group.run(RSpec::Core::Reporter.new(formatter))
+
+      output.string.should eql("
+root
+  nested
+    example 1
+    example 2 (PENDING: No reason given)
+    example 3 (FAILED - 1)
 ")
     end
   end

data/spec/rspec/core/formatters/helpers_spec.rb

@@ -4,6 +4,26 @@ require 'rspec/core/formatters/helpers'
 describe RSpec::Core::Formatters::Helpers do
   let(:helper) { Object.new.extend(RSpec::Core::Formatters::Helpers) }
 
+  describe "format duration" do
+    context '> 60 and < 120' do
+      it "returns 'x minute xx seconds' formatted string" do
+        helper.format_duration(70.14).should eq("1 minute 10.14 seconds")
+      end
+    end
+
+    context '> 120' do
+      it "returns 'x minutes xx seconds' formatted string" do
+        helper.format_duration(135.14).should eq("2 minutes 15.14 seconds")
+      end
+    end
+
+    context '< 60' do
+      it "returns 'xx seconds' formatted string" do
+        helper.format_duration(45.5).should eq("45.5 seconds")
+      end
+    end
+  end
+
   describe "format seconds" do
     context "sub second times" do
       it "returns 5 digits of precision" do

data/spec/rspec/core/metadata_spec.rb

@@ -126,10 +126,9 @@ module RSpec
           example_metadata.filter_applies?(:if, lambda { |v| !v }).should be_false
         end
 
-        it "passes the metadata hash as the second argument if a given proc expects 2 args" do
-          passed_metadata = nil
-          example_metadata.filter_applies?(:if, lambda { |v, m| passed_metadata = m })
-          passed_metadata.should eq(example_metadata)
+        it "matches a proc with an arity of 2" do
+          example_metadata[:foo] = nil
+          example_metadata.filter_applies?(:foo, lambda { |v, m| m == example_metadata }).should be_true
         end
 
         context "with an Array" do

data/spec/rspec/core/shared_example_group_spec.rb

@@ -2,7 +2,7 @@ require 'spec_helper'
 
 module RSpec::Core
   describe SharedExampleGroup do
-    
+
     ExampleModule = Module.new
     ExampleClass = Class.new
 
@@ -19,7 +19,7 @@ module RSpec::Core
             group.send(method_name, 'shared group') {}
           end.should raise_error(ArgumentError, "Shared example group 'shared group' already exists")
         end
-        
+
         ["name", :name, ExampleModule, ExampleClass].each do |object|
           type = object.class.name.downcase
           context "given a #{type}" do