rspec-core 2.0.1 → 2.1.0

data/spec/rspec/core/rake_task_spec.rb

@@ -10,6 +10,7 @@ module RSpec::Core
     end
 
     def with_bundler
+      task.skip_bundler = false
       File.stub(:exist?) { true }
       yield
     end
@@ -30,9 +31,28 @@ module RSpec::Core
     end
 
     context "with bundler" do
-      it "renders bundle exec rspec" do
-        with_bundler do
-          spec_command.should =~ /^-S bundle exec rspec/
+      context "with Gemfile" do
+        it "renders bundle exec rspec" do
+          File.stub(:exist?) { true }
+          task.skip_bundler = false
+          spec_command.should match(/bundle exec/)
+        end
+      end
+
+      context "with non-standard Gemfile" do
+        it "renders bundle exec rspec" do
+          File.stub(:exist?) {|f| f =~ /AltGemfile/}
+          task.gemfile = 'AltGemfile'
+          task.skip_bundler = false
+          spec_command.should match(/bundle exec/)
+        end
+      end
+
+      context "without Gemfile" do
+        it "renders bundle exec rspec" do
+          File.stub(:exist?) { false }
+          task.skip_bundler = false
+          spec_command.should_not match(/bundle exec/)
         end
       end
     end
@@ -55,20 +75,6 @@ module RSpec::Core
       end
     end
 
-    context "with warnings on" do
-      before { RSpec.stub(:deprecate) }
-
-      it "renders -w before the -S" do
-        task.warning = true
-        spec_command.should =~ /^-w -S rspec/
-      end
-
-      it "warns about deprecation" do
-        RSpec.should_receive(:deprecate)
-        task.warning = true
-      end
-    end
-
     context "with ruby options" do
       it "renders them before -S" do
         task.ruby_opts = "-w"
@@ -91,10 +97,11 @@ module RSpec::Core
           spec_command.should =~ /rcov.*--exclude "mocks"/
         end
 
-        it "ensures that -Ispec is in the resulting command" do
+        it "ensures that -Ispec and -Ilib are in the resulting command" do
           task.rcov = true
           task.rcov_opts = '--exclude "mocks"'
           spec_command.should =~ /rcov.*-Ispec/
+          spec_command.should =~ /rcov.*-Ilib/
         end
       end
     end
@@ -116,20 +123,6 @@ module RSpec::Core
       end
     end
 
-    context "with spec_opts" do
-      before { RSpec.stub(:deprecate) }
-
-      it "warns about deprecation" do
-        RSpec.should_receive(:deprecate)
-        task.spec_opts = "-Ifoo"
-      end
-
-      it "adds options as rspec_opts" do
-        task.spec_opts = "-Ifoo"
-        spec_command.should =~ /rspec -Ifoo/
-      end
-    end
-
     context "with SPEC=path/to/file" do
       before do
         @orig_spec = ENV["SPEC"]

data/spec/rspec/core/subject_spec.rb

@@ -59,5 +59,20 @@ module RSpec::Core
         end
       end
     end
+
+    context "using 'self' as an explicit subject" do
+      it "delegates matcher to the ExampleGroup" do
+        group = ExampleGroup.describe("group") do
+          subject { self }
+          def ok?; true; end
+
+          it { should eq self }
+          it { should be_ok }
+        end
+
+        group.run.should be_true
+      end
+    end
+
   end
 end

data/spec/rspec/core/world_spec.rb

@@ -6,82 +6,93 @@ class Foo; end
 module RSpec::Core
 
   describe World do
+    let(:world) { RSpec::Core::World.new }
 
-    before do
-      @world = RSpec.world
-    end
-
-    describe "example_groups" do
-
-      it "should contain all defined example groups" do
-        group = RSpec::Core::ExampleGroup.describe("group") {}
-        @world.example_groups.should include(group)
+    describe "#example_groups" do
+      it "contains all registered example groups" do
+        group = RSpec::Core::ExampleGroup.describe("group"){}
+        world.register(group)
+        world.example_groups.should include(group)
       end
-
     end
 
