rspec-core 2.6.0.rc2 → 2.6.0.rc4

data/Gemfile

@@ -1,7 +1,7 @@
 source "http://rubygems.org"
 
 ### rspec libs
-%w[rspec-core rspec-expectations rspec-mocks].each do |lib|
+%w[rspec rspec-core rspec-expectations rspec-mocks].each do |lib|
   library_path = File.expand_path("../../#{lib}", __FILE__)
   if File.exist?(library_path)
     gem lib, :path => library_path
@@ -10,10 +10,11 @@ source "http://rubygems.org"
   end
 end
 
+
 ### dev dependencies
 gem "rake", "0.8.7"
-# gem "cucumber", "~> 0.10.2"
-# gem "aruba", :git => "git://github.com/aslakhellesoy/aruba"
+gem "cucumber", "~> 0.10.2"
+gem "aruba", "~> 0.3.6"
 gem "rcov", "0.9.9", :platforms => :mri
 gem "relish", "0.2.0"
 gem "guard-rspec", "0.1.9"

data/features/Changelog.md

@@ -1,6 +1,13 @@
+### 2.6.0.rc4 / 2011-05-01
+
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.6.0.rc2...v2.6.0.rc4)
+
+* Enhancements
+  * Clean up messages for filters/tags.
+
 ### 2.6.0.rc2 / 2011-04-18
 
