rspec-core 2.6.0 → 2.7.0.rc1

data/features/pending/pending_examples.feature

@@ -77,22 +77,35 @@ Feature: pending examples
     And the output should contain "Expected pending 'something else getting finished' to fail. No Error was raised."
     And the output should contain "pending_with_passing_block_spec.rb:3"
 
-  Scenario: temporarily pending by changing "it" to "xit"
-    Given a file named "pending_with_xit_spec.rb" with:
+  Scenario: temporarily pending by prefixing `it`, `specify`, or `example` with an x
+    Given a file named "temporarily_pending_spec.rb" with:
       """
       describe "an example" do
         xit "is pending using xit" do
-          true.should be(true)
+        end
+
+        xspecify "is pending using xspecify" do
+        end
+
+        xexample "is pending using xexample" do
         end
       end
       """
-    When I run `rspec pending_with_xit_spec.rb`
+    When I run `rspec temporarily_pending_spec.rb`
     Then the exit status should be 0
-    And the output should contain "1 example, 0 failures, 1 pending"
+    And the output should contain "3 examples, 0 failures, 3 pending"
     And the output should contain:
       """
       Pending:
         an example is pending using xit
+          # Not Yet Implemented
+          # ./temporarily_pending_spec.rb:2
+        an example is pending using xspecify
+          # Not Yet Implemented
+          # ./temporarily_pending_spec.rb:5
+        an example is pending using xexample
+          # Not Yet Implemented
+          # ./temporarily_pending_spec.rb:8
       """
 
   Scenario: example with no docstring and pending method using documentation formatter
@@ -100,7 +113,7 @@ Feature: pending examples
       """
       describe "an example" do
         it "checks something" do
-          (3+4).should == 7
+          (3+4).should eq(7)
         end
         specify do
           pending
@@ -122,10 +135,10 @@ Feature: pending examples
       """
       describe "an example" do
         it "checks something" do
-          (3+4).should == 7
+          (3+4).should eq(7)
         end
         pending do
-          "string".reverse.should == "gnirts"
+          "string".reverse.should eq("gnirts")
         end
       end
       """

data/features/step_definitions/additional_cli_steps.rb

@@ -1,6 +1,6 @@
 Then /^the output should contain all of these:$/ do |table|
   table.raw.flatten.each do |string|
-    assert_partial_output(string)
+    assert_partial_output(string, all_output)
   end
 end
 

data/features/subject/attribute_of_subject.feature

@@ -34,7 +34,7 @@ Feature: attribute of subject
       Array
         when first created
           size
-            should == 0
+            should eq 0
       """
 
   Scenario: specify value of a nested attribute
@@ -65,7 +65,7 @@ Feature: attribute of subject
       Person
         with one phone number (555-1212)
           phone_numbers.first