-    describe "applying inclusion filters" do
-
-      before(:each) do
-        options_1 = { :foo => 1, :color => 'blue', :feature => 'reporting' }
-        options_2 = { :pending => true, :feature => 'reporting'  }
-        options_3 = { :array => [1,2,3,4], :color => 'blue' }
-        @group1 = RSpec::Core::ExampleGroup.describe(Bar, "find group-1", options_1) { }
-        @group2 = RSpec::Core::ExampleGroup.describe(Bar, "find group-2", options_2) { }
-        @group3 = RSpec::Core::ExampleGroup.describe(Bar, "find group-3", options_3) { }
-        @group4 = RSpec::Core::ExampleGroup.describe(Foo, "find these examples") do
+    describe "#apply_inclusion_filters" do
+      let(:group1) { 
+        RSpec::Core::ExampleGroup.describe(Bar, "find group-1", 
+          { :foo => 1, :color => 'blue', :feature => 'reporting' }
+        ) {}
+      }
+
+      let(:group2) {
+        RSpec::Core::ExampleGroup.describe(Bar, "find group-2",
+          { :pending => true, :feature => 'reporting' }
+        ) {}
+      }
+
+      let(:group3) {
+        RSpec::Core::ExampleGroup.describe(Bar, "find group-3", 
+          { :array => [1,2,3,4], :color => 'blue' }
+        ) {}
+      }
+
+      let(:group4) {
+        RSpec::Core::ExampleGroup.describe(Foo, "find these examples") do
           it('I have no options') {}
           it("this is awesome", :awesome => true) {}
           it("this is too", :awesome => true) {}
           it("not so awesome", :awesome => false) {}
           it("I also have no options") {}
         end
-        @example_groups = [@group1, @group2, @group3, @group4]
-      end
+      }
+      
+      let(:example_groups) { [group1, group2, group3, group4] }
 
       it "finds no groups when given no search parameters" do
-        @world.apply_inclusion_filters([]).should == []
+        world.apply_inclusion_filters([]).should == []
       end
 
       it "finds matching groups when filtering on :describes (described class or module)" do
-        @world.apply_inclusion_filters(@example_groups, :example_group => { :describes => Bar }).should == [@group1, @group2, @group3]
+        world.apply_inclusion_filters(example_groups, :example_group => { :describes => Bar }).should == [group1, group2, group3]
       end
 
       it "finds matching groups when filtering on :description with text" do
-        @world.apply_inclusion_filters(@example_groups, :example_group => { :description => 'Bar find group-1' }).should == [@group1]
+        world.apply_inclusion_filters(example_groups, :example_group => { :description => 'Bar find group-1' }).should == [group1]
       end
 
       it "finds matching groups when filtering on :description with a lambda" do
-        @world.apply_inclusion_filters(@example_groups, :example_group => { :description => lambda { |v| v.include?('-1') || v.include?('-3') } }).should == [@group1, @group3]
+        world.apply_inclusion_filters(example_groups, :example_group => { :description => lambda { |v| v.include?('-1') || v.include?('-3') } }).should == [group1, group3]
       end
 
       it "finds matching groups when filtering on :description with a regular expression" do
-        @world.apply_inclusion_filters(@example_groups, :example_group => { :description => /find group/ }).should == [@group1, @group2, @group3]
+        world.apply_inclusion_filters(example_groups, :example_group => { :description => /find group/ }).should == [group1, group2, group3]
       end
 
       it "finds one group when searching for :pending => true" do
-        @world.apply_inclusion_filters(@example_groups, :pending => true ).should == [@group2]
+        world.apply_inclusion_filters(example_groups, :pending => true ).should == [group2]
       end
 
       it "finds matching groups when filtering on arbitrary metadata with a number" do
-        @world.apply_inclusion_filters(@example_groups, :foo => 1 ).should == [@group1]
+        world.apply_inclusion_filters(example_groups, :foo => 1 ).should == [group1]
       end
 
       it "finds matching groups when filtering on arbitrary metadata with an array" do
