rspec-core 2.0.0.beta.7 → 2.0.0.beta.8

data/spec/rspec/core/subject_spec.rb

@@ -7,25 +7,25 @@ module Rspec::Core
     describe "implicit subject" do
       describe "with a class" do
         it "returns an instance of the class" do
-          ExampleGroup.create(Array).subject.call.should == []
+          ExampleGroup.describe(Array).subject.call.should == []
         end
       end
       
       describe "with a Module" do
         it "returns the Module" do
-          ExampleGroup.create(Enumerable).subject.call.should == Enumerable
+          ExampleGroup.describe(Enumerable).subject.call.should == Enumerable
         end
       end
       
       describe "with a string" do
         it "return the string" do
-          ExampleGroup.create("Foo").subject.call.should == 'Foo'
+          ExampleGroup.describe("Foo").subject.call.should == 'Foo'
         end
       end
 
       describe "with a number" do
         it "returns the number" do
-          ExampleGroup.create(15).subject.call.should == 15
+          ExampleGroup.describe(15).subject.call.should == 15
         end
       end
       
@@ -34,7 +34,7 @@ module Rspec::Core
     describe "explicit subject" do
       describe "defined in a top level group" do
         it "replaces the implicit subject in that group" do
-          group = ExampleGroup.create(Array)
+          group = ExampleGroup.describe(Array)
           group.subject { [1,2,3] }
           group.subject.call.should == [1,2,3]
         end
@@ -42,7 +42,7 @@ module Rspec::Core
 
       describe "defined in a top level group" do
         let(:group) do
-          ExampleGroup.create do
+          ExampleGroup.describe do
             subject{ [4,5,6] }
           end
         end

data/spec/rspec/core/world_spec.rb

@@ -87,14 +87,14 @@ module Rspec::Core
       it "should find nothing if all describes match the exclusion filter" do
         options = { :network_access => true }      
         
-        group1 = ExampleGroup.create(Bar, "find group-1", options) do
+        group1 = ExampleGroup.describe(Bar, "find group-1", options) do
           it("foo") {}
           it("bar") {}
         end
         
         @world.apply_exclusion_filters(group1.examples, :network_access => true).should == []
         
-        group2 = ExampleGroup.create(Bar, "find group-1") do
+        group2 = ExampleGroup.describe(Bar, "find group-1") do
           it("foo", :network_access => true) {}
           it("bar") {}
         end
@@ -104,7 +104,7 @@ module Rspec::Core
       end
       
       it "should find nothing if a regexp matches the exclusion filter" do
-        group = ExampleGroup.create(Bar, "find group-1", :name => "exclude me with a regex", :another => "foo") do
+        group = ExampleGroup.describe(Bar, "find group-1", :name => "exclude me with a regex", :another => "foo") do
           it("foo") {}
           it("bar") {}
         end
@@ -123,7 +123,7 @@ module Rspec::Core
     describe "filtering example groups" do
       
       it "should run matches" do
-        @group1 = ExampleGroup.create(Bar, "find these examples") do
+        @group1 = ExampleGroup.describe(Bar, "find these examples") do
           it('I have no options',       :color => :red, :awesome => true) {}
           it("I also have no options",  :color => :red, :awesome => true) {}
           it("not so awesome",          :color => :red, :awesome => false) {}

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ require 'rspec/mocks'
 begin
   require 'autotest'
 rescue LoadError
-  raise "You must install autotest to use it"
+  raise "Could not load autotest."
 end
 
 require 'autotest/rspec2'
@@ -30,12 +30,12 @@ module Rspec
   end
 end
 
-def use_formatter(new_formatter)
-  original_formatter = Rspec.configuration.formatter
-  Rspec.configuration.instance_variable_set(:@formatter, new_formatter)
-  yield
-ensure
-  Rspec.configuration.instance_variable_set(:@formatter, original_formatter)
+class Rspec::Core::ExampleGroup
+  def self.run_all(reporter=nil)
+    reporter ||= Rspec::Mocks::Mock.new('reporter').as_null_object
+    examples_to_run.replace(examples)
+    run(reporter)
+  end
 end
 
 def in_editor?