-[full changelog](http://github.com/rspec/rspec-core/compare/v2.5.1...v2.6.1.rc2)
+[full changelog](http://github.com/rspec/rspec-core/compare/v2.5.1...v2.6.0.rc2)
 
 * Enhancements
   * `shared_context` (Damian Nurzynski)

data/features/Upgrade.md

@@ -1,3 +1,36 @@
+# rspec-core-2.6
+
+## new APIs for sharing content
+
+Use `shared_context` together with `include_context` to share before/after
+hooks, let declarations, and method definitions across example groups.
+
+Use `shared_examples` together with `include_examples` to share examples
+across different contexts.
+
+All of the old APIs are still supported, but these 4 are easy to remember, and
+serve most use cases.
+
+See `shared_context` and `shared_examples` under "Example Groups" for more
+information.
+
+## `treat_symbols_as_metadata_keys_with_true_values`
+
+Yes it's a long name, but it's a great feature, and it's going to be the
+default behavior in rspec-3. This lets you add metadata to a group or example
+like this:
+
+    describe "something", :awesome do
+      ...
+
+And then you can run that group (or example) using the tags feature:
+
+    rspec spec --tag awesome
+
+We're making this an opt-in for rspec-2.6 because `describe "string", :symbol`
+is a perfectly legal construct in pre-2.6 releases and we want to maintain
+compatibility in minor releases as much as is possible.
+
 # rspec-core-2.3
 
 ## `config.expect_with`
@@ -106,7 +139,7 @@ The most obvious use is for filtering the run. For example:
     end
 
 When you run the `rspec` command, rspec will run only the examples that have
-`:focus => true` in the hash. 
+`:focus => true` in the hash.
 
 You can also add `run_all_when_everything_filtered` to the config:
 
@@ -207,7 +240,7 @@ A few things changed in the Rake task used to run specs:
     the `rspec` command no longer supports the `--options` command line option
     so the options must be embedded directly in the Rakefile, or stored in the
     `.rspec` files mentioned above.
-    
+
 3.  In RSpec-1, the rake task would read in rcov options from an `rcov.opts`
     file. This is ignored by RSpec-2. RCov options are now set directly on the Rake
     task:

data/features/command_line/tag.feature

@@ -33,19 +33,19 @@ Feature: --tag option
 
   Scenario: filter examples with a simple tag
     When I run `rspec . --tag focus`
-    Then the output should contain "Run filtered using {:focus=>true}"
+    Then the output should contain "Run filtered including {:focus=>true}"
     And the examples should all pass
 
   Scenario: filter examples with a simple tag and @
     When I run `rspec . --tag @focus`
-    Then the output should contain "Run filtered using {:focus=>true}"
+    Then the output should contain "Run filtered including {:focus=>true}"
     Then the examples should all pass
 
   Scenario: filter examples with a name:value tag
     When I run `rspec . --tag type:special`
     Then the output should contain:
       """
-      Run filtered using {:type=>"special"}
+      Run filtered including {:type=>"special"}
       """
     And the output should contain "2 examples"
     And the examples should all pass
@@ -54,7 +54,7 @@ Feature: --tag option
     When I run `rspec . --tag @type:special`
     Then the output should contain:
       """
-      Run filtered using {:type=>"special"}
+      Run filtered including {:type=>"special"}
       """
     And the examples should all pass
   
@@ -86,5 +86,5 @@ Feature: --tag option
 
   Scenario: filter examples with a simple tag, exclude examples with another tag
     When I run `rspec . --tag focus --tag ~skip`
-    Then the output should contain "Run filtered using {:focus=>true}, excluding {:skip=>true}"
+    Then the output should contain "Run filtered including {:focus=>true}, excluding {:skip=>true}"
     And the examples should all pass

data/features/filtering/run_all_when_everything_filtered.feature

@@ -32,7 +32,7 @@ Feature: run all when everything filtered
       end
       """
     When I run `rspec spec/sample_spec.rb --format doc`
-    Then the output should contain "No examples were matched by {:focus=>true}, running all"
+    Then the output should contain "No examples matched {:focus=>true}"
     And the examples should all pass
     And the output should contain:
       """

data/lib/rspec/core/configuration.rb

@@ -26,8 +26,9 @@ module RSpec
       add_setting :profile_examples
       add_setting :fail_fast
       add_setting :run_all_when_everything_filtered
-      add_setting :filter
       add_setting :exclusion_filter
+      add_setting :inclusion_filter
+      add_setting :filter, :alias => :inclusion_filter
       add_setting :filename_pattern, :default => '**/*_spec.rb'
       add_setting :files_to_run
       add_setting :include_or_extend_modules
@@ -36,6 +37,11 @@ module RSpec
       add_setting :treat_symbols_as_metadata_keys_with_true_values, :default => false
       add_setting :expecting_with_rspec
 
+      CONDITIONAL_FILTERS = {
+        :if     => lambda { |value, metadata| metadata.has_key?(:if) && !value },
+        :unless => lambda { |value| value }
+      }
+
       def initialize
         @color_enabled = false
         self.include_or_extend_modules = []
@@ -48,10 +54,7 @@ module RSpec
           /lib\/rspec\/(core|expectations|matchers|mocks)/
         ]
 
-        self.exclusion_filter = {
-          :if     => lambda { |value, metadata| metadata.has_key?(:if) && !value },
-          :unless => lambda { |value| value }
-        }
+        self.exclusion_filter = CONDITIONAL_FILTERS.dup
       end
 
       # :call-seq:
@@ -105,7 +108,7 @@ module RSpec
       end
 
       def clear_inclusion_filter # :nodoc:
-        self.filter = nil
+        self.inclusion_filter = nil
       end
 
       def cleaned_from_backtrace?(line)
@@ -335,6 +338,14 @@ EOM
         RSpec::Core::ExampleGroup.alias_it_should_behave_like_to(new_name, report_label)
       end
 
+      def exclusion_filter=(filter)
+        settings[:exclusion_filter] = filter
+      end
+
+      def inclusion_filter=(filter)
+        settings[:inclusion_filter] = filter
+      end
+
       def filter_run_including(*args)
         force_overwrite = if args.last.is_a?(Hash) || args.last.is_a?(Symbol)
           false
@@ -344,14 +355,14 @@ EOM
 
         options = build_metadata_hash_from(args)
 
-        if filter and filter[:line_number] || filter[:full_description]
+        if inclusion_filter and inclusion_filter[:line_number] || inclusion_filter[:full_description]
           warn "Filtering by #{options.inspect} is not possible since " \
-               "you are already filtering by #{filter.inspect}"
+               "you are already filtering by #{inclusion_filter.inspect}"
         else
           if force_overwrite
-            self.filter = options
+            self.inclusion_filter = options
           else
-            self.filter = (filter || {}).merge(options)
+            self.inclusion_filter = (inclusion_filter || {}).merge(options)
           end
         end
       end

data/lib/rspec/core/extensions/object.rb

@@ -2,7 +2,6 @@ module RSpec
   module Core
     module ObjectExtensions
       def describe(*args, &example_group_block)
-        args << {} unless args.last.is_a?(Hash)
         RSpec::Core::ExampleGroup.describe(*args, &example_group_block).register
       end
     end

data/lib/rspec/core/version.rb

@@ -1,7 +1,7 @@
 module RSpec # :nodoc:
   module Core # :nodoc:
     module Version # :nodoc:
-      STRING = '2.6.0.rc2'
+      STRING = '2.6.0.rc4'
     end
   end
 end

data/lib/rspec/core/world.rb

@@ -2,6 +2,29 @@ module RSpec
   module Core
     class World
 
+      module Describable
+        PROC_HEX_NUMBER = /0x[0-9a-f]+@/
+        PROJECT_DIR = File.expand_path('.')
+
+        def description
+          reject { |k, v| RSpec::Core::Configuration::CONDITIONAL_FILTERS[k] == v }.inspect.gsub(PROC_HEX_NUMBER, '').gsub(PROJECT_DIR, '.').gsub(' (lambda)','')
+        end
+
+        def empty_without_conditional_filters?
+          reject { |k, v| RSpec::Core::Configuration::CONDITIONAL_FILTERS[k] == v }.empty?
+        end
+
+        def reject
+          super rescue {}
+        end
+
+        def empty?
+          super rescue false
+        end
+      end
+
+      include RSpec::Core::Hooks
+
       attr_reader :example_groups, :filtered_examples, :wants_to_quit
       attr_writer :wants_to_quit
 
@@ -24,11 +47,11 @@ module RSpec
       end
 
       def inclusion_filter
-        @configuration.filter
+        @configuration.inclusion_filter.extend(Describable)
       end
 
       def exclusion_filter
-        @configuration.exclusion_filter
+        @configuration.exclusion_filter.extend(Describable)
       end
 
       def configure_group(group)
@@ -59,40 +82,53 @@ module RSpec
         end
       end
 
+      def reporter
+        @configuration.reporter
+      end
+
       def announce_filters
         filter_announcements = []
+
+        if @configuration.run_all_when_everything_filtered? && example_count.zero?
+          reporter.message( "No examples matched #{inclusion_filter.description}. Running all.")
+          filtered_examples.clear
+          @configuration.clear_inclusion_filter
+        end
+
         announce_inclusion_filter filter_announcements
         announce_exclusion_filter filter_announcements
 
-        unless filter_announcements.empty?
-          @configuration.reporter.message("Run filtered #{filter_announcements.join(', ')}")
+        if example_count.zero?
+          example_groups.clear
+          if filter_announcements.empty?
+            reporter.message("No examples found.")
+          elsif inclusion_filter
+            message = "No examples matched #{inclusion_filter.description}."
+            if @configuration.run_all_when_everything_filtered?
+              message << " Running all."
+            end
+            reporter.message(message)
+          elsif exclusion_filter
+            reporter.message(
+              "No examples were matched. Perhaps #{exclusion_filter.description} is excluding everything?")
+          end
+        else
+          reporter.message("Run filtered #{filter_announcements.join(', ')}")
         end
       end
 
       def announce_inclusion_filter(announcements)
         if inclusion_filter
-          if @configuration.run_all_when_everything_filtered? && RSpec.world.example_count.zero?
-            @configuration.reporter.message "No examples were matched by #{inclusion_filter.inspect}, running all"
-            @configuration.clear_inclusion_filter
-            filtered_examples.clear
-          else
-            announcements << "using #{inclusion_filter.inspect}"
-          end
+          announcements << "including #{inclusion_filter.description}"
         end
       end
-      
+
       def announce_exclusion_filter(announcements)
-        if exclusion_filter && RSpec.world.example_count.zero?
-          @configuration.reporter.message(
-            "No examples were matched. Perhaps #{exclusion_filter.inspect} is excluding everything?")
-          example_groups.clear
-        else
-          announcements << "excluding #{exclusion_filter.inspect}"
+        unless exclusion_filter.empty_without_conditional_filters?
+          announcements << "excluding #{exclusion_filter.description}"
         end
       end
 
-      include RSpec::Core::Hooks
-
       def find_hook(hook, scope, group, example = nil)
         @configuration.find_hook(hook, scope, group, example)
       end

data/spec/rspec/core/world_spec.rb

@@ -5,8 +5,9 @@ class Foo; end
 
 module RSpec::Core
 
-  describe World do
-    let(:world) { RSpec::Core::World.new }
+  describe RSpec::Core::World do
+    let(:configuration) { RSpec::Core::Configuration.new }
+    let(:world) { RSpec::Core::World.new(configuration) }
 
     describe "#example_groups" do
       it "contains all registered example groups" do
@@ -192,6 +193,103 @@ module RSpec::Core
       end
     end
 
-  end
+    describe "#announce_filters" do
+      let(:reporter) { double('reporter').as_null_object }
+      before { world.stub(:reporter) { reporter } }
+
+      context "with no examples" do
+        before { world.stub(:example_count) { 0 } }
+
+        context "with no filters" do
+          it "announces" do
+            reporter.should_receive(:message).
+              with("No examples found.")
+            world.announce_filters
+          end
+        end
+
+        context "with an inclusion filter" do
+          it "announces" do
+            configuration.inclusion_filter = { :foo => 'bar' }
+            reporter.should_receive(:message).
+              with("No examples matched #{{ :foo => 'bar' }.inspect}.")
+            world.announce_filters
+          end
+        end
+
+        context "with an inclusion filter and run_all_when_everything_filtered" do
+          it "announces" do
+            configuration.stub(:run_all_when_everything_filtered?) { true }
+            configuration.inclusion_filter = { :foo => 'bar' }
+            reporter.should_receive(:message).
+              with("No examples matched #{{ :foo => 'bar' }.inspect}. Running all.")
+            world.announce_filters
+          end
+        end
+
+        context "with an exclusion filter" do
+          it "announces" do
+            configuration.exclusion_filter = { :foo => 'bar' }
+            reporter.should_receive(:message).
+              with("No examples were matched. Perhaps #{{ :foo => 'bar' }.inspect} is excluding everything?")
+            world.announce_filters
+          end
+        end
+      end
+    end
+
+    describe "#inclusion_filter" do
+      describe "#description" do
+        it 'cleans up the description' do
+          # check the assumptions of this example
+          project_dir = File.expand_path('.')
+          lambda { }.inspect.should include(project_dir)
+          lambda { }.inspect.should include('0x')
+          lambda { }.inspect.should include(' (lambda)') if RUBY_VERSION > '1.9'
+
+          configuration.filter_run :foo => lambda { }
+          world.inclusion_filter.description.should_not include('0x')
+          world.inclusion_filter.description.should_not include(project_dir)
+          world.inclusion_filter.description.should_not include(' (lambda)')
+        end
+      end
+    end
+
+    describe "#exclusion_filter" do
+      describe "#description" do
+        it 'returns `{}` when it only contains the default filters' do
+          world.exclusion_filter.description.should == {}.inspect
+        end
+
+        it 'includes other filters' do
+          configuration.exclusion_filter[:foo] = :bar
+          world.exclusion_filter.description.should == { :foo => :bar }.inspect
+        end
+
+        it 'includes an overriden :if filter' do
+          configuration.exclusion_filter[:if] = :custom_filter
+          world.exclusion_filter.description.should == { :if => :custom_filter }.inspect
+        end
+
+        it 'includes an overriden :unless filter' do
+          configuration.exclusion_filter[:unless] = :custom_filter
+          world.exclusion_filter.description.should == { :unless => :custom_filter }.inspect
+        end
 
+        it 'cleans up the description' do
+          # check the assumptions of this example
+          project_dir = File.expand_path('.')
+          lambda { }.inspect.should include(project_dir)
+          lambda { }.inspect.should include('0x')
+          lambda { }.inspect.should include(' (lambda)') if RUBY_VERSION > '1.9'
+
+          configuration.exclusion_filter[:foo] = lambda { }
+          configuration.filter_run_excluding :bar => lambda { }
+          world.exclusion_filter.description.should_not include('0x')
+          world.exclusion_filter.description.should_not include(project_dir)
+          world.exclusion_filter.description.should_not include(' (lambda)')
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  hash: 15424049
+  hash: 15424061
   prerelease: 6
   segments: 
   - 2
   - 6
   - 0
   - rc
-  - 2
-  version: 2.6.0.rc2
+  - 4
+  version: 2.6.0.rc4
 platform: ruby
 authors: 
 - Chad Humphries
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-18 00:00:00 -05:00
+date: 2011-05-01 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -242,10 +242,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rspec
-rubygems_version: 1.5.2
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.6.0.rc2
+summary: rspec-core-2.6.0.rc4
 test_files: 
 - features/Autotest.md
 - features/Changelog.md