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

data/lib/rspec/core/world.rb

@@ -25,8 +25,8 @@ module RSpec
         @configuration.exclusion_filter
       end
 
-      def find_modules(group)
-        @configuration.find_modules(group)
+      def configure_group(group)
+        @configuration.configure_group(group)
       end
 
       def shared_example_groups
@@ -55,7 +55,7 @@ module RSpec
 
       def announce_inclusion_filter
         if inclusion_filter
-          if @configuration.run_all_when_everything_filtered? && RSpec.world.example_count == 0
+          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
@@ -64,6 +64,14 @@ module RSpec
           end
         end
       end
+      
+      def announce_exclusion_filter
+        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
+        end
+      end
 
       include RSpec::Core::Hooks
 

data/rspec-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.19"
+  s.version = "2.0.0.beta.20"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chad Humphries", "David Chelimsky"]
-  s.date = %q{2010-07-25}
+  s.date = %q{2010-08-24}
   s.default_executable = %q{rspec}
   s.description = %q{RSpec runner and example groups}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
@@ -42,6 +42,7 @@ Gem::Specification.new do |s|
      "features/example_groups/describe_aliases.feature",
      "features/example_groups/nested_groups.feature",
      "features/example_groups/shared_example_group.feature",
+     "features/filtering/exclusion_filters.feature",
      "features/filtering/inclusion_filters.feature",
      "features/formatters/custom_formatter.feature",
      "features/hooks/around_hooks.feature",
@@ -53,6 +54,7 @@ Gem::Specification.new do |s|
      "features/mock_framework_integration/use_rr.feature",
      "features/mock_framework_integration/use_rspec.feature",
      "features/pending/pending_examples.feature",
+     "features/spec_files/arbitrary_file_suffix.feature",
      "features/subject/attribute_of_subject.feature",
      "features/subject/explicit_subject.feature",
      "features/subject/implicit_subject.feature",
@@ -71,6 +73,11 @@ Gem::Specification.new do |s|
      "lib/rspec/core/errors.rb",
      "lib/rspec/core/example.rb",
      "lib/rspec/core/example_group.rb",
+     "lib/rspec/core/extensions.rb",
+     "lib/rspec/core/extensions/instance_eval_with_args.rb",
+     "lib/rspec/core/extensions/kernel.rb",
+     "lib/rspec/core/extensions/module_eval_with_args.rb",
+     "lib/rspec/core/extensions/object.rb",
      "lib/rspec/core/formatters.rb",
      "lib/rspec/core/formatters/base_formatter.rb",
      "lib/rspec/core/formatters/base_text_formatter.rb",
@@ -81,7 +88,6 @@ Gem::Specification.new do |s|
      "lib/rspec/core/formatters/snippet_extractor.rb",
      "lib/rspec/core/formatters/text_mate_formatter.rb",
      "lib/rspec/core/hooks.rb",
-     "lib/rspec/core/kernel_extensions.rb",
      "lib/rspec/core/let.rb",
      "lib/rspec/core/load_path.rb",
      "lib/rspec/core/metadata.rb",
@@ -90,10 +96,10 @@ Gem::Specification.new do |s|
      "lib/rspec/core/mocking/with_mocha.rb",
      "lib/rspec/core/mocking/with_rr.rb",
      "lib/rspec/core/mocking/with_rspec.rb",
-     "lib/rspec/core/object_extensions.rb",
      "lib/rspec/core/option_parser.rb",
      "lib/rspec/core/pending.rb",
      "lib/rspec/core/rake_task.rb",
+     "lib/rspec/core/reporter.rb",
      "lib/rspec/core/ruby_project.rb",
      "lib/rspec/core/runner.rb",
      "lib/rspec/core/shared_example_group.rb",
@@ -111,7 +117,6 @@ Gem::Specification.new do |s|
      "spec/rspec/core/command_line_spec_output.txt",
      "spec/rspec/core/configuration_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