@@ -47,4 +47,11 @@ Rspec.configure do |c|
   c.exclusion_filter = { :ruby => lambda {|version|
     !(RUBY_VERSION.to_s =~ /^#{version.to_s}/)
   }}
+  c.before do
+    @real_world = Rspec::Core.world
+    Rspec::Core.instance_variable_set(:@world, Rspec::Core::World.new)
+  end
+  c.after do
+    Rspec::Core.instance_variable_set(:@world, @real_world)
+  end
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - beta
-  - 7
-  version: 2.0.0.beta.7
+  - 8
+  version: 2.0.0.beta.8
 platform: ruby
 authors: 
 - Chad Humphries
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-17 00:00:00 -05:00
+date: 2010-04-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,8 +32,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 7
-        version: 2.0.0.beta.7
+        - 8
+        version: 2.0.0.beta.8
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -48,8 +48,8 @@ dependencies:
         - 0
         - 0
         - beta
-        - 7
-        version: 2.0.0.beta.7
+        - 8
+        version: 2.0.0.beta.8
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -178,6 +178,7 @@ files:
 - lib/rspec/core/configuration.rb
 - lib/rspec/core/configuration_options.rb
 - lib/rspec/core/deprecation.rb
+- lib/rspec/core/errors.rb
 - lib/rspec/core/example.rb
 - lib/rspec/core/example_group.rb
 - lib/rspec/core/formatters.rb
@@ -196,6 +197,7 @@ files:
 - lib/rspec/core/mocking/with_mocha.rb
 - lib/rspec/core/mocking/with_rr.rb
 - lib/rspec/core/mocking/with_rspec.rb
+- lib/rspec/core/pending.rb
 - lib/rspec/core/rake_task.rb
 - lib/rspec/core/ruby_project.rb
 - lib/rspec/core/runner.rb
@@ -217,8 +219,8 @@ files:
 - spec/rspec/core/formatters/helpers_spec.rb
 - spec/rspec/core/formatters/progress_formatter_spec.rb
 - spec/rspec/core/kernel_extensions_spec.rb
+- spec/rspec/core/let_spec.rb
 - spec/rspec/core/metadata_spec.rb
-- spec/rspec/core/mocha_spec.rb
 - spec/rspec/core/pending_example_spec.rb
 - spec/rspec/core/resources/a_bar.rb
 - spec/rspec/core/resources/a_foo.rb
@@ -242,7 +244,7 @@ licenses: []
 post_install_message: |
   **************************************************
   
-    Thank you for installing rspec-core-2.0.0.beta.7
+    Thank you for installing rspec-core-2.0.0.beta.8
   
     This is beta software. If you are looking
     for a supported production release, please
@@ -276,7 +278,7 @@ rubyforge_project: rspec
 rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: rspec-core-2.0.0.beta.7
+summary: rspec-core-2.0.0.beta.8
 test_files: 
 - spec/autotest/failed_results_re_spec.rb
 - spec/autotest/rspec_spec.rb
@@ -290,8 +292,8 @@ test_files:
 - spec/rspec/core/formatters/helpers_spec.rb
 - spec/rspec/core/formatters/progress_formatter_spec.rb
 - spec/rspec/core/kernel_extensions_spec.rb
+- spec/rspec/core/let_spec.rb
 - spec/rspec/core/metadata_spec.rb
-- spec/rspec/core/mocha_spec.rb
 - spec/rspec/core/pending_example_spec.rb
 - spec/rspec/core/resources/a_bar.rb
 - spec/rspec/core/resources/a_foo.rb

data/spec/rspec/core/mocha_spec.rb

@@ -1,27 +0,0 @@
-require 'spec_helper'
-
-describe "Mocha Regression involving double reporting of errors" do
-  
-  it "should not double report mocha errors" do
-    # The below example should have one error, not two
-    # I'm also not sure how to test this regression without having the failure counting by 
-    # the running Rspec::Core instance
-    formatter = Rspec::Core::Formatters::BaseFormatter.new
-
-    use_formatter(formatter) do
-
-      group = Rspec::Core::ExampleGroup.create("my favorite pony") do
-        example("showing a double fail") do
-          foo = "string"
-          foo.expects(:something)
-        end
-      end      
-      group.examples_to_run.replace(group.examples)
-      group.run(formatter)
-
-    end
-
-    formatter.examples.size.should == 1  
-  end
-
-end