rspec-core 2.0.0.rc → 2.0.0

data/spec/rspec/core/example_group_spec.rb

@@ -384,6 +384,32 @@ module RSpec::Core
         example.metadata[:execution_result][:exception_encountered].message.should == "error in before all"
       end
 
+      context "when an error occurs in an after(:all) hook" do
+        before(:each) do
+          RSpec.configuration.reporter.stub(:message)
+        end
+
+        let(:group) do
+          ExampleGroup.describe do
+            after(:all) { raise "error in after all" }
+            it("equality") { 1.should == 1 }
+          end
+        end
+
+        it "allows the example to pass" do
+          group.run
+          example = group.examples.first
+          example.metadata.should_not be_nil
+          example.metadata[:execution_result].should_not be_nil
+          example.metadata[:execution_result][:status].should == "passed"
+        end
+
+        it "rescues the error and prints it out" do
+          RSpec.configuration.reporter.should_receive(:message).with(/error in after all/)
+          group.run
+        end
+      end
+
       it "has no 'running example' within before(:all)" do
         group = ExampleGroup.describe
         running_example = :none

data/spec/rspec/core/example_spec.rb

@@ -117,18 +117,6 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
     end
   end
 
-  describe "#in_block?" do
-    before do
-      example.should_not be_in_block
-    end
-    it "is only true during the example (but not before or after)" do
-      example.should be_in_block
-    end
-    after do
-      example.should_not be_in_block
-    end
-  end
-
   describe "#pending" do
     context "in the example" do
       it "sets the example to pending" do

data/spec/rspec/core/hooks_filtering_spec.rb

@@ -26,6 +26,26 @@ module RSpec::Core
     end
 
     describe "hooks with single filters" do
+
+      context "with no scope specified" do
+        it "should be ran around|before|after :each if the filter matches the example group's filter" do
+          filters = []
+          RSpec.configure do |c|
+            c.around(:match => true) {|example| filters << "around each in config"; example.run}
+            c.before(:match => true) { filters << "before each in config"}
+            c.after(:match => true)  { filters << "after each in config"}
+          end
+          group = ExampleGroup.describe(:match => true)
+          group.example("example") {}
+          group.run
+          filters.should == [
+            "around each in config",
+            "before each in config",
+            "after each in config"
+          ]
+        end
+      end
+
       it "should be ran if the filter matches the example group's filter" do
         filters = []
         RSpec.configure do |c|

data/spec/rspec/core/option_parser_spec.rb

@@ -6,6 +6,8 @@ module RSpec::Core
       RSpec.stub(:deprecate)
     end
 
+    let(:output_file){ mock File }
+
     it "deprecates the --formatter option" do
       RSpec.should_receive(:deprecate)
       Parser.parse!(%w[--formatter doc])
@@ -23,13 +25,15 @@ module RSpec::Core
     end
 
     it "parses output stream from --out" do
+      File.should_receive(:open).with("foo.txt",'w').and_return(output_file)
       options = Parser.parse!(%w[--out foo.txt])
-      options.should eq( {:output_stream=>"foo.txt"} )
+      options.should eq( {:output_stream=>output_file} )
     end
 
     it "parses output stream from -o" do
+      File.should_receive(:open).with("foo.txt",'w').and_return(output_file)
       options = Parser.parse!(%w[-o foo.txt])
-      options.should eq( {:output_stream=>"foo.txt"} )
+      options.should eq( {:output_stream=>output_file} )
     end
   end
-end
+end

data/spec/rspec/core/rake_task_spec.rb

@@ -88,17 +88,24 @@ module RSpec::Core
         it "renders them after rcov" do
           task.rcov = true
           task.rcov_opts = '--exclude "mocks"'
-          spec_command.should =~ /^-S rcov --exclude "mocks"/
+          spec_command.should =~ /rcov.*--exclude "mocks"/
+        end
+
+        it "ensures that -Ispec is in the resulting command" do
+          task.rcov = true
+          task.rcov_opts = '--exclude "mocks"'
+          spec_command.should =~ /rcov.*-Ispec/
         end
       end
     end
 
     context "with rspec_opts" do
       context "with rcov=true" do
-        it "does not add the rspec_opts" do
+        it "adds the rspec_opts after the rcov_opts and files" do
+          task.stub(:files_to_run) { "this.rb that.rb" }
           task.rcov = true
           task.rspec_opts = "-Ifoo"
-          spec_command.should_not =~ /-Ifoo/
+          spec_command.should =~ /this.rb that.rb -- -Ifoo/
         end
       end
       context "with rcov=false (default)" do
@@ -123,5 +130,19 @@ module RSpec::Core
       end
     end
 
+    context "with SPEC=path/to/file" do
+      before do
+        @orig_spec = ENV["SPEC"]
+        ENV["SPEC"] = "path/to/file"
+      end
+
+      after do
+        ENV["SPEC"] = @orig_spec
+      end
+
+      it "sets files to run" do
+        task.__send__(:files_to_run).should eq(["path/to/file"])
+      end
+    end
   end
 end

data/spec/spec_helper.rb

@@ -23,18 +23,6 @@ class NullObject
   end
 end
 
