rspec-core 2.0.1 → 2.1.0

data/features/metadata/described_class.feature

@@ -1,5 +1,8 @@
 Feature: described class
 
+  If the first argument to the outermost example group is a class, the class is
+  exposed to each example via the described_class() method.
+
   Scenario: access the described class from the example
     Given a file named "spec/example_spec.rb" with:
       """

data/features/pending/pending_examples.feature

@@ -138,3 +138,79 @@ Feature: pending examples
         checks something
          (PENDING: Not Yet Implemented)
       """
+
+  Scenario: conditionally pending examples
+    Given a file named "conditionally_pending_spec.rb" with:
+      """
+      describe "a failing spec" do
+        def run_test; raise "failure"; end
+
+        it "is pending when pending with a true :if condition" do
+          pending("true :if", :if => true) { run_test }
+        end
+
+        it "fails when pending with a false :if condition" do
+          pending("false :if", :if => false) { run_test }
+        end
+
+        it "is pending when pending with a false :unless condition" do
+          pending("false :unless", :unless => false) { run_test }
+        end
+
+        it "fails when pending with a true :unless condition" do
+          pending("true :unless", :unless => true) { run_test }
+        end
+      end
+
+      describe "a passing spec" do
+        def run_test; true.should be(true); end
+
+        it "fails when pending with a true :if condition" do
+          pending("true :if", :if => true) { run_test }
+        end
+
+        it "passes when pending with a false :if condition" do
+          pending("false :if", :if => false) { run_test }
+        end
+
+        it "fails when pending with a false :unless condition" do
+          pending("false :unless", :unless => false) { run_test }
+        end
+
+        it "passes when pending with a true :unless condition" do
+          pending("true :unless", :unless => true) { run_test }
+        end
+      end
+      """
+    When I run "rspec ./conditionally_pending_spec.rb"
+    Then the output should contain "8 examples, 4 failures, 2 pending"
+    And the output should contain:
+      """
+      Pending:
+        a failing spec is pending when pending with a true :if condition
+          # true :if
+          # ./conditionally_pending_spec.rb:4
+        a failing spec is pending when pending with a false :unless condition
+          # false :unless
+          # ./conditionally_pending_spec.rb:12
+      """
+    And the output should contain:
+      """
+        1) a failing spec fails when pending with a false :if condition
+           Failure/Error: def run_test; raise "failure"; end
+      """
+    And the output should contain:
+      """
+        2) a failing spec fails when pending with a true :unless condition
+           Failure/Error: def run_test; raise "failure"; end
+      """
+    And the output should contain:
+      """
+        3) a passing spec fails when pending with a true :if condition FIXED
+           Expected pending 'true :if' to fail. No Error was raised.
+      """
+    And the output should contain:
+      """
+        4) a passing spec fails when pending with a false :unless condition FIXED
+           Expected pending 'false :unless' to fail. No Error was raised.
+      """

data/features/step_definitions/additional_cli_steps.rb

@@ -0,0 +1,11 @@
+Then /^the output should contain all of these:$/ do |table|
+  table.raw.flatten.each do |string|
+    assert_partial_output(string)
+  end
+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)
+  end
+end

data/features/subject/attribute_of_subject.feature

@@ -1,5 +1,13 @@
 Feature: attribute of subject
 
+  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. Use
+  a string with dots to specify a nested attribute (i.e. an attribute of the
+  attribute of the subject).
+
   Scenario: simple attribute
     Given a file named "example_spec.rb" with:
       """

data/features/subject/explicit_subject.feature

@@ -1,12 +1,11 @@
 Feature: explicit subject
 
-  You can override the implicit subject using the subject() method.
-  
+  Use subject() in the group scope to explicitly define the value that is
+  returned by the subject() method in the example scope.
+
   Scenario: subject in top level group
     Given a file named "top_level_subject_spec.rb" with:
       """
-      require 'rspec/expectations'
-
       describe Array, "with some elements" do
         subject { [1,2,3] }
         it "should have the prescribed elements" do
@@ -14,14 +13,12 @@ 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 output should contain "1 example, 0 failures"
 
   Scenario: subject in a nested group
     Given a file named "nested_subject_spec.rb" with:
       """
-      require 'rspec/expectations'
-
       describe Array do
         subject { [1,2,3] }
         describe "with some elements" do
@@ -31,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 output should contain "1 example, 0 failures"
 
   Scenario: access subject from before block
@@ -45,14 +42,12 @@ 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 output should contain "1 example, 0 failures"
 
-  Scenario: subject using helper method
+  Scenario: invoke helper method from subject block
     Given a file named "helper_subject_spec.rb" with:
       """
