rspec-core 2.6.4 → 2.7.0.rc1

data/features/helper_methods/let.feature

@@ -15,12 +15,12 @@ Feature: let and let!
         let(:count) { $count += 1 }
 
         it "memoizes the value" do
-          count.should == 1
-          count.should == 1
+          count.should eq(1)
+          count.should eq(1)
         end
 
         it "is not cached across examples" do
-          count.should == 2
+          count.should eq(2)
         end
       end
       """
@@ -42,7 +42,7 @@ Feature: let and let!
         it "calls the helper method in a before hook" do
           invocation_order << :example
           invocation_order.should == [:let!, :example]
-          count.should == 1
+          count.should eq(1)
         end
       end
       """

data/features/hooks/around_hooks.feature

@@ -259,7 +259,7 @@ Feature: around hooks
 
         it "they should all be run" do
           puts "in the example"
-          1.should == 1
+          1.should eq(1)
         end
       end
       """

data/features/hooks/before_and_after_hooks.feature

@@ -187,12 +187,12 @@ Feature: before and after hooks
       describe "stuff in before blocks" do
         describe "with :all" do
           it "should be available in the example" do
-            @before_all.should == "before all"
+            @before_all.should eq("before all")
           end
         end
         describe "with :each" do
           it "should be available in the example" do
-            @before_each.should == "before each"
+            @before_each.should eq("before each")
           end
         end
       end
@@ -363,7 +363,7 @@ Feature: before and after hooks
 
         describe "nested in parallel" do
           it "access state set in before(:all)" do
-            @value.should == 123
+            @value.should eq(123)
           end
         end
       end

data/features/hooks/filtering.feature

@@ -1,12 +1,19 @@
 Feature: filters
 
-  `before`/`after`/`around` hooks defined in the RSpec configuration block can
-  be filtered using metadata.  Arbitrary metadata can be applied to an example
-  or example group, and used to make a hook only apply to examples with the
-  given metadata.
+  `before`, `after`, and `around` hooks defined in the block passed to
+  `RSpec.configure` can be constrained to specific examples and/or groups using
+  metadata as a filter.
 
-  If you set the `treat_symbols_as_metadata_keys_with_true_values` config option
-  to `true`, you can specify metadata using only symbols.
+      RSpec.configure do |c|
+        c.before(:each, :type => :model) do
+        end
+      end
+
+      describe "something", :type => :model do
+      end
+
+  You can specify metadata using only symbols if you set the
+  `treat_symbols_as_metadata_keys_with_true_values` config option to `true`.
 
   Scenario: filter `before(:each)` hooks using arbitrary metadata
     Given a file named "filter_before_each_hooks_spec.rb" with:

data/features/metadata/user_defined.feature

@@ -12,9 +12,11 @@ Feature: User-defined metadata
   behavior in RSpec 3) that allows you to specify metadata using just
   symbols:
 
-    RSpec.configure do |c|
-      c.treat_symbols_as_metadata_keys_with_true_values = true
-    end
+  ```ruby
+  RSpec.configure do |c|
+    c.treat_symbols_as_metadata_keys_with_true_values = true
+  end
+  ```
 
   Each symbol passed as an argument to `describe`, `context` or `it` will
   be a key in the metadata hash, with a corresponding value of `true`.
@@ -24,7 +26,7 @@ Feature: User-defined metadata
       """
       describe "a group with user-defined metadata", :foo => 17 do
         it 'has access to the metadata in the example' do
-          example.metadata[:foo].should == 17
+          example.metadata[:foo].should eq(17)
         end
 
         it 'does not have access to metadata defined on sub-groups' do
@@ -33,11 +35,11 @@ Feature: User-defined metadata
 
         describe 'a sub-group with user-defined metadata', :bar => 12 do
           it 'has access to the sub-group metadata' do
-            example.metadata[:foo].should == 17
+            example.metadata[:foo].should eq(17)
           end
 
           it 'also has access to metadata defined on parent groups' do
-            example.metadata[:bar].should == 12
+            example.metadata[:bar].should eq(12)
           end
         end
       end
@@ -50,13 +52,13 @@ Feature: User-defined metadata
       """
       describe "a group with no user-defined metadata" do
         it 'has an example with metadata', :foo => 17 do
-          example.metadata[:foo].should == 17
+          example.metadata[:foo].should eq(17)
           example.metadata.should_not include(:bar)
         end
 
         it 'has another example with metadata', :bar => 12, :bazz => 33 do
-          example.metadata[:bar].should == 12
-          example.metadata[:bazz].should == 33
+          example.metadata[:bar].should eq(12)
+          example.metadata[:bazz].should eq(33)
           example.metadata.should_not include(:foo)
         end
       end
@@ -99,7 +101,7 @@ Feature: User-defined metadata
         end
 
         it 'can still use a hash for metadata' do
-          example.metadata[:bug].should == 73
+          example.metadata[:bug].should eq(73)
         end
 
         it 'can define simple metadata on an example', :special do

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.rb

@@ -1,3 +1,4 @@
+$rspec_start_time ||= Time.now
 require 'rspec/core/dsl'
 require 'rspec/core/extensions'
 require 'rspec/core/load_path'
@@ -27,8 +28,6 @@ require 'rspec/core/example_group'
 require 'rspec/core/version'
 require 'rspec/core/errors'
 
-require 'rspec/autorun' if $0.split(File::SEPARATOR).last == 'rcov'
-
 module RSpec
   autoload :Matchers, 'rspec/matchers'
 
@@ -75,7 +74,6 @@ module RSpec
   #   config.format = 'documentation'
   # end
   def self.configure
-    warn_about_deprecated_configure if RSpec.world.example_groups.any?
     yield configuration if block_given?
   end
 
@@ -83,26 +81,6 @@ module RSpec
   def self.clear_remaining_example_groups
     world.example_groups.clear
   end
-
-  private
-
-    def self.warn_about_deprecated_configure
-      warn <<-NOTICE
-
-*****************************************************************
-DEPRECATION WARNING: you are using deprecated behaviour that will
-be removed from RSpec 3.
-
-You have set some configuration options after an example group has
-already been defined.  In RSpec 3, this will not be allowed.  All
-configuration should happen before the first example group is
-defined.  The configuration is happening at:
-
-  #{caller[1]}
-*****************************************************************
-
-NOTICE
-    end
 end
 
 require 'rspec/core/backward_compatibility'

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,10 +381,12 @@ 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
@@ -360,6 +398,7 @@ EOM
       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
@@ -369,7 +408,7 @@ EOM
 
         options = build_metadata_hash_from(args)
 
-        if 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
@@ -400,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
@@ -422,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
@@ -475,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