-module RSpec::Core
-  class SandboxedExampleGroup < ExampleGroup
-    def self.run(reporter=nil)
-      @orig_mock_space = RSpec::Mocks::space
-      RSpec::Mocks::space = RSpec::Mocks::Space.new
-      super(reporter || NullObject.new)
-    ensure
-      RSpec::Mocks::space = @orig_mock_space
-    end
-  end
-end
-
 def sandboxed(&block)
   begin
     @orig_config = RSpec.configuration
@@ -48,13 +36,25 @@ def sandboxed(&block)
     object.extend(RSpec::Core::ObjectExtensions)
     object.extend(RSpec::Core::SharedExampleGroup)
 
-    @orig_example_group_class = RSpec::Core::const_get(:ExampleGroup)
-    RSpec::Core::__send__ :remove_const, :ExampleGroup
-    RSpec::Core::const_set(:ExampleGroup, RSpec::Core::SandboxedExampleGroup)
+    (class << RSpec::Core::ExampleGroup; self; end).class_eval do
+      alias_method :orig_run, :run
+      def run(reporter=nil)
+        @orig_mock_space = RSpec::Mocks::space
+        RSpec::Mocks::space = RSpec::Mocks::Space.new
+        orig_run(reporter || NullObject.new)
+      ensure
+        RSpec::Mocks::space = @orig_mock_space
+      end
+    end
+
     object.instance_eval(&block)
   ensure
-    RSpec::Core::__send__ :remove_const, :ExampleGroup
-    RSpec::Core::const_set(:ExampleGroup, @orig_example_group_class)
+    (class << RSpec::Core::ExampleGroup; self; end).class_eval do
+      remove_method :run
+      alias_method :run, :orig_run
+      remove_method :orig_run
+    end
+
     RSpec.instance_variable_set(:@configuration, @orig_config)
     RSpec.instance_variable_set(:@world, @orig_world)
   end

data/specs.watchr

@@ -34,12 +34,11 @@ end
 watch('^spec/(.*)_spec\.rb')   { |m| run_spec_matching(m[1]) }
 watch('^lib/(.*)\.rb')         { |m| run_spec_matching(m[1]) }
 watch('^spec/spec_helper\.rb') { run_all_specs }
-watch('^spec/support/.*\.rb')   { run_all_specs }
+watch('^spec/support/.*\.rb')  { run_all_specs }
 
 # --------------------------------------------------
 # Signal Handling
 # --------------------------------------------------
-
 def no_int_for_you
   @sent_an_int = nil
 end

metadata

@@ -1,14 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rspec-core
 version: !ruby/object:Gem::Version 
-  hash: 7712058
-  prerelease: true
+  prerelease: false
   segments: 
   - 2
   - 0
   - 0
-  - rc
-  version: 2.0.0.rc
+  version: 2.0.0
 platform: ruby
 authors: 
 - Chad Humphries
@@ -17,133 +15,123 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -05:00
+date: 2010-10-10 00:00:00 -05:00
 default_executable: rspec
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: rspec-expectations
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7712058
         segments: 
         - 2
         - 0
         - 0
-        - rc
-        version: 2.0.0.rc
-  requirement: *id001
+        version: 2.0.0
   type: :development
-  name: rspec-expectations
   prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: rspec-mocks
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7712058
         segments: 
         - 2
         - 0
         - 0
-        - rc
-        version: 2.0.0.rc
-  requirement: *id002
+        version: 2.0.0
   type: :development
-  name: rspec-mocks
   prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: cucumber
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 0
         - 5
         - 3
         version: 0.5.3
-  requirement: *id003
   type: :development
-  name: cucumber
   prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: autotest
+  requirement: &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
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: syntax
+  requirement: &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
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: flexmock
+  requirement: &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
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  name: mocha
+  requirement: &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
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  name: rr
+  requirement: &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
+  version_requirements: *id008
 description: RSpec runner and example groups
 email: dchelimsky@gmail.com;chad.humphries@gmail.com
 executables: 
@@ -183,8 +171,8 @@ files:
 - features/formatters/custom_formatter.feature
 - features/hooks/around_hooks.feature
 - features/hooks/before_and_after_hooks.feature
-- features/hooks/described_class.feature
 - features/hooks/halt.feature
+- features/metadata/described_class.feature
 - features/mock_framework_integration/use_flexmock.feature
 - features/mock_framework_integration/use_mocha.feature
 - features/mock_framework_integration/use_rr.feature
@@ -305,7 +293,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-core-2.0.0.rc
+    Thank you for installing rspec-core-2.0.0
   
     Please be sure to look at Upgrade.markdown to see what might have changed
     since the last release.
@@ -321,28 +309,26 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: -3850690917648988866
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: -3850690917648988866
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: rspec
 rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.0.0.rc
+summary: rspec-core-2.0.0
 test_files: 
 - features/README.markdown
 - features/command_line/configure.feature
@@ -362,8 +348,8 @@ test_files:
 - features/formatters/custom_formatter.feature
 - features/hooks/around_hooks.feature
 - features/hooks/before_and_after_hooks.feature
-- features/hooks/described_class.feature
 - features/hooks/halt.feature
+- features/metadata/described_class.feature
 - features/mock_framework_integration/use_flexmock.feature
 - features/mock_framework_integration/use_mocha.feature
 - features/mock_framework_integration/use_rr.feature