-     "spec/rspec/core/core_spec.rb",
      "spec/rspec/core/deprecations_spec.rb",
      "spec/rspec/core/drb_command_line_spec.rb",
      "spec/rspec/core/example_group_spec.rb",
@@ -120,21 +125,25 @@ Gem::Specification.new do |s|
      "spec/rspec/core/formatters/base_text_formatter_spec.rb",
      "spec/rspec/core/formatters/documentation_formatter_spec.rb",
      "spec/rspec/core/formatters/helpers_spec.rb",
+     "spec/rspec/core/formatters/html_formatted-1.8.6.html",
      "spec/rspec/core/formatters/html_formatted-1.8.7.html",
      "spec/rspec/core/formatters/html_formatted-1.9.1.html",
      "spec/rspec/core/formatters/html_formatted-1.9.2.html",
      "spec/rspec/core/formatters/html_formatter_spec.rb",
      "spec/rspec/core/formatters/progress_formatter_spec.rb",
      "spec/rspec/core/formatters/snippet_extractor_spec.rb",
+     "spec/rspec/core/formatters/text_mate_formatted-1.8.6.html",
      "spec/rspec/core/formatters/text_mate_formatted-1.8.7.html",
      "spec/rspec/core/formatters/text_mate_formatted-1.9.2.html",
      "spec/rspec/core/formatters/text_mate_formatter_spec.rb",
+     "spec/rspec/core/hooks_filtering_spec.rb",
      "spec/rspec/core/hooks_spec.rb",
      "spec/rspec/core/kernel_extensions_spec.rb",
      "spec/rspec/core/let_spec.rb",
      "spec/rspec/core/metadata_spec.rb",
      "spec/rspec/core/option_parser_spec.rb",
      "spec/rspec/core/pending_example_spec.rb",
+     "spec/rspec/core/reporter_spec.rb",
      "spec/rspec/core/resources/a_bar.rb",
      "spec/rspec/core/resources/a_foo.rb",
      "spec/rspec/core/resources/a_spec.rb",
@@ -146,6 +155,7 @@ Gem::Specification.new do |s|
      "spec/rspec/core/shared_example_group_spec.rb",
      "spec/rspec/core/subject_spec.rb",
      "spec/rspec/core/world_spec.rb",
+     "spec/rspec/core_spec.rb",
      "spec/ruby_forker.rb",
      "spec/spec_helper.rb",
      "spec/support/matchers.rb",
@@ -154,7 +164,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/rspec-core}
   s.post_install_message = %q{**************************************************
 
-  Thank you for installing rspec-core-2.0.0.beta.19
+  Thank you for installing rspec-core-2.0.0.beta.20
 
   Please be sure to look at Upgrade.markdown to see what might have changed
   since the last release.
@@ -165,7 +175,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.7}
-  s.summary = %q{rspec-core-2.0.0.beta.19}
+  s.summary = %q{rspec-core-2.0.0.beta.20}
   s.test_files = [
     "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
@@ -173,7 +183,6 @@ Gem::Specification.new do |s|
      "spec/rspec/core/command_line_spec.rb",
      "spec/rspec/core/configuration_options_spec.rb",
      "spec/rspec/core/configuration_spec.rb",
-     "spec/rspec/core/core_spec.rb",
      "spec/rspec/core/deprecations_spec.rb",
      "spec/rspec/core/drb_command_line_spec.rb",
      "spec/rspec/core/example_group_spec.rb",
@@ -186,12 +195,14 @@ Gem::Specification.new do |s|
      "spec/rspec/core/formatters/progress_formatter_spec.rb",
      "spec/rspec/core/formatters/snippet_extractor_spec.rb",
      "spec/rspec/core/formatters/text_mate_formatter_spec.rb",
+     "spec/rspec/core/hooks_filtering_spec.rb",
      "spec/rspec/core/hooks_spec.rb",
      "spec/rspec/core/kernel_extensions_spec.rb",
      "spec/rspec/core/let_spec.rb",
      "spec/rspec/core/metadata_spec.rb",
      "spec/rspec/core/option_parser_spec.rb",
      "spec/rspec/core/pending_example_spec.rb",
+     "spec/rspec/core/reporter_spec.rb",
      "spec/rspec/core/resources/a_bar.rb",
      "spec/rspec/core/resources/a_foo.rb",
      "spec/rspec/core/resources/a_spec.rb",
@@ -203,6 +214,7 @@ Gem::Specification.new do |s|
      "spec/rspec/core/shared_example_group_spec.rb",
      "spec/rspec/core/subject_spec.rb",
      "spec/rspec/core/world_spec.rb",
+     "spec/rspec/core_spec.rb",
      "spec/ruby_forker.rb",
      "spec/spec_helper.rb",
      "spec/support/matchers.rb"
@@ -213,19 +225,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.19"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.19"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.20"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.20"])
       s.add_development_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_development_dependency(%q<autotest>, [">= 4.2.9"])
     else
