rspec-core 2.5.2 → 2.6.0.rc2

data/features/mock_framework_integration/use_rspec.feature

@@ -1,23 +1,97 @@
 Feature: mock with rspec
 
-  As an RSpec user who likes to mock
-  I want to be able to use rspec
+  RSpec uses its own mocking framework by default, or you can configure it
+  explicitly.
 
-  Scenario: Mock with rspec
-    Given a file named "rspec_example_spec.rb" with:
+  Scenario: passing message expectation
+    Given a file named "example_spec.rb" with:
       """
       RSpec.configure do |config|
         config.mock_framework = :rspec
       end
 
-      describe "plugging in rspec" do
-        it "allows rspec to be used" do
-          target = mock('target')
-          target.should_receive(:foo)
-          target.foo
+      describe "mocking with RSpec" do
+        it "passes when it should" do
+          receiver = double('receiver')
+          receiver.should_receive(:message)
+          receiver.message
         end
       end
       """
-    When I run "rspec ./rspec_example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the examples should all pass 
+
+  Scenario: failing message expecation
+    Given a file named "example_spec.rb" with:
+      """
+      RSpec.configure do |config|
+        config.mock_framework = :rspec
+      end
+
+      describe "mocking with RSpec" do
+        it "fails when it should" do
+          receiver = double('receiver')
+          receiver.should_receive(:message)
+        end
+      end
+      """
+    When I run `rspec example_spec.rb`
+    Then the output should contain "1 example, 1 failure"
+
+  Scenario: failing message expectation in pending block (remains pending)
+    Given a file named "example_spec.rb" with:
+      """
+      RSpec.configure do |config|
+        config.mock_framework = :rspec
+      end
+
+      describe "failed message expectation in a pending block" do
+        it "is listed as pending" do
+          pending do
+            receiver = double('receiver')
+            receiver.should_receive(:message)
+          end
+        end
+      end
+      """
+    When I run `rspec example_spec.rb`
+    Then the output should contain "1 example, 0 failures, 1 pending"
     And the exit status should be 0
+
+  Scenario: passing message expectation in pending block (fails)
+    Given a file named "example_spec.rb" with:
+      """
+      RSpec.configure do |config|
+        config.mock_framework = :rspec
+      end
+
+      describe "passing message expectation in a pending block" do
+        it "fails with FIXED" do
+          pending do
+            receiver = double('receiver')
+            receiver.should_receive(:message)
+            receiver.message
+          end
+        end
+      end
+      """
+    When I run `rspec example_spec.rb`
+    Then the output should contain "FIXED"
+    Then the output should contain "1 example, 1 failure"
+    And the exit status should be 1
+
+  Scenario: accessing RSpec.configuration.mock_framework.framework_name 
+    Given a file named "example_spec.rb" with:
+      """
+      RSpec.configure do |config|
+        config.mock_framework = :rspec
+      end
+
+      describe "RSpec.configuration.mock_framework.framework_name" do
+        it "returns :rspec" do
+          RSpec.configuration.mock_framework.framework_name.should eq(:rspec)
+        end
+      end
+      """
+    When I run `rspec example_spec.rb`
+    Then the examples should all pass 

data/features/pending/pending_examples.feature

@@ -10,7 +10,7 @@ Feature: pending examples
         it "is a pending example"
       end
       """
-    When I run "rspec example_without_block_spec.rb"
+    When I run `rspec example_without_block_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 "Not Yet Implemented"
@@ -26,7 +26,7 @@ Feature: pending examples
         end
       end
       """
-    When I run "rspec pending_without_block_spec.rb"
+    When I run `rspec pending_without_block_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:
@@ -48,7 +48,7 @@ Feature: pending examples
         end
       end
       """
-    When I run "rspec pending_with_failing_block_spec.rb"
+    When I run `rspec pending_with_failing_block_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:
@@ -70,7 +70,7 @@ Feature: pending examples
         end
       end
       """
-    When I run "rspec pending_with_passing_block_spec.rb"
+    When I run `rspec pending_with_passing_block_spec.rb`
     Then the exit status should not be 0
     And the output should contain "1 example, 1 failure"
     And the output should contain "FIXED"
@@ -86,7 +86,7 @@ Feature: pending examples
         end
       end
       """
