rspec-core 2.0.0.beta.19 → 2.0.0.beta.20

data/.gitignore

@@ -8,3 +8,4 @@ tmp
 tags
 rerun.txt
 Gemfile.lock
+.bundle

data/Upgrade.markdown

@@ -8,6 +8,12 @@ The command to run specs is now `rspec` instead of `spec`.
 
     rspec ./spec
 
+### rake task
+
+The RSpec rake task has moved to:
+
+    'rspec/core/rake_task'
+
 ### autotest
 
 RSpec-2 works with autotest as follows:

data/VERSION

@@ -1 +1 @@
-2.0.0.beta.19
+2.0.0.beta.20

data/features/example_groups/shared_example_group.feature

@@ -20,9 +20,11 @@ Feature: Shared example group
         end
       end
 
-      describe "#first" do
-        it "returns the first item" do
-          @instance.first.should == 7
+      describe "#include?" do
+        context "with an an item in the collection" do
+          it "returns true" do
+            @instance.include?(7).should be_true
+          end
         end
       end
     end
@@ -43,15 +45,17 @@ Feature: Shared example group
         it should behave like a collection object
           initialized with 3 items
             has three items
-          #first
-            returns the first item
+          #include?
+            with an an item in the collection
+              returns true
 
       Set
         it should behave like a collection object
           initialized with 3 items
             has three items
-          #first
-            returns the first item
+          #include?
+            with an an item in the collection
+              returns true
       """
 
   Scenario: Using a shared example group with a block
@@ -96,6 +100,39 @@ Feature: Shared example group
             adds objects to the end of the collection
       """
 
+  @wip
+  Scenario: Passing parameters to a shared example group
+    Given a file named "shared_example_group_params_spec.rb" with:
+    """
+    shared_examples_for "a measurable object" do |measurement_method, measurement|
+      it "should return #{measurement} from ##{measurement_method}" do
+        subject.send(measurement_method).should == measurement
+      end
+    end
+
+    describe Array, "with 3 items" do
+      subject { [1, 2, 3] }
+      it_should_behave_like "a measurable object", :size, 3
+    end
+
+    describe String, "of 6 characters" do
+      subject { "FooBar" }
+      it_should_behave_like "a measurable object", :length, 6
+    end
+    """
+    When I run "rspec shared_example_group_params_spec.rb --format documentation"
+    Then the output should contain "2 examples, 0 failures"
+    And the output should contain:
+      """
+      Array with 3 items
+        it should behave like a measurable object
+          should return 3 from #size
+
+      String of 6 characters
+        it should behave like a measurable object
+          should return 6 from #length
+      """
+
   Scenario: Aliasing "it_should_behave_like" to "it_has_behavior"
     Given a file named "shared_example_group_spec.rb" with:
       """

data/features/filtering/exclusion_filters.feature

@@ -0,0 +1,79 @@
+Feature: exclusion filters
+  
+  Scenario: exclude one example
+    Given a file named "spec/sample_spec.rb" with:
+      """
+      RSpec.configure do |c|
+        c.filter_run_excluding :broken => true
+      end
+
+      describe "something" do
+        it "does one thing" do
+        end
+
+        it "does another thing", :broken => true do
+        end
+      end
+      """
+    When I run "rspec ./spec/sample_spec.rb --format doc"
+    Then the output should contain "does one thing"
+    And the output should not contain "does another thing"
+
+  Scenario: exclude one group
+    Given a file named "spec/sample_spec.rb" with:
+      """
+      RSpec.configure do |c|
+        c.filter_run_excluding :broken => true
+      end
+  
+      describe "group 1", :broken => true do
+        it "group 1 example 1" do
+        end
+  
+        it "group 1 example 2" do
+        end
+      end
+  
+      describe "group 2" do
+        it "group 2 example 1" do
+        end
+      end
+      """
+    When I run "rspec ./spec/sample_spec.rb --format doc"
+    Then the output should contain "group 2 example 1"
+    And  the output should not contain "group 1 example 1"
+    And  the output should not contain "group 1 example 2"
+  
+  Scenario: exclude all groups
+    Given a file named "spec/sample_spec.rb" with:
+      """
+      RSpec.configure do |c|
+        c.filter_run_excluding :broken => true
+      end
+  
+      describe "group 1", :broken => true do
+        before(:all) do
+          raise "you should not see me"
+        end
+        
+        it "group 1 example 1" do
+        end
+  
+        it "group 1 example 2" do
+        end
+      end
+  
+      describe "group 2", :broken => true do
+        before(:each) do
+          raise "you should not see me"
+        end
+        
+        it "group 2 example 1" do
+        end
+      end
+      """
+    When I run "rspec ./spec/sample_spec.rb --format doc"
+    Then the output should contain "No examples were matched. Perhaps {:broken=>true} is excluding everything?"
+    And  the output should contain "0 examples, 0 failures"
+    And  the output should not contain "group 1"
+    And  the output should not contain "group 2"

data/features/filtering/inclusion_filters.feature

@@ -1,4 +1,4 @@
-Feature: inclusion feature
+Feature: inclusion filters
   
   Scenario: focus on one example
     Given a file named "spec/sample_spec.rb" with:

data/features/hooks/around_hooks.feature

@@ -27,6 +27,33 @@ Feature: around hooks
       around each after
       """
 