-      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.19"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.19"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.20"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.20"])
       s.add_dependency(%q<cucumber>, [">= 0.5.3"])
       s.add_dependency(%q<autotest>, [">= 4.2.9"])
     end
   else
-    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.19"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.19"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.20"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.20"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     s.add_dependency(%q<autotest>, [">= 4.2.9"])
   end

data/spec/autotest/failed_results_re_spec.rb

@@ -1,31 +1,22 @@
 require "spec_helper"
 
 describe "failed_results_re for autotest" do
-  it "should match a failure" do
-    re = Autotest::Rspec2.new.failed_results_re
-    re =~ "1)\n'this example' FAILED\nreason\n/path.rb:37:\n\n"
-    $1.should == "this example"
-    $2.should == "reason\n/path.rb:37:"
-  end
-
-  it "should match a failure when matcher outputs multiple lines" do
-    re = Autotest::Rspec2.new.failed_results_re
-    re =~ "1)\n'other example' FAILED\n\nreason line 1\nreason line 2\n\n(additional info)\n/path.rb:37:\n\n"
-    $1.should == "other example"
-    $2.should == "reason line 1\nreason line 2\n\n(additional info)\n/path.rb:37:"
+  let(:output) { StringIO.new }
+  let(:formatter) { RSpec::Core::Formatters::BaseTextFormatter.new(output) }
+  let(:example_output) do
+    group = RSpec::Core::ExampleGroup.describe("group name")
+    example = group.example("example name") { "this".should eq("that") }
+    group.run_all(formatter)
+    RSpec.configuration.stub(:color_enabled?) { false }
+    formatter.dump_failures
+    output.string
   end
-
-  it "should match an Error" do
+  
+  it "should match a failure" do
     re = Autotest::Rspec2.new.failed_results_re
-    re =~ "1)\nRuntimeError in 'this example'\nreason\n/path.rb:37:\n\n"
-    $1.should == "this example"
-    $2.should == "reason\n/path.rb:37:"
+    re =~ example_output
+    $1.should == "group name example name\n     Failure/Error: example = group.example(\"example name\") { \"this\".should eq(\"that\") }"
+    $2.should == "./spec/autotest/failed_results_re_spec.rb"
   end
 
-  it "should match an Error that doesn't end in Error" do
-    re = Autotest::Rspec2.new.failed_results_re
-    re =~ "1)\nInvalidArgument in 'this example'\nreason\n/path.rb:37:\n\n"
-    $1.should == "this example"
-    $2.should == "reason\n/path.rb:37:"
-  end
 end

data/spec/autotest/rspec_spec.rb