-      require 'rspec/expectations'
-
       describe Array do
         def prepared_array; [1,2,3] end
         subject { prepared_array }
@@ -63,5 +58,5 @@ Feature: explicit subject
         end
       end
       """
-    When I run "rspec ./helper_subject_spec.rb"
+    When I run "rspec helper_subject_spec.rb"
     Then the output should contain "1 example, 0 failures"

data/features/subject/implicit_receiver.feature

@@ -0,0 +1,29 @@
+Feature: implicit receiver
+
+  When should() is called in an example without an explicit receiver, it is
+  invoked against the subject (explicit or implicit).
+
+  Scenario: implicit subject
+    Given a file named "example_spec.rb" with:
+      """
+      describe Array do
+        describe "when first created" do
+          it { should be_empty }
+        end
+      end
+      """
+    When I run "rspec example_spec.rb"
+    Then the output should contain "1 example, 0 failures"
+
+  Scenario: explicit subject
+    Given a file named "example_spec.rb" with:
+      """
+      describe Array do
+        describe "with 3 items" do
+          subject { [1,2,3] }
+          it { should_not be_empty }
+        end
+      end
+      """
+    When I run "rspec example_spec.rb"
+    Then the output should contain "1 example, 0 failures"

data/features/subject/implicit_subject.feature

@@ -1,15 +1,14 @@
 Feature: implicit subject
 
-  The first argument to the outermost example group block is
-  made available to each example as an implicit subject of
-  that example.
-
+  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.
+  
   Scenario: subject 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 == []
+          subject.should eq([])
         end
       end
       """
@@ -22,10 +21,10 @@ Feature: implicit subject
       describe Array do
         describe "when first created" do
           it "should be empty" do