-    When I run "rspec pending_with_xit_spec.rb"
+    When I run `rspec pending_with_xit_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:
@@ -107,7 +107,7 @@ Feature: pending examples
         end
       end
       """
-    When I run "rspec pending_with_no_docstring_spec.rb --format documentation"
+    When I run `rspec pending_with_no_docstring_spec.rb --format documentation`
     Then the exit status should be 0
     And the output should contain "2 examples, 0 failures, 1 pending"
     And the output should contain:
@@ -129,7 +129,7 @@ Feature: pending examples
         end
       end
       """
-    When I run "rspec pending_with_no_docstring_spec.rb --format documentation"
+    When I run `rspec pending_with_no_docstring_spec.rb --format documentation`
     Then the exit status should be 0
     And the output should contain "2 examples, 0 failures, 1 pending"
     And the output should contain:
@@ -182,7 +182,7 @@ Feature: pending examples
         end
       end
       """
-    When I run "rspec ./conditionally_pending_spec.rb"
+    When I run `rspec ./conditionally_pending_spec.rb`
     Then the output should contain "8 examples, 4 failures, 2 pending"
     And the output should contain:
       """

data/features/spec_files/arbitrary_file_suffix.feature

@@ -9,5 +9,5 @@ Feature: arbitrary file suffix
         end
       end
       """
-    When I run "rspec a.spec"
+    When I run `rspec a.spec`
     Then the examples should all pass

data/features/step_definitions/additional_cli_steps.rb

@@ -6,7 +6,7 @@ end
 
 Then /^the output should not contain any of these:$/ do |table|
   table.raw.flatten.each do |string|
-    combined_output.should_not =~ compile_and_escape(string)
+    all_output.should_not =~ regexp(string)
   end
 end
 
@@ -18,3 +18,13 @@ end
 Then /^the file "([^"]*)" should contain:$/ do |file, partial_content|
   check_file_content(file, partial_content, true)
 end
+
+Then /^the backtrace\-normalized output should contain:$/ do |partial_output|
+  # ruby 1.9 includes additional stuff in the backtrace,
+  # so we need to normalize it to compare it with our expected output.
+  normalized_output = all_output.split("\n").map do |line|
+    line =~ /(^\s+# [^:]+:\d+)/ ? $1 : line # http://rubular.com/r/zDD7DdWyzF
+  end.join("\n")
+
+  normalized_output.should =~ regexp(partial_output)
+end

data/features/subject/attribute_of_subject.feature

@@ -28,7 +28,7 @@ Feature: attribute of subject
         end
       end
       """
-    When I run "rspec example_spec.rb --format documentation"
+    When I run `rspec example_spec.rb --format documentation`
     Then the output should contain:
       """
       Array
@@ -59,7 +59,7 @@ Feature: attribute of subject
         end
       end
       """
-    When I run "rspec example_spec.rb --format documentation"
+    When I run `rspec example_spec.rb --format documentation`
     Then the output should contain:
       """
       Person
@@ -81,7 +81,7 @@ Feature: attribute of subject
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the examples should all pass
 
   Scenario: specify value for key in a hash
@@ -98,5 +98,25 @@ Feature: attribute of subject
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
+    Then the examples should all pass
+
+  Scenario: specify value for key in a hash-like object
+    Given a file named "example_spec.rb" with:
+      """
+      require 'matrix'
+
+      describe Matrix do
+        context "with values [[1, 2], [3, 4]]" do
+          subject do
+            Matrix[[1, 2], [3, 4]]
+          end
+
+          its([0, 1]) { should eq(2) }
+          its([1, 0]) { should eq(3) }
+          its([1, 2]) { should be_nil }
+        end
+      end
+      """
+    When I run `rspec example_spec.rb`
     Then the examples should all pass

data/features/subject/explicit_subject.feature

@@ -13,7 +13,7 @@ Feature: explicit subject
         end
       end
       """
-    When I run "rspec top_level_subject_spec.rb"
+    When I run `rspec top_level_subject_spec.rb`
     Then the examples should all pass
 
   Scenario: subject in a nested group
@@ -28,7 +28,7 @@ Feature: explicit subject
         end
       end
       """
-    When I run "rspec nested_subject_spec.rb"
+    When I run `rspec nested_subject_spec.rb`
     Then the examples should all pass
 
   Scenario: access subject from before block
@@ -42,7 +42,7 @@ Feature: explicit subject
         end
       end
       """
-    When I run "rspec top_level_subject_spec.rb"
+    When I run `rspec top_level_subject_spec.rb`
     Then the examples should all pass
 
   Scenario: invoke helper method from subject block
@@ -58,7 +58,7 @@ Feature: explicit subject
         end
       end
       """
-    When I run "rspec helper_subject_spec.rb"
+    When I run `rspec helper_subject_spec.rb`
     Then the examples should all pass
 
   Scenario: subject block is invoked at most once per example
@@ -74,5 +74,5 @@ Feature: explicit subject
         end
       end
       """
-    When I run "rspec nil_subject_spec.rb"
+    When I run `rspec nil_subject_spec.rb`
     Then the examples should all pass

data/features/subject/implicit_receiver.feature

@@ -12,7 +12,7 @@ Feature: implicit receiver
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the examples should all pass
 
   Scenario: explicit subject
@@ -25,5 +25,5 @@ Feature: implicit receiver
         end
       end
       """
-    When I run "rspec example_spec.rb"
+    When I run `rspec example_spec.rb`
     Then the examples should all pass

data/features/subject/implicit_subject.feature

@@ -12,7 +12,7 @@ Feature: implicit subject
         end
       end
       """
-    When I run "rspec ./top_level_subject_spec.rb"
+    When I run `rspec ./top_level_subject_spec.rb`
     Then the examples should all pass
 
   Scenario: subject in a nested group
@@ -26,5 +26,5 @@ Feature: implicit subject
         end
       end
       """
-    When I run "rspec nested_subject_spec.rb"
+    When I run `rspec nested_subject_spec.rb`
     Then the examples should all pass

data/features/support/env.rb

@@ -1 +1,6 @@
-require 'aruba'
+require 'aruba/cucumber'
+
+Before do
+  @aruba_timeout_seconds = 3
+end
+

data/lib/rspec/core.rb

@@ -4,6 +4,7 @@ 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'
@@ -53,12 +54,33 @@ module RSpec
   end
 
   def self.configure
+    warn_about_deprecated_configure if RSpec.world.example_groups.any?
     yield configuration if block_given?
   end
 
   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/backward_compatibility.rb

@@ -17,7 +17,12 @@ be removed from a future version of RSpec.
 WARNING
           RSpec
         else
-          super(name)
+          begin
+            super
+          rescue Exception => e
+            e.backtrace.reject! {|l| l =~ Regexp.compile(__FILE__) }
+            raise e
+          end
         end
       end
     end
@@ -38,7 +43,12 @@ WARNING
         require 'rspec/core/rake_task'
         RSpec::Core::RakeTask
       else
-        super(name)
+        begin
+          super
+        rescue Exception => e
+          e.backtrace.reject! {|l| l =~ Regexp.compile(__FILE__) }
+          raise e
+        end
       end
     end
 

data/lib/rspec/core/command_line.rb

@@ -16,10 +16,7 @@ module RSpec
         @configuration.output_stream ||= out
         @options.configure(@configuration)
         @configuration.load_spec_files
-        @configuration.configure_mock_framework
-        @configuration.configure_expectation_framework
-        @world.announce_inclusion_filter
-        @world.announce_exclusion_filter
+        @world.announce_filters
 
         @configuration.reporter.report(@world.example_count) do |reporter|
           begin

data/lib/rspec/core/configuration.rb

@@ -33,6 +33,8 @@ module RSpec
       add_setting :include_or_extend_modules
       add_setting :backtrace_clean_patterns
       add_setting :tty
+      add_setting :treat_symbols_as_metadata_keys_with_true_values, :default => false
+      add_setting :expecting_with_rspec
 
       def initialize
         @color_enabled = false
@@ -46,10 +48,10 @@ module RSpec
           /lib\/rspec\/(core|expectations|matchers|mocks)/
         ]
 
-        filter_run_excluding(
+        self.exclusion_filter = {
           :if     => lambda { |value, metadata| metadata.has_key?(:if) && !value },
           :unless => lambda { |value| value }
-        )
+        }
       end
 
       # :call-seq:
@@ -169,13 +171,11 @@ module RSpec
 
       # Returns the configured expectation framework adapter module(s)
       def expectation_frameworks
-        settings[:expectation_frameworks] ||= begin
-                                               require 'rspec/core/expecting/with_rspec'
-                                               [RSpec::Core::ExpectationFrameworkAdapter]
-                                             end
+        expect_with :rspec unless settings[:expectation_frameworks]
+        settings[:expectation_frameworks]
       end
 
-      # Delegates to expect_with=([framework])
+      # Delegates to expect_with([framework])
       def expectation_framework=(framework)
         expect_with([framework])
       end
@@ -195,6 +195,7 @@ module RSpec
             case framework
             when :rspec
               require 'rspec/core/expecting/with_rspec'
+              self.expecting_with_rspec = true
             when :stdlib
               require 'rspec/core/expecting/with_stdlib'
             else
@@ -304,7 +305,8 @@ EOM
 
       # E.g. alias_example_to :crazy_slow, :speed => 'crazy_slow' defines
       # crazy_slow as an example variant that has the crazy_slow speed option
-      def alias_example_to(new_name, extra_options={})
+      def alias_example_to(new_name, *args)
+        extra_options = build_metadata_hash_from(args)
         RSpec::Core::ExampleGroup.alias_example_to(new_name, extra_options)
       end
 
@@ -333,7 +335,15 @@ EOM
         RSpec::Core::ExampleGroup.alias_it_should_behave_like_to(new_name, report_label)
       end
 
-      def filter_run_including(options={}, force_overwrite = false)
+      def filter_run_including(*args)
+        force_overwrite = if args.last.is_a?(Hash) || args.last.is_a?(Symbol)
+          false
+        else
+          args.pop
+        end
+
+        options = build_metadata_hash_from(args)
+
         if filter and filter[:line_number] || filter[:full_description]
           warn "Filtering by #{options.inspect} is not possible since " \
                "you are already filtering by #{filter.inspect}"
@@ -348,24 +358,22 @@ EOM
 
       alias_method :filter_run, :filter_run_including
 
-      def filter_run_excluding(options={})
+      def filter_run_excluding(*args)
+        options = build_metadata_hash_from(args)
         self.exclusion_filter = (exclusion_filter || {}).merge(options)
       end
 
-      def include(mod, filters={})
+      def include(mod, *args)
+        filters = build_metadata_hash_from(args)
         include_or_extend_modules << [:include, mod, filters]
       end
 
-      def extend(mod, filters={})
+      def extend(mod, *args)
+        filters = build_metadata_hash_from(args)
         include_or_extend_modules << [:extend, mod, filters]
       end
 
       def configure_group(group)
-        modules = {
-          :include => group.included_modules.dup,
-          :extend  => group.ancestors.dup
-        }
-
         include_or_extend_modules.each do |include_or_extend, mod, filters|
           next unless filters.empty? || group.apply?(:any?, filters)
           group.send(include_or_extend, mod)