@@ -78,7 +78,7 @@ describe Autotest::Rspec2 do
       failures = [
         [
           "false should be false",
-          "expected: true,\n     got: false (using ==)\n#{@spec_file}:203:"
+          "#{@spec_file}"
         ]
       ]
       @rspec_autotest.consolidate_failures(failures).should == {

data/spec/rspec/core/configuration_spec.rb

@@ -6,6 +6,14 @@ module RSpec::Core
 
     let(:config) { subject }
 
+    describe "#load_spec_files" do
+      it "loads files using load" do
+        config.files_to_run = ["foo.bar", "blah_spec.rb"]
+        config.should_receive(:load).twice
+        config.load_spec_files
+      end
+    end
+
     describe "#mock_framework_class" do
       before(:each) do
         config.stub(:require)
@@ -68,19 +76,19 @@ module RSpec::Core
           config.filename_pattern = "**/*_foo.rb"
         end
 
-        it "should load files following pattern" do
+        it "loads files following pattern" do
           file = File.expand_path(File.dirname(__FILE__) + "/resources/a_foo.rb")
           config.files_or_directories_to_run = file
           config.files_to_run.should include(file)
         end
 
-        it "should load files in directories following pattern" do
+        it "loads files in directories following pattern" do
           dir = File.expand_path(File.dirname(__FILE__) + "/resources")
           config.files_or_directories_to_run = dir
           config.files_to_run.should include("#{dir}/a_foo.rb")
         end
 
-        it "should not load files in directories not following pattern" do
+        it "does not load files in directories not following pattern" do
           dir = File.expand_path(File.dirname(__FILE__) + "/resources")
           config.files_or_directories_to_run = dir
           config.files_to_run.should_not include("#{dir}/a_bar.rb")
@@ -94,14 +102,14 @@ module RSpec::Core
           config.filename_pattern = "**/*_foo.rb,**/*_bar.rb"
         end
 
-        it "should support comma separated values" do
+        it "supports comma separated values" do
           dir = File.expand_path(File.dirname(__FILE__) + "/resources")
           config.files_or_directories_to_run = dir
           config.files_to_run.should include("#{dir}/a_foo.rb")
           config.files_to_run.should include("#{dir}/a_bar.rb")
         end
 
-        it "should support comma separated values with spaces" do
+        it "supports comma separated values with spaces" do
           dir = File.expand_path(File.dirname(__FILE__) + "/resources")
           config.files_or_directories_to_run = dir
           config.files_to_run.should include("#{dir}/a_foo.rb")
@@ -171,7 +179,7 @@ module RSpec::Core
         end
       end
 
-      it "should extend the given module into each matching example group" do
+      it "extends the given module into each matching example group" do
         RSpec.configure do |c|
           c.extend(ThatThingISentYou, :magic_key => :extend)
         end
@@ -198,14 +206,14 @@ module RSpec::Core
       context "given true" do
         context "on windows" do
           before do
-            @original_host  = Config::CONFIG['host_os']
-            Config::CONFIG['host_os'] = 'mswin'
+            @original_host  = RbConfig::CONFIG['host_os']
+            RbConfig::CONFIG['host_os'] = 'mswin'
             config.stub(:require)
             config.stub(:warn)
           end
 
           after do
-            Config::CONFIG['host_os'] = @original_host
+            RbConfig::CONFIG['host_os'] = @original_host
           end
 
           context "with win32console available" do
@@ -281,6 +289,24 @@ module RSpec::Core
         config.filter_run :focus => true
         config.filter.should eq({:focus => true})
       end
+      
+      it "warns if :line_number is already a filter" do
+        config.filter_run :line_number => 100
+        config.should_receive(:warn).with(
+          "Filtering by {:focus=>true} is not possible since you " \
+          "are already filtering by {:line_number=>100}"
+        )
+        config.filter_run :focus => true
+      end
+      
+      it "warns if :full_description is already a filter" do
+        config.filter_run :full_description => 'foo'
+        config.should_receive(:warn).with(
+          "Filtering by {:focus=>true} is not possible since you " \
+          "are already filtering by {:full_description=>\"foo\"}"
+        )
+        config.filter_run :focus => true
+      end
     end
 
     describe "#filter_run_excluding" do
@@ -291,6 +317,8 @@ module RSpec::Core
     end
 
     describe "line_number=" do
+      before { config.stub(:warn) }
+      
       it "sets the line number" do
         config.line_number = '37'
         config.filter.should == {:line_number => 37}
@@ -429,5 +457,42 @@ module RSpec::Core
         end
       end
     end
+
+    describe "#configure_group" do
+      it "extends with modules" do
+        mod = Module.new
+        group = ExampleGroup.describe("group", :foo => :bar)
+
+        config.extend(mod, :foo => :bar)
+        config.configure_group(group)
+        group.should be_a(mod)
+      end
+
+      it "includes modules" do
+        mod = Module.new
+        group = ExampleGroup.describe("group", :foo => :bar)
+
+        config.include(mod, :foo => :bar)
+        config.configure_group(group)
+        group.included_modules.should include(mod)
+      end
+
+      it "includes each one before deciding whether to include the next" do
+        mod1 = Module.new do
+          def self.included(host)
+            host.metadata[:foo] = :bar
+          end
+        end
+        mod2 = Module.new
+
+        group = ExampleGroup.describe("group")
+
+        config.include(mod1)
+        config.include(mod2, :foo => :bar)
+        config.configure_group(group)
+        group.included_modules.should include(mod1)
+        group.included_modules.should include(mod2)
+      end
+    end
   end
 end

data/spec/rspec/core/drb_command_line_spec.rb

@@ -145,12 +145,12 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       out.read
     end
 
-    it "should output green colorized text when running with --colour option" do
+    it "outputs green colorized text when running with --colour option" do
       pending "figure out a way to properly sandbox this"
       run_spec_via_druby.should =~ /\e\[32m/m
     end
 
-    it "should output red colorized text when running with -c option" do
+    it "outputs red colorized text when running with -c option" do
       pending "figure out a way to properly sandbox this"
       run_spec_via_druby.should =~ /\e\[31m/m
     end

data/spec/rspec/core/example_group_spec.rb

@@ -165,6 +165,12 @@ module RSpec::Core
 
     end
 
+    describe '#described_class' do
+      it "is the same as describes" do
+        self.class.described_class.should eq(self.class.describes)
+      end
+    end
+
     describe '#description' do
 
       it "grabs the description from the metadata" do
@@ -460,28 +466,28 @@ module RSpec::Core
         @before_each_top_level = 'before_each_top_level'
       end
 
-      it "should be able to access a before each ivar at the same level" do
+      it "can access a before each ivar at the same level" do
         @before_each_top_level.should == 'before_each_top_level'
       end
 
-      it "should be able to access a before all ivar at the same level" do
+      it "can access a before all ivar at the same level" do
         @before_all_top_level.should == 'before_all_top_level'
       end
 
-      it "should be able to access the before all ivars in the before_all_ivars hash", :ruby => 1.8 do
+      it "can access the before all ivars in the before_all_ivars hash", :ruby => 1.8 do
         example.example_group.before_all_ivars.should include('@before_all_top_level' => 'before_all_top_level')
       end
 
-      it "should be able to access the before all ivars in the before_all_ivars hash", :ruby => 1.9 do
+      it "can access the before all ivars in the before_all_ivars hash", :ruby => 1.9 do
         example.example_group.before_all_ivars.should include(:@before_all_top_level => 'before_all_top_level')
       end
 
       describe "but now I am nested" do
-        it "should be able to access a parent example groups before each ivar at a nested level" do
+        it "can access a parent example groups before each ivar at a nested level" do
           @before_each_top_level.should == 'before_each_top_level'
         end
 
-        it "should be able to access a parent example groups before all ivar at a nested level" do
+        it "can access a parent example groups before all ivar at a nested level" do
           @before_all_top_level.should == "before_all_top_level"
         end
 
@@ -550,7 +556,7 @@ module RSpec::Core
             its(:last) { should == 'a' }
 
             describe '.first' do
-              def subject; super.first; end
+              def subject; super().first; end
 
               its(:next) { should == 2 }
             end