-        @world.apply_inclusion_filters(@example_groups, :array => [1,2,3,4]).should == [@group3]
+        world.apply_inclusion_filters(example_groups, :array => [1,2,3,4]).should == [group3]
       end
 
       it "finds no groups when filtering on arbitrary metadata with an array but the arrays do not match" do
-        @world.apply_inclusion_filters(@example_groups, :array => [4,3,2,1]).should be_empty
+        world.apply_inclusion_filters(example_groups, :array => [4,3,2,1]).should be_empty
       end
 
       it "finds matching examples when filtering on arbitrary metadata" do
-        @world.apply_inclusion_filters(@group4.examples, :awesome => true).should == [@group4.examples[1], @group4.examples[2]]
+        world.apply_inclusion_filters(group4.examples, :awesome => true).should == [group4.examples[1], group4.examples[2]]
       end
 
+      it "finds matching examples for example that match any of the filters" do
+        world.apply_inclusion_filters(group4.examples, :awesome => true, :something => :else).should == [group4.examples[1], group4.examples[2]]
+      end
     end
 
-    describe "applying exclusion filters" do
+    describe "#apply_exclusion_filters" do
 
       it "finds nothing if all describes match the exclusion filter" do
         options = { :network_access => true }
@@ -91,15 +102,18 @@ module RSpec::Core
           it("bar") {}
         end
 
-        @world.apply_exclusion_filters(group1.examples, :network_access => true).should == []
+        world.register(group1)
+
+        world.apply_exclusion_filters(group1.examples, :network_access => true).should == []
 
         group2 = ExampleGroup.describe(Bar, "find group-1") do
           it("foo", :network_access => true) {}
           it("bar") {}
         end
 
-        @world.apply_exclusion_filters(group2.examples, :network_access => true).should == [group2.examples.last]
+        world.register(group2)
 
+        world.apply_exclusion_filters(group2.examples, :network_access => true).should == [group2.examples.last]
       end
 
       it "finds nothing if a regexp matches the exclusion filter" do
@@ -107,57 +121,54 @@ module RSpec::Core
           it("foo") {}
           it("bar") {}
         end