-            subject.should == []
+            subject.should eq([])
           end
         end
       end
       """
-    When I run "rspec ./nested_subject_spec.rb"
+    When I run "rspec nested_subject_spec.rb"
     Then the output should contain "1 example, 0 failures"

data/lib/rspec/core.rb

@@ -1,6 +1,7 @@
 require 'rspec/core/extensions'
 require 'rspec/core/load_path'
 require 'rspec/core/deprecation'
+require 'rspec/core/backward_compatibility'
 require 'rspec/core/reporter'
 
 require 'rspec/core/hooks'
@@ -24,27 +25,12 @@ require 'rspec/core/version'
 require 'rspec/core/errors'
 
 module RSpec
-  module Core
+  autoload :Matchers, 'rspec/matchers'
 
+  module Core
     def self.install_directory
       @install_directory ||= File.expand_path(File.dirname(__FILE__))
     end
-
-    def self.configuration
-      RSpec.deprecate('RSpec::Core.configuration', 'RSpec.configuration', '2.0.0')
-      RSpec.configuration
-    end
-
-    def self.configure
-      RSpec.deprecate('RSpec::Core.configure', 'RSpec.configure', '2.0.0')
-      yield RSpec.configuration if block_given?
-    end
-
-    def self.world
-      RSpec.deprecate('RSpec::Core.world', 'RSpec.world', '2.0.0')
-      RSpec.world
-    end
-
   end
 
   def self.wants_to_quit
@@ -73,8 +59,4 @@ module RSpec
 end
 
 require 'rspec/core/backward_compatibility'
-
-# TODO - make this configurable with default 'on'
-require 'rspec/expectations'
-
 require 'rspec/monkey'

data/lib/rspec/core/backward_compatibility.rb

@@ -9,11 +9,11 @@ module RSpec
 DEPRECATION WARNING: you are using a deprecated constant that will
 be removed from a future version of RSpec.
 
+#{caller(0)[2]}
+
 * #{name} is deprecated.
 * RSpec is the new top-level module in RSpec-2
-
-#{caller(0)[1]}
-*****************************************************************
+***************************************************************
 WARNING
           RSpec
         else
@@ -21,9 +21,28 @@ WARNING
         end
       end
     end
+  end
 
+  module Runner
+    def self.configure(&block)
+      RSpec.deprecate("Spec::Runner.configure", "RSpec.configure")
+      RSpec.configure(&block)
+    end
   end
 
+  module Rake
+    def self.const_missing(name)
+      case name
+      when :SpecTask
+        RSpec.deprecate("Spec::Rake::SpecTask", "RSpec::Core::RakeTask")
+        require 'rspec/core/rake_task'
+        RSpec::Core::RakeTask
+      else
+        super(name)
+      end
+    end
+
+  end
 end
 
 Object.extend(RSpec::Core::ConstMissing)

data/lib/rspec/core/command_line.rb

@@ -17,6 +17,7 @@ module RSpec
         @options.configure(@configuration)
         @configuration.load_spec_files
         @configuration.configure_mock_framework
+        @configuration.configure_expectation_framework
         @world.announce_inclusion_filter
         @world.announce_exclusion_filter
 

data/lib/rspec/core/configuration.rb

@@ -27,6 +27,7 @@ module RSpec
       add_setting :fail_fast, :default => false
       add_setting :run_all_when_everything_filtered
       add_setting :mock_framework, :default => :rspec
+      add_setting :expectation_framework, :default => :rspec
       add_setting :filter
       add_setting :exclusion_filter
       add_setting :filename_pattern, :default => '**/*_spec.rb'
@@ -46,6 +47,11 @@ module RSpec
           /spec\/spec_helper\.rb/,
           /lib\/rspec\/(core|expectations|matchers|mocks)/
         ]
+
+        filter_run_excluding(
+          :if     => lambda { |value, metadata| metadata.has_key?(:if) && !value },
+          :unless => lambda { |value| value }
+        )
       end
 
       # :call-seq:
@@ -125,6 +131,19 @@ module RSpec
         end
       end
 
+      def expect_with(expectation_framework)
+        settings[:expectation_framework] = expectation_framework
+      end
+
+      def require_expectation_framework_adapter
+        require case expectation_framework.to_s
+        when /rspec/i
+          'rspec/core/expecting/with_rspec'
+        else
+          raise ArgumentError, "#{expectation_framework.inspect} is not supported"
+        end
+      end
+
       def full_backtrace=(bool)
         settings[:backtrace_clean_patterns] = []
       end
@@ -181,11 +200,11 @@ EOM
       end
 
       def line_number=(line_number)
-        filter_run :line_number => line_number.to_i
+        filter_run({ :line_number => line_number.to_i }, true)
       end
 
       def full_description=(description)
-        filter_run :full_description => /#{description}/
+        filter_run({ :full_description => /#{description}/ }, true)
       end
 
       attr_writer :formatter_class
@@ -260,19 +279,23 @@ EOM
         RSpec::Core::ExampleGroup.alias_it_should_behave_like_to(new_name, report_label)
       end
 
-      def filter_run_including(options={})
+      def filter_run_including(options={}, force_overwrite = false)
         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}"
         else
-          self.filter = options
+          if force_overwrite
+            self.filter = options
+          else
+            self.filter = (filter || {}).merge(options)
+          end
         end
       end
 
       alias_method :filter_run, :filter_run_including
 
       def filter_run_excluding(options={})
-        self.exclusion_filter = options
+        self.exclusion_filter = (exclusion_filter || {}).merge(options)
       end
 
       def include(mod, filters={})
@@ -290,7 +313,7 @@ EOM
         }
 
         include_or_extend_modules.each do |include_or_extend, mod, filters|
-          next unless group.all_apply?(filters)
+          next unless group.apply?(:all?, filters)
           next if modules[include_or_extend].include?(mod)
           modules[include_or_extend] << mod
           group.send(include_or_extend, mod)
@@ -302,6 +325,11 @@ EOM
         RSpec::Core::ExampleGroup.send(:include, RSpec::Core::MockFrameworkAdapter)
       end
 
+      def configure_expectation_framework
+        require_expectation_framework_adapter
+        RSpec::Core::ExampleGroup.send(:include, RSpec::Core::ExpectationFrameworkAdapter)
+      end
+
       def load_spec_files
         files_to_run.map {|f| load File.expand_path(f) }
       end

data/lib/rspec/core/configuration_options.rb

@@ -91,9 +91,7 @@ module RSpec
 
       def local_options_file(options)
         return options[:options_file] if options[:options_file]
-        return LOCAL_OPTIONS_FILE if File.exist?(LOCAL_OPTIONS_FILE)
-        RSpec.deprecate("spec/spec.opts", "./.rspec or ~/.rspec", "2.0.0") if File.exist?("spec/spec.opts")
-        "spec/spec.opts"
+        LOCAL_OPTIONS_FILE
       end
     end
   end