-            should == 555-1212
+            should eq 555-1212
       """
 
   Scenario: specify value of an attribute of a hash

data/features/support/env.rb

@@ -1,6 +1,5 @@
 require 'aruba/cucumber'
 
 Before do
-  @aruba_timeout_seconds = 3
+  RUBY_PLATFORM =~ /java/ ? @aruba_timeout_seconds = 60 : @aruba_timeout_seconds = 5
 end
-

data/lib/rspec/core/backward_compatibility.rb

@@ -13,7 +13,7 @@ be removed from a future version of RSpec.
 
 * #{name} is deprecated.
 * RSpec is the new top-level module in RSpec-2
-***************************************************************
+*****************************************************************
 WARNING
           RSpec
         else

data/lib/rspec/core/configuration.rb

@@ -6,6 +6,8 @@ module RSpec
     class Configuration
       include RSpec::Core::Hooks
 
+      class MustBeConfiguredBeforeExampleGroupsError < StandardError; end
+
       def self.add_setting(name, opts={})
         if opts[:alias]
           alias_method name, opts[:alias]
@@ -38,6 +40,8 @@ module RSpec
       add_setting :tty
       add_setting :treat_symbols_as_metadata_keys_with_true_values, :default => false
       add_setting :expecting_with_rspec
+      add_setting :default_path, :default => 'spec'
+      add_setting :show_failures_in_pending_blocks, :default => false
 
       CONDITIONAL_FILTERS = {
         :if     => lambda { |value, metadata| metadata.has_key?(:if) && !value },
@@ -46,6 +50,7 @@ module RSpec
 
       DEFAULT_BACKTRACE_PATTERNS = [
         /\/lib\d*\/ruby\//,
+        /org\/jruby\//,
         /bin\//,
         /gems/,
         /spec\/spec_helper\.rb/,
@@ -62,6 +67,7 @@ module RSpec
 
       def reset
         @reporter = nil
+        @formatters.clear if @formatters
       end
 
       # :call-seq:
@@ -158,6 +164,7 @@ module RSpec
       #   teardown_mocks_for_rspec
       #     - called after verify_mocks_for_rspec (even if there are errors)
       def mock_framework=(framework)
+        assert_no_example_groups_defined(:mock_framework)
         case framework
         when Module
           settings[:mock_framework] = framework
@@ -198,6 +205,7 @@ module RSpec
       # Given :stdlib, configures test/unit/assertions
       # Given both, configures both
       def expect_with(*frameworks)
+        assert_no_example_groups_defined(:expect_with)
         settings[:expectation_frameworks] = []
         frameworks.each do |framework|
           case framework
@@ -252,22 +260,34 @@ module RSpec
         begin
           require 'ruby-debug'
           Debugger.start
-        rescue LoadError
+        rescue LoadError => e
           raise <<-EOM
 
 #{'*'*50}
-You must install ruby-debug to run rspec with the --debug option.
+#{e.message}
+
+If you have it installed as a ruby gem, then you need to either require
+'rubygems' or configure the RUBYOPT environment variable with the value
+'rubygems'.
 
-If you have ruby-debug installed as a ruby gem, then you need to either
-require 'rubygems' or configure the RUBYOPT environment variable with
-the value 'rubygems'.
+#{e.backtrace.join("\n")}
 #{'*'*50}
 EOM
         end
       end
 
-      def line_number=(line_number)
-        filter_run({ :line_number => line_number.to_i }, true)
+      # Run examples defined on +line_numbers+ in all files to run.
+      def line_numbers=(line_numbers)
+        filter_run({ :line_numbers => line_numbers.map{|l| l.to_i} }, true)
+      end
+
+      def add_location(file_path, line_numbers)
+        # Filter locations is a hash of expanded paths to arrays of line numbers
+        # to match against.
+        #
+        filter_locations = ((self.filter || {})[:locations] ||= {})
+        (filter_locations[File.expand_path(file_path)] ||= []).push(*line_numbers)
+        filter_run({ :locations => filter_locations })
       end
 
       def full_description=(description)
@@ -297,15 +317,31 @@ EOM
       end
 
       def files_or_directories_to_run=(*files)
-        self.files_to_run = files.flatten.collect do |file|
+        files = files.flatten
+        files << default_path if command == 'rspec' && default_path && files.empty?
+        self.files_to_run = get_files_to_run(files)
+      end
+
+      def command
+        $0.split(File::SEPARATOR).last
+      end
+
+      def get_files_to_run(files)
+        patterns = pattern.split(",")
+        files.map do |file|
           if File.directory?(file)
-            pattern.split(",").collect do |pattern|
-              Dir["#{file}/#{pattern.strip}"]
+            patterns.map do |pattern|
+              if pattern =~ /^#{file}/
+                Dir[pattern.strip]
+              else
+                Dir["#{file}/{#{pattern.strip}}"]
+              end
             end
           else
-            if file =~ /(\:(\d+))$/
-              self.line_number = $2
-              file.sub($1,'')
+            if file =~ /^(.*?)((?:\:\d+)+)$/
+              path, lines = $1, $2[1..-1].split(":").map{|n| n.to_i}
+              add_location path, lines
+              path
             else
               file
             end
@@ -345,14 +381,24 @@ EOM
         RSpec::Core::ExampleGroup.alias_it_should_behave_like_to(new_name, report_label)
       end
 
+      undef_method :exclusion_filter=
       def exclusion_filter=(filter)
         settings[:exclusion_filter] = filter
       end
 
+      undef_method :exclusion_filter
+      def exclusion_filter
+        settings[:exclusion_filter] || {}
+      end
+
       def inclusion_filter=(filter)
         settings[:inclusion_filter] = filter
       end
 
+      def inclusion_filter
+        settings[:inclusion_filter] || {}
+      end
+
       def filter_run_including(*args)
         force_overwrite = if args.last.is_a?(Hash) || args.last.is_a?(Symbol)
           false
@@ -362,7 +408,7 @@ EOM
 
         options = build_metadata_hash_from(args)
 
-        if inclusion_filter and inclusion_filter[:line_number] || inclusion_filter[:full_description]
+        if inclusion_filter and inclusion_filter[:line_numbers] || inclusion_filter[:full_description]
           warn "Filtering by #{options.inspect} is not possible since " \
                "you are already filtering by #{inclusion_filter.inspect}"
         else
@@ -393,7 +439,7 @@ EOM
 
       def configure_group(group)
         include_or_extend_modules.each do |include_or_extend, mod, filters|
-          next unless filters.empty? || group.apply?(:any?, filters)
+          next unless filters.empty? || group.any_apply?(filters)
           group.send(include_or_extend, mod)
         end
       end
@@ -415,6 +461,15 @@ EOM
 
     private
 
+      def assert_no_example_groups_defined(config_option)
+        if RSpec.world.example_groups.any?
+          raise MustBeConfiguredBeforeExampleGroupsError.new(
+            "RSpec's #{config_option} configuration option must be configured before " +
+            "any example groups are defined, but you have already defined a group."
+          )
+        end
+      end
+
       def raise_if_rspec_1_is_loaded
         if defined?(Spec) && defined?(Spec::VERSION::MAJOR) && Spec::VERSION::MAJOR == 1
           raise <<-MESSAGE
@@ -468,7 +523,7 @@ MESSAGE
           end
         end
       end
-
+      
       def string_const?(str)
         str.is_a?(String) && /\A[A-Z][a-zA-Z0-9_:]*\z/ =~ str
       end

data/lib/rspec/core/configuration_options.rb

@@ -2,9 +2,6 @@ module RSpec
   module Core
 
     class ConfigurationOptions
-      LOCAL_OPTIONS_FILE  = ".rspec"
-      GLOBAL_OPTIONS_FILE = File.join(File.expand_path("~"), ".rspec")
-
       attr_reader :options
 
       def initialize(args)
@@ -12,18 +9,17 @@ module RSpec
       end
 
       def configure(config)
-        keys = options.keys
-        keys.unshift(:requires) if keys.delete(:requires)
-        keys.unshift(:libs)     if keys.delete(:libs)
+        keys = order(options.keys, :libs, :requires, :default_path, :pattern)
+
         formatters = options[:formatters] if keys.delete(:formatters)
+
+        config.exclusion_filter.merge! options[:exclusion_filter] if keys.delete(:exclusion_filter)
+
         keys.each do |key|
           config.send("#{key}=", options[key]) if config.respond_to?("#{key}=")
         end
-        if formatters
-          formatters.each do |pair|
-            config.add_formatter(*pair)
-          end
-        end
+
+        formatters.each {|pair| config.add_formatter(*pair) } if formatters
       end
 
       def drb_argv
@@ -33,14 +29,27 @@ module RSpec
         argv << "--backtrace"    if options[:full_backtrace]
         argv << "--tty"          if options[:tty]
         argv << "--fail-fast"    if options[:fail_fast]
-        argv << "--line_number"  << options[:line_number]             if options[:line_number]
         argv << "--options"      << options[:custom_options_file]     if options[:custom_options_file]
-        argv << "--example"      << options[:full_description].source if options[:full_description]
+        if options[:full_description]
+          # The argument to --example is regexp-escaped before being stuffed
+          # into a regexp when received for the first time (see OptionParser).
+          # Hence, merely grabbing the source of this regexp will retain the
+          # backslashes, so we must remove them.
+          argv << "--example" << options[:full_description].source.delete('\\')
+        end
+        if options[:line_numbers]
+          argv += options[:line_numbers].inject([]){|a,l| a << "--line_number" << l}
+        end
         if options[:filter]
           options[:filter].each_pair do |k, v|
             argv << "--tag" << k.to_s
           end
         end
+        if options[:exclusion_filter]
+          options[:exclusion_filter].each_pair do |k, v|
+            argv << "--tag" << "~#{k.to_s}"
+          end
+        end
         if options[:formatters]
           options[:formatters].each do |pair|
             argv << "--format" << pair[0]
@@ -62,6 +71,13 @@ module RSpec
 
     private
 
+      def order(keys, *ordered)
+        ordered.reverse.each do |key|
+          keys.unshift(key) if keys.delete(key)
+        end
+        keys
+      end
+
       def file_options
         custom_options_file ? custom_options : global_options.merge(local_options)
       end
@@ -79,11 +95,11 @@ module RSpec
       end
 
       def local_options
-        @local_options ||= options_from(LOCAL_OPTIONS_FILE)
+        @local_options ||= options_from(local_options_file)
       end
 
       def global_options
-        @global_options ||= options_from(GLOBAL_OPTIONS_FILE)
+        @global_options ||= options_from(global_options_file)
       end
 
       def options_from(path)
@@ -91,7 +107,7 @@ module RSpec
       end
 
       def args_from_options_file(path)
-        return [] unless File.exist?(path)
+        return [] unless path && File.exist?(path)
         config_string = options_file_as_erb_string(path)
         config_string.split(/\n+/).map {|l| l.split}.flatten
       end
@@ -104,6 +120,20 @@ module RSpec
       def custom_options_file
         command_line_options[:custom_options_file]
       end
+
+      def local_options_file
+        ".rspec"
+      end
+
+      def global_options_file
+        begin
+          File.join(File.expand_path("~"), ".rspec")
+        rescue ArgumentError
+          warn "Unable to find ~/.rspec because the HOME environment variable is not set"
+          nil
+        end
+      end
+
     end
   end
 end

data/lib/rspec/core/{extensions/object.rb → dsl.rb}

@@ -1,6 +1,6 @@
 module RSpec
   module Core
-    module ObjectExtensions
+    module DSL
       def describe(*args, &example_group_block)
         RSpec::Core::ExampleGroup.describe(*args, &example_group_block).register
       end
@@ -8,6 +8,4 @@ module RSpec
   end
 end
 
-class Object
-  include RSpec::Core::ObjectExtensions
-end
+include RSpec::Core::DSL

data/lib/rspec/core/example.rb

@@ -4,6 +4,10 @@ module RSpec
 
       attr_reader :metadata, :options, :example_group_instance
 
+      # Returns the first exception raised, if any, in the context of running
+      # this example.
+      attr_reader :exception
+
       def self.delegate_to_metadata(*keys)
         keys.each do |key|
           define_method(key) {@metadata[key]}
@@ -23,13 +27,12 @@ module RSpec
         @example_group_class
       end
 
-      def around_hooks
+      def around_hooks # :nodoc:
         @around_hooks ||= example_group.around_hooks_for(self)
       end
 
-      def apply?(predicate, filters)
-        @metadata.apply?(predicate, filters) ||
-        @example_group_class.apply?(predicate, filters)
+      def all_apply?(filters)
+        @metadata.all_apply?(filters) || @example_group_class.all_apply?(filters)
       end
 
       alias_method :pending?, :pending
@@ -106,7 +109,7 @@ module RSpec
         if around_hooks.empty?
           yield
         else
-          @example_group_class.eval_around_eachs(self, Example.procsy(metadata, &block)).call
+          @example_group_class.run_around_each_hooks(self, Example.procsy(metadata, &block)).call
         end
       end
 
@@ -142,11 +145,11 @@ module RSpec
 
       def run_before_each
         @example_group_instance.setup_mocks_for_rspec if @example_group_instance.respond_to?(:setup_mocks_for_rspec)
-        @example_group_class.eval_before_eachs(self)
+        @example_group_class.run_before_each_hooks(self)
       end
 
       def run_after_each
-        @example_group_class.eval_after_eachs(self)
+        @example_group_class.run_after_each_hooks(self)
         @example_group_instance.verify_mocks_for_rspec if @example_group_instance.respond_to?(:verify_mocks_for_rspec)
       ensure
         @example_group_instance.teardown_mocks_for_rspec if @example_group_instance.respond_to?(:teardown_mocks_for_rspec)

data/lib/rspec/core/example_group.rb

@@ -60,16 +60,20 @@ module RSpec
 
       alias_example_to :it
       alias_example_to :specify
-      alias_example_to :focused, :focused => true, :focus => true
-      alias_example_to :focus,   :focused => true, :focus => true
-      alias_example_to :pending, :pending => true
-      alias_example_to :xit,     :pending => true
+
+      alias_example_to :pending,  :pending => true
+      alias_example_to :xexample, :pending => true
+      alias_example_to :xit,      :pending => true
+      alias_example_to :xspecify, :pending => true
+
+      alias_example_to :focused,  :focused => true, :focus => true
+      alias_example_to :focus,    :focused => true, :focus => true
 
       def self.define_nested_shared_group_method(new_name, report_label=nil)
         module_eval(<<-END_RUBY, __FILE__, __LINE__)
           def self.#{new_name}(name, *args, &customization_block)
-            shared_block = world.shared_example_groups[name]
-            raise "Could not find shared example group named \#{name.inspect}" unless shared_block
+            shared_block = find_shared("examples", name)
+            raise "Could not find shared examples \#{name.inspect}" unless shared_block
 
             group = describe("#{report_label || "it should behave like"} \#{name}") do
               module_eval_with_args(*args, &shared_block)
@@ -90,11 +94,19 @@ module RSpec
       alias_it_should_behave_like_to :it_behaves_like, "behaves like"
 
       def self.include_context(name)
-        module_eval(&world.shared_example_groups[name])
+        module_eval(&find_shared("context", name))
       end
 
-      class << self
-        alias_method :include_examples, :include_context
+      def self.include_examples(name)
+        module_eval(&find_shared("examples", name))
+      end
+
+      def self.find_shared(label, name)
+        if world.shared_example_groups.has_key?(name)
+          world.shared_example_groups[name]
+        else
+          raise ArgumentError, "Could not find shared #{label} #{name.inspect}"
+        end          
       end
 
       def self.examples
@@ -200,7 +212,7 @@ module RSpec
         ivars.each { |ivar, val| example_group_instance.instance_variable_set(ivar, val) }
       end
 
-      def self.eval_before_alls(example_group_instance)
+      def self.run_before_all_hooks(example_group_instance)
         return if descendant_filtered_examples.empty?
         assign_before_all_ivars(superclass.before_all_ivars, example_group_instance)
         world.run_hook_filtered(:before, :all, self, example_group_instance)
@@ -208,7 +220,7 @@ module RSpec
         store_before_all_ivars(example_group_instance)
       end
 
-      def self.eval_around_eachs(example, initial_procsy)
+      def self.run_around_each_hooks(example, initial_procsy)
         example.around_hooks.reverse.inject(initial_procsy) do |procsy, around_hook|
           Example.procsy(procsy.metadata) do
             example.example_group_instance.instance_eval_with_args(procsy, &around_hook)
@@ -216,17 +228,17 @@ module RSpec
         end
       end
 
-      def self.eval_before_eachs(example)
+      def self.run_before_each_hooks(example)
         world.run_hook_filtered(:before, :each, self, example.example_group_instance, example)
         ancestors.reverse.each { |ancestor| ancestor.run_hook(:before, :each, example.example_group_instance) }
       end
 
-      def self.eval_after_eachs(example)
+      def self.run_after_each_hooks(example)
         ancestors.each { |ancestor| ancestor.run_hook(:after, :each, example.example_group_instance) }
         world.run_hook_filtered(:after, :each, self, example.example_group_instance, example)
       end
 
-      def self.eval_after_alls(example_group_instance)
+      def self.run_after_all_hooks(example_group_instance)
         return if descendant_filtered_examples.empty?
         assign_before_all_ivars(before_all_ivars, example_group_instance)
 
@@ -258,14 +270,14 @@ An error occurred in an after(:all) hook.
         reporter.example_group_started(self)
 
         begin
-          eval_before_alls(new)
+          run_before_all_hooks(new)
           result_for_this_group = run_examples(reporter)
           results_for_descendants = children.map {|child| child.run(reporter)}.all?
           result_for_this_group && results_for_descendants
         rescue Exception => ex
           fail_filtered_examples(ex, reporter)
         ensure
-          eval_after_alls(new)
+          run_after_all_hooks(new)
           before_all_ivars.clear
           reporter.example_group_finished(self)
         end
@@ -297,8 +309,12 @@ An error occurred in an after(:all) hook.
         end.all?
       end
 
-      def self.apply?(predicate, filters)
-        metadata.apply?(predicate, filters)
+      def self.any_apply?(filters)
+        metadata.any_apply?(filters)
+      end
+
+      def self.all_apply?(filters)
+        metadata.all_apply?(filters)
       end
 
       def self.declaration_line_numbers

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

@@ -3,9 +3,7 @@ require 'rspec/expectations'
 module RSpec
   module Core
     module ExpectationFrameworkAdapter
-
       include RSpec::Matchers
-
     end
   end
 end

data/lib/rspec/core/extensions.rb

@@ -1,4 +1,3 @@
-require 'rspec/core/extensions/object'
 require 'rspec/core/extensions/kernel'
 require 'rspec/core/extensions/instance_eval_with_args'
 require 'rspec/core/extensions/module_eval_with_args'

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

@@ -12,6 +12,13 @@ module RSpec
         attr_reader :example_count, :pending_count, :failure_count
         attr_reader :failed_examples, :pending_examples
 
+        def self.relative_path(line)
+          line = line.sub(File.expand_path("."), ".")
+          line = line.sub(/\A([^:]+:\d+)$/, '\\1')
+          return nil if line == '-e:1'
+          line
+        end
+
         def initialize(output)
           @output = output || StringIO.new
           @example_count = @pending_count = @failure_count = 0
@@ -113,10 +120,7 @@ module RSpec
 
         def backtrace_line(line)
           return nil if configuration.cleaned_from_backtrace?(line)
-          line = line.sub(File.expand_path("."), ".")
-          line = line.sub(/\A([^:]+:\d+)$/, '\\1')
-          return nil if line == '-e:1'
-          line
+          self.class.relative_path(line)
         end
 
         def read_failed_line(exception, example)