-        @world.apply_exclusion_filters(group.examples, :name => /exclude/).should == []
-        @world.apply_exclusion_filters(group.examples, :name => /exclude/, :another => "foo").should == []
-        @world.apply_exclusion_filters(group.examples, :name => /exclude/, :another => "foo", :example_group => {
+        world.register(group)
+        world.apply_exclusion_filters(group.examples, :name => /exclude/).should == []
+        world.apply_exclusion_filters(group.examples, :name => /exclude/, :another => "foo").should == []
+        world.apply_exclusion_filters(group.examples, :name => /exclude/, :another => "foo", :example_group => {
           :describes => lambda { |b| b == Bar } } ).should == []
 
-        @world.apply_exclusion_filters(group.examples, :name => /exclude not/).should == group.examples
-        @world.apply_exclusion_filters(group.examples, :name => /exclude/, "another_condition" => "foo").should == group.examples
-        @world.apply_exclusion_filters(group.examples, :name => /exclude/, "another_condition" => "foo1").should == group.examples
+        world.apply_exclusion_filters(group.examples, :name => /exclude not/).should == group.examples
+        world.apply_exclusion_filters(group.examples, :name => /exclude/, "another_condition" => "foo").should == []
+        world.apply_exclusion_filters(group.examples, :name => /exclude/, "another_condition" => "foo1").should == []
       end
     end
 
+    describe "#preceding_declaration_line (again)" do
+
+      let(:group) do
+        RSpec::Core::ExampleGroup.describe("group") do
 
-    describe "preceding_declaration_line" do
-      before(:each) do
-        @group1_line = 10
-        @group2_line = 20
-        @group2_example1_line = 30
-        @group2_example2_line = 40
+          example("example") {}
 
-        @group1 = RSpec::Core::ExampleGroup.describe(Bar, "group-1") { }
-        @group2 = RSpec::Core::ExampleGroup.describe(Bar, "group-2") do
-          it('example 1') {}
-          it("example 2") {}
         end
-        @group1.metadata[:example_group][:line_number] = @group1_line
-        @group2.metadata[:example_group][:line_number] = @group2_line
-        @group2.examples[0].metadata[:line_number] = @group2_example1_line
-        @group2.examples[1].metadata[:line_number] = @group2_example2_line
       end
 
+      let(:group_declaration_line) { group.metadata[:example_group][:line_number] }
+      let(:example_declaration_line) { group_declaration_line + 2 }
+
+      before { world.register(group) }
+
       it "returns nil if no example or group precedes the line" do
-        @world.preceding_declaration_line(@group1_line-1).should == nil
+        world.preceding_declaration_line(group_declaration_line - 1).should be_nil
       end
 
       it "returns the argument line number if a group starts on that line" do
-        @world.preceding_declaration_line(@group1_line).should == @group1_line
+        world.preceding_declaration_line(group_declaration_line).should eq(group_declaration_line)
       end
 
       it "returns the argument line number if an example starts on that line" do
-        @world.preceding_declaration_line(@group2_example1_line).should == @group2_example1_line
+        world.preceding_declaration_line(example_declaration_line).should eq(example_declaration_line)
       end
 
       it "returns line number of a group that immediately precedes the argument line" do
-        @world.preceding_declaration_line(@group2_line+1).should == @group2_line
+        world.preceding_declaration_line(group_declaration_line + 1).should eq(group_declaration_line)
       end
 
       it "returns line number of an example that immediately precedes the argument line" do
-        @world.preceding_declaration_line(@group2_example1_line+1).should == @group2_example1_line
+        world.preceding_declaration_line(example_declaration_line + 1).should eq(example_declaration_line)
       end
-
     end
+
   end
 
 end

data/spec/spec_helper.rb

@@ -3,20 +3,6 @@ require 'autotest/rspec2'
 
 Dir['./spec/support/**/*.rb'].map {|f| require f}
 
-module RSpec
-  module Core
-    module Matchers
-      def fail
-        raise_error(::RSpec::Expectations::ExpectationNotMetError)
-      end
-
-      def fail_with(message)
-        raise_error(::RSpec::Expectations::ExpectationNotMetError, message)
-      end
-    end
-  end
-end
-
 class NullObject
   def method_missing(method, *args, &block)
     # ignore

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  hash: 13
   prerelease: false
   segments: 
   - 2
-  - 0
   - 1
-  version: 2.0.1
+  - 0
+  version: 2.1.0
 platform: ruby
 authors: 
 - Chad Humphries
@@ -16,134 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-18 00:00:00 -05:00
+date: 2010-11-07 01:00:00 -05:00
 default_executable: rspec
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 0
-        - 1
-        version: 2.0.1
-  requirement: *id001
-  type: :development
-  name: rspec-expectations
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 2
-        - 0
-        - 1
-        version: 2.0.1
-  requirement: *id002
-  type: :development
-  name: rspec-mocks
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 63
-        segments: 
-        - 0
-        - 9
-        - 2
-        version: 0.9.2
-  requirement: *id003
-  type: :development
-  name: cucumber
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 37
-        segments: 
-        - 4
-        - 2
-        - 9
-        version: 4.2.9
-  requirement: *id004
-  type: :development
-  name: autotest
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
-  requirement: *id005
-  type: :development
-  name: syntax
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
-  type: :development
-  name: flexmock
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
-  type: :development
-  name: mocha
-  prerelease: false
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id008
-  type: :development
-  name: rr
-  prerelease: false
+dependencies: []
+
 description: RSpec runner and example groups
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: 
+- autospec
 - rspec
 extensions: []
 
@@ -154,12 +33,14 @@ files:
 - .gitignore
 - .treasure_map.rb
 - Gemfile
+- Guardfile
 - History.markdown
 - License.txt
 - README.markdown
 - Rakefile
 - Upgrade.markdown
 - autotest/discover.rb
+- bin/autospec
 - bin/rspec
 - cucumber.yml
 - features/README.markdown
@@ -169,18 +50,19 @@ files:
 - features/command_line/line_number_appended_to_path.feature
 - features/command_line/line_number_option.feature
 - features/command_line/rake_task.feature
+- features/command_line/tag.feature
 - features/configuration/custom_settings.feature
 - features/configuration/fail_fast.feature
 - features/configuration/read_options_from_file.feature
 - features/example_groups/basic_structure.feature
 - features/example_groups/shared_example_group.feature
 - features/filtering/exclusion_filters.feature
+- features/filtering/implicit_filters.feature
 - features/filtering/inclusion_filters.feature
 - features/filtering/run_all_when_everything_filtered.feature
 - features/formatters/custom_formatter.feature
 - features/hooks/around_hooks.feature
 - features/hooks/before_and_after_hooks.feature
-- features/hooks/halt.feature
 - features/metadata/described_class.feature
 - features/mock_framework_integration/use_flexmock.feature
 - features/mock_framework_integration/use_mocha.feature
@@ -188,8 +70,10 @@ files:
 - features/mock_framework_integration/use_rspec.feature
 - features/pending/pending_examples.feature
 - features/spec_files/arbitrary_file_suffix.feature
+- features/step_definitions/additional_cli_steps.rb
 - features/subject/attribute_of_subject.feature
 - features/subject/explicit_subject.feature
+- features/subject/implicit_receiver.feature
 - features/subject/implicit_subject.feature
 - features/support/env.rb
 - lib/autotest/rspec2.rb
@@ -205,6 +89,7 @@ files:
 - lib/rspec/core/errors.rb
 - lib/rspec/core/example.rb
 - lib/rspec/core/example_group.rb
+- lib/rspec/core/expecting/with_rspec.rb
 - lib/rspec/core/extensions.rb
 - lib/rspec/core/extensions/instance_eval_with_args.rb
 - lib/rspec/core/extensions/kernel.rb
@@ -302,10 +187,12 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-core-2.0.1
+    Thank you for installing rspec-core-2.1.0
+  
+    Please be sure to look at the upgrade instructions to see what might have
+    changed since the last release:
   
-    Please be sure to look at Upgrade.markdown to see what might have changed
-    since the last release.
+    http://github.com/rspec/rspec-core/blob/master/Upgrade.markdown
   
   **************************************************
 
@@ -318,7 +205,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -2874414525307202279
       segments: 
       - 0
       version: "0"
@@ -327,7 +214,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -2874414525307202279
       segments: 
       - 0
       version: "0"
@@ -337,7 +224,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.0.1
+summary: rspec-core-2.1.0
 test_files: 
 - features/README.markdown
 - features/command_line/configure.feature
@@ -346,18 +233,19 @@ test_files:
 - features/command_line/line_number_appended_to_path.feature
 - features/command_line/line_number_option.feature
 - features/command_line/rake_task.feature
+- features/command_line/tag.feature
 - features/configuration/custom_settings.feature
 - features/configuration/fail_fast.feature
 - features/configuration/read_options_from_file.feature
 - features/example_groups/basic_structure.feature
 - features/example_groups/shared_example_group.feature
 - features/filtering/exclusion_filters.feature
+- features/filtering/implicit_filters.feature
 - features/filtering/inclusion_filters.feature
 - features/filtering/run_all_when_everything_filtered.feature
 - features/formatters/custom_formatter.feature
 - features/hooks/around_hooks.feature
 - features/hooks/before_and_after_hooks.feature
-- features/hooks/halt.feature
 - features/metadata/described_class.feature
 - features/mock_framework_integration/use_flexmock.feature
 - features/mock_framework_integration/use_mocha.feature
@@ -365,8 +253,10 @@ test_files:
 - features/mock_framework_integration/use_rspec.feature
 - features/pending/pending_examples.feature
 - features/spec_files/arbitrary_file_suffix.feature
+- features/step_definitions/additional_cli_steps.rb
 - features/subject/attribute_of_subject.feature
 - features/subject/explicit_subject.feature
+- features/subject/implicit_receiver.feature
 - features/subject/implicit_subject.feature
 - features/support/env.rb
 - spec/autotest/failed_results_re_spec.rb