+  Scenario: argument passed to around hook can be treated as a proc
+    Given a file named "treat_around_hook_arg_as_a_proc.rb" with:
+      """
+      describe "around filter" do
+        def perform_around
+          puts "around each before"
+          yield
+          puts "around each after"
+        end
+
+        around(:each) do |example|
+          perform_around(&example)
+        end
+
+        it "gets run in order" do
+          puts "in the example"
+        end
+      end
+      """
+    When I run "rspec ./treat_around_hook_arg_as_a_proc.rb"
+    Then the output should contain:
+      """
+      around each before
+      in the example
+      around each after
+      """
+
   Scenario: around hooks defined globally are run
     Given a file named "ensure_around_blocks_are_run.rb" with:
       """
@@ -85,7 +112,7 @@ Feature: around hooks
       around each after
       """
 
-  Scenario: before/after(:hooks) hooks are NOT wrapped by the around hook
+  Scenario: before/after(:all) hooks are NOT wrapped by the around hook
     Given a file named "ensure_around_blocks_are_run.rb" with:
       """
       describe "around filter" do

data/features/pending/pending_examples.feature

@@ -28,10 +28,9 @@ Feature: pending examples
       """
     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:
       """
-      1 example, 0 failures, 1 pending
-
       Pending:
         an example is implemented but waiting
           # something else getting finished
@@ -51,10 +50,9 @@ Feature: pending examples
       """
     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:
       """
-      1 example, 0 failures, 1 pending
-
       Pending:
         an example is implemented but waiting
           # something else getting finished

data/features/spec_files/arbitrary_file_suffix.feature

@@ -0,0 +1,13 @@
+Feature: arbitrary file suffix
+
+  Scenario: .spec
+    Given a file named "a.spec" with:
+      """
+      describe "something" do
+        it "does something" do
+          3.should eq(3)
+        end
+      end
+      """
+    When I run "rspec a.spec"
+    Then the output should contain "1 example, 0 failures"

data/lib/autotest/rspec2.rb

@@ -1,19 +1,5 @@
 require 'autotest'
 
-Autotest.add_hook :initialize do |at|
-  at.clear_mappings
-  # watch out for Ruby bug (1.8.6): %r(/) != /\//
-  at.add_mapping(%r%^spec/.*_spec\.rb$%) { |filename, _|
-    filename
-  }
-  at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
-    ["spec/#{m[1]}_spec.rb"]
-  }
-  at.add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) {
-    at.files_matching %r%^spec/.*_spec\.rb$%
-  }
-end
-
 class RSpecCommandError < StandardError; end
 
 class Autotest::Rspec2 < Autotest
@@ -22,15 +8,29 @@ class Autotest::Rspec2 < Autotest
 
   def initialize
     super
-    self.failed_results_re = /^\d+\)\n(?:\e\[\d*m)?(?:.*?in )?'([^\n]*)'(?: FAILED)?(?:\e\[\d*m)?\n\n?(.*?(\n\n\(.*?)?)\n\n/m
+    clear_mappings
+    setup_rspec_project_mappings
+    self.failed_results_re = /^\s*\d\)\s(.*?$\n.*?$).*?#\s(.*?):/m
     self.completed_re = /\n(?:\e\[\d*m)?\d* examples?/m
   end
 
+  def setup_rspec_project_mappings
+    add_mapping(%r%^spec/.*_spec\.rb$%) { |filename, _|
+      filename
+    }
+    add_mapping(%r%^lib/(.*)\.rb$%) { |_, m|
+      ["spec/#{m[1]}_spec.rb"]
+    }
+    add_mapping(%r%^spec/(spec_helper|shared/.*)\.rb$%) {
+      files_matching %r%^spec/.*_spec\.rb$%
+    }
+  end
+
   def consolidate_failures(failed)
     filters = new_hash_of_arrays
     failed.each do |spec, trace|
-      if trace =~ /\n(\.\/)?(.*spec\.rb):[\d]+:/
-        filters[$2] << spec
+      if trace =~ /(.*spec\.rb)/
+        filters[$1] << spec
       end
     end
     return filters

data/lib/rspec/core.rb

@@ -1,7 +1,7 @@
-require 'rspec/core/kernel_extensions'
-require 'rspec/core/object_extensions'
+require 'rspec/core/extensions'
 require 'rspec/core/load_path'
 require 'rspec/core/deprecation'
+require 'rspec/core/reporter'
 require 'rspec/core/formatters'
 
 require 'rspec/core/hooks'

data/lib/rspec/core/command_line.rb

@@ -15,9 +15,10 @@ module RSpec
         @options.configure(@configuration)
         @configuration.error_stream = err
         @configuration.output_stream ||= out
-        @configuration.require_files_to_run
+        @configuration.load_spec_files
         @configuration.configure_mock_framework
         @world.announce_inclusion_filter
+        @world.announce_exclusion_filter
 
         @configuration.reporter.report(example_count) do |reporter|
           begin

data/lib/rspec/core/configuration.rb

@@ -127,7 +127,7 @@ module RSpec
       def color_enabled=(bool)
         return unless bool
         settings[:color_enabled] = true
-        if bool && ::Config::CONFIG['host_os'] =~ /mswin|mingw/
+        if bool && ::RbConfig::CONFIG['host_os'] =~ /mswin|mingw/
           orig_output_stream = settings[:output_stream]
           begin
             require 'Win32/Console/ANSI'
@@ -204,7 +204,9 @@ EOM
         @formatter ||= formatter_class.new(output)
       end
 
-      alias_method :reporter, :formatter
+      def reporter
+        @reporter ||= Reporter.new(formatter)
+      end
 
       def files_or_directories_to_run=(*files)
         self.files_to_run = files.flatten.collect do |file|
@@ -255,8 +257,12 @@ EOM
       end
 
       def filter_run_including(options={})
-        # TODO (DC 2010-07-03) this should probably warn when the unless clause returns true
-        self.filter = options unless filter and filter[:line_number] || filter[:full_description]
+        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
+        end
       end
 
       alias_method :filter_run, :filter_run_including
@@ -273,9 +279,17 @@ EOM
         include_or_extend_modules << [:extend, mod, filters]
       end
 
-      def find_modules(group)
-        include_or_extend_modules.select do |include_or_extend, mod, filters|
-          group.all_apply?(filters)
+      def configure_group(group)
+        modules = {
+          :include => [] + group.included_modules,
+          :extend  => [] + group.ancestors
+        }
+
+        include_or_extend_modules.each do |include_or_extend, mod, filters|
+          next unless group.all_apply?(filters)
+          next if modules[include_or_extend].include?(mod)
+          modules[include_or_extend] << mod
+          group.send(include_or_extend, mod)
         end
       end
 
@@ -284,8 +298,8 @@ EOM
         RSpec::Core::ExampleGroup.send(:include, RSpec::Core::MockFrameworkAdapter)
       end
 
-      def require_files_to_run
-        files_to_run.map {|f| require File.expand_path(f) }
+      def load_spec_files
+        files_to_run.map {|f| load File.expand_path(f) }
       end
     end
   end

data/lib/rspec/core/deprecation.rb

@@ -37,7 +37,7 @@ ADDITIONAL
 
     def []=(k,v)
       RSpec.deprecate(@method, @alternate_method)
-      super
+      super(k,v)
     end
 
   end

data/lib/rspec/core/example_group.rb

@@ -1,6 +1,8 @@
 module RSpec
   module Core
     class ExampleGroup
+      extend  Extensions::ModuleEvalWithArgs
+      include Extensions::InstanceEvalWithArgs
       extend  Hooks
       include Subject
       include Let
@@ -33,6 +35,7 @@ module RSpec
 
         delegate_to_metadata :description, :describes, :file_path
         alias_method :display_name, :description
+        alias_method :described_class, :describes
       end
 
       def self.define_example_method(name, extra_options={})
@@ -59,15 +62,15 @@ module RSpec
       alias_example_to :pending, :pending => true
 
       def self.define_shared_group_method(new_name, report_label=nil)
-        report_label = "it should behave like" unless report_label
         module_eval(<<-END_RUBY, __FILE__, __LINE__)
-          def self.#{new_name}(name, &customization_block)
+          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_group = describe("#{report_label} \#{name}", &shared_block)
-            shared_group.class_eval(&customization_block) if customization_block
-            shared_group
+            describe("#{report_label || "it should behave like"} \#{name}") do
+              module_eval_with_args *args, &shared_block
+              module_eval &customization_block if customization_block
+            end
           end
         END_RUBY
       end
@@ -145,10 +148,7 @@ module RSpec
 
       def self.set_it_up(*args)
         @metadata = RSpec::Core::Metadata.new(superclass_metadata).process(*args)
-
-        world.find_modules(self).each do |include_or_extend, mod, opts|
-          send(include_or_extend, mod) unless mixins[include_or_extend].include?(mod)
-        end
+        world.configure_group(self)
       end
 
       def self.before_all_ivars
@@ -176,7 +176,7 @@ module RSpec
       def self.eval_around_eachs(example_group_instance, wrapped_example)
         around_hooks.reverse.inject(wrapped_example) do |wrapper, hook|
           def wrapper.run; call; end
-          lambda { example_group_instance.instance_exec(wrapper, &hook) }
+          lambda { example_group_instance.instance_eval_with_args(wrapper, &hook) }
         end
       end
 
@@ -227,10 +227,6 @@ module RSpec
         end.all?
       end
 
-      def self.to_s
-        self == RSpec::Core::ExampleGroup ? 'RSpec::Core::ExampleGroup' : name
-      end
-
       def self.all_apply?(filters)
         metadata.all_apply?(filters)
       end
@@ -258,7 +254,7 @@ module RSpec
       end
 
       def described_class
-        self.class.describes
+        self.class.described_class
       end
 
       def instance_eval_with_rescue(&hook)
@@ -268,19 +264,6 @@ module RSpec
           example.set_exception(e)
         end
       end
-
-    private
-
-      def self.extended_modules #:nodoc:
-        @extended_modules ||= ancestors.select { |mod| mod.class == Module } - [ Object, Kernel ]
-      end
-
-      def self.mixins
-        @mixins ||= {
-          :include => included_modules,
-          :extend => extended_modules
-        }
-      end
     end
   end
 end