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

data/lib/rspec/core/formatters/base_text_formatter.rb

@@ -11,12 +11,15 @@ module Rspec
           failed_examples.each_with_index do |failed_example, index|
             exception = failed_example.execution_result[:exception_encountered]
             padding = '    '
-
-            output.puts "#{index.next}) #{failed_example}"
-            output.puts "#{padding}Failure/Error: #{read_failed_line(exception, failed_example).strip}"
-
-            exception.message.split("\n").each do |line|
-              output.puts "#{padding}#{colorise(line, exception).strip}"
+            if exception.is_a?(Rspec::Core::PendingExampleFixedError)
+              output.puts "#{index.next}) #{failed_example} FIXED"
+              output.puts "#{padding}Expected pending '#{failed_example.metadata[:execution_result][:pending_message]}' to fail. No Error was raised."
+            else
+              output.puts "#{index.next}) #{failed_example}"
+              output.puts "#{padding}Failure/Error: #{read_failed_line(exception, failed_example).strip}"
+              exception.message.split("\n").each do |line|
+                output.puts "#{padding}#{colorise(line, exception).strip}"
+              end
             end
 
             format_backtrace(exception.backtrace, failed_example).each do |backtrace_info|
@@ -73,8 +76,8 @@ module Rspec
           unless pending_examples.empty?
             output.puts
             output.puts "Pending:"
-            pending_examples.each do |pending_example, message|
-              output.puts "  #{pending_example}"
+            pending_examples.each do |pending_example|
+              output.puts "  #{pending_example} (#{pending_example.metadata[:execution_result][:pending_message]})"
               output.puts grey("   # #{format_caller(pending_example.metadata[:location])}")
             end
           end

data/lib/rspec/core/formatters/documentation_formatter.rb

@@ -14,14 +14,14 @@ module Rspec
         def add_example_group(example_group)
           super
 
-          described_example_group_chain.each_with_index do |nested_example_group, i|
+          example_group_chain.each_with_index do |nested_example_group, i|
             unless nested_example_group == @previous_nested_example_groups[i]
               output.puts if i == 0
               output.puts "#{'  ' * i}#{nested_example_group.description}"
             end
           end
 
-          @previous_nested_example_groups = described_example_group_chain
+          @previous_nested_example_groups = example_group_chain
         end
         
         def output_for(example)
@@ -67,8 +67,8 @@ module Rspec
           '  ' * @previous_nested_example_groups.size
         end
 
-        def described_example_group_chain
-          example_group.ancestors
+        def example_group_chain
+          example_group.ancestors.reverse
         end
 
       end

data/lib/rspec/core/pending.rb

@@ -0,0 +1,19 @@
+module Rspec
+  module Core
+    module Pending
+      def pending(message = 'No reason given')
+        running_example.metadata[:pending] = true
+        running_example.metadata[:execution_result][:pending_message] = message
+        if block_given?
+          begin
+            result = yield
+            running_example.metadata[:pending] = false
+          rescue Exception => e
+          end
+          raise Rspec::Core::PendingExampleFixedError.new if result
+        end
+        throw :pending_declared_in_example, message
+      end
+    end
+  end
+end

data/lib/rspec/core/subject.rb

@@ -69,7 +69,7 @@ module Rspec
 
         def implicit_subject
           described = describes || description
-          Class === described ? lambda { described.new } : lambda { described }
+          Class === described ? proc { described.new } : proc { described }
         end
       end
     end

data/rspec-core.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-core}
-  s.version = "2.0.0.beta.7"
+  s.version = "2.0.0.beta.8"
 
   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-04-17}
+  s.date = %q{2010-04-27}
   s.description = %q{Rspec runner and example group classes}
   s.email = %q{dchelimsky@gmail.com;chad.humphries@gmail.com}
   s.executables = ["rspec", "spec"]
@@ -105,6 +105,7 @@ Gem::Specification.new do |s|
      "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",
@@ -123,6 +124,7 @@ 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/pending.rb",
      "lib/rspec/core/rake_task.rb",
      "lib/rspec/core/ruby_project.rb",
      "lib/rspec/core/runner.rb",
@@ -144,8 +146,8 @@ Gem::Specification.new do |s|
      "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",
@@ -166,7 +168,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/rspec/core}
   s.post_install_message = %q{**************************************************
 
-  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
@@ -178,7 +180,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.6}
-  s.summary = %q{rspec-core-2.0.0.beta.7}
+  s.summary = %q{rspec-core-2.0.0.beta.8}
   s.test_files = [
     "spec/autotest/failed_results_re_spec.rb",
      "spec/autotest/rspec_spec.rb",
@@ -192,8 +194,8 @@ Gem::Specification.new do |s|
      "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",
@@ -216,19 +218,19 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.7"])
-      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.7"])
+      s.add_development_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.8"])
+      s.add_development_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.8"])
       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.7"])
-      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.7"])
+      s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.8"])
+      s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.8"])
       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.7"])
-    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.7"])
+    s.add_dependency(%q<rspec-expectations>, [">= 2.0.0.beta.8"])
+    s.add_dependency(%q<rspec-mocks>, [">= 2.0.0.beta.8"])
     s.add_dependency(%q<cucumber>, [">= 0.5.3"])
     s.add_dependency(%q<autotest>, [">= 4.2.9"])
   end

data/spec/rspec/core/configuration_spec.rb

@@ -136,7 +136,7 @@ module Rspec::Core
         it "includes the given module into each example group" do
           config.include(InstanceLevelMethods)
           
-          group = ExampleGroup.create(config, 'does like, stuff and junk', :magic_key => :include) { }
+          group = ExampleGroup.describe(config, 'does like, stuff and junk', :magic_key => :include) { }
           group.should_not respond_to(:you_call_this_a_blt?)
           group.new.you_call_this_a_blt?.should == "egad man, where's the mayo?!?!?"
         end
@@ -147,7 +147,7 @@ module Rspec::Core
         it "includes the given module into each matching example group" do
           config.include(InstanceLevelMethods, :magic_key => :include)
           
-          group = ExampleGroup.create(config, 'does like, stuff and junk', :magic_key => :include) { }
+          group = ExampleGroup.describe(config, 'does like, stuff and junk', :magic_key => :include) { }
           group.should_not respond_to(:you_call_this_a_blt?)
           group.new.you_call_this_a_blt?.should == "egad man, where's the mayo?!?!?"
         end
@@ -164,7 +164,7 @@ module Rspec::Core
 
       it "should extend the given module into each matching example group" do
         config.extend(ThatThingISentYou, :magic_key => :extend)      
-        group = ExampleGroup.create(config, ThatThingISentYou, :magic_key => :extend) { }
+        group = ExampleGroup.describe(config, ThatThingISentYou, :magic_key => :extend) { }
         group.should respond_to(:that_thing)
       end
 

data/spec/rspec/core/example_group_spec.rb

@@ -14,35 +14,18 @@ module Rspec::Core
 
   describe ExampleGroup do
 
-    describe "#describe" do
-
-      it "raises an ArgumentError if no type or description is given" do
-        lambda { ExampleGroup.describe() {} }.should raise_error(ArgumentError, "No arguments given.  You must a least supply a type or description")
-      end
-
-      it "raises an ArgumentError if no block is given" do
-        lambda { ExampleGroup.describe('foo') }.should raise_error(ArgumentError, "You must supply a block when calling describe")
-      end
-
-    end
-
-
     describe '#describes' do
 
       context "with a constant as the first parameter" do
-
         it "is that constant" do
-          ExampleGroup.create(Object) { }.describes.should == Object
+          ExampleGroup.describe(Object) { }.describes.should == Object
         end
-
       end
 
       context "with a string as the first parameter" do
-
         it "is nil" do
-          ExampleGroup.create("i'm a computer") { }.describes.should be_nil
+          ExampleGroup.describe("i'm a computer") { }.describes.should be_nil
         end
-
       end
 
     end
@@ -50,7 +33,7 @@ module Rspec::Core
     describe '#description' do
 
       it "grabs the description from the metadata" do
-        group = ExampleGroup.create(Object, "my desc") { }
+        group = ExampleGroup.describe(Object, "my desc") { }
         group.description.should == group.metadata[:example_group][:description]
       end
 
@@ -59,39 +42,39 @@ module Rspec::Core
     describe '#metadata' do
 
       it "adds the third parameter to the metadata" do
-        ExampleGroup.create(Object, nil, 'foo' => 'bar') { }.metadata.should include({ "foo" => 'bar' })
+        ExampleGroup.describe(Object, nil, 'foo' => 'bar') { }.metadata.should include({ "foo" => 'bar' })
       end
 
       it "adds the caller to metadata" do
-        ExampleGroup.create(Object) { }.metadata[:example_group][:caller].any? {|f|
+        ExampleGroup.describe(Object) { }.metadata[:example_group][:caller].any? {|f|
           f =~ /#{__FILE__}/
         }.should be_true
       end
 
       it "adds the the file_path to metadata" do
-        ExampleGroup.create(Object) { }.metadata[:example_group][:file_path].should == __FILE__
+        ExampleGroup.describe(Object) { }.metadata[:example_group][:file_path].should == __FILE__
       end
 
       it "has a reader for file_path" do
-        ExampleGroup.create(Object) { }.file_path.should == __FILE__
+        ExampleGroup.describe(Object) { }.file_path.should == __FILE__
       end
 
       it "adds the line_number to metadata" do
-        ExampleGroup.create(Object) { }.metadata[:example_group][:line_number].should == __LINE__
+        ExampleGroup.describe(Object) { }.metadata[:example_group][:line_number].should == __LINE__
       end
 
     end
 
-    describe "adding before, after, and around hooks" do
+    describe "before, after, and around hooks" do
 
-      it "should expose the before each blocks at before_eachs" do
-        group = ExampleGroup.create
+      it "exposes the before each blocks at before_eachs" do
+        group = ExampleGroup.describe
         group.before(:each) { 'foo' }
         group.should have(1).before_eachs
       end
 
-      it "should maintain the before each block order" do
-        group = ExampleGroup.create
+      it "maintains the before each block order" do
+        group = ExampleGroup.describe
         group.before(:each) { 15 }
         group.before(:each) { 'A' }
         group.before(:each) { 33.5 }
@@ -101,14 +84,14 @@ module Rspec::Core
         group.before_eachs[2].call.should == 33.5
       end
 
-      it "should expose the before all blocks at before_alls" do
-        group = ExampleGroup.create
+      it "exposes the before all blocks at before_alls" do
+        group = ExampleGroup.describe
         group.before(:all) { 'foo' }
         group.should have(1).before_alls
       end
 
-      it "should maintain the before all block order" do
-        group = ExampleGroup.create
+      it "maintains the before all block order" do
+        group = ExampleGroup.describe
         group.before(:all) { 15 }
         group.before(:all) { 'A' }
         group.before(:all) { 33.5 }
@@ -118,14 +101,14 @@ module Rspec::Core
         group.before_alls[2].call.should == 33.5
       end
 
-      it "should expose the after each blocks at after_eachs" do
-        group = ExampleGroup.create
+      it "exposes the after each blocks at after_eachs" do
+        group = ExampleGroup.describe
         group.after(:each) { 'foo' }
         group.should have(1).after_eachs
       end
 
-      it "should maintain the after each block order" do
-        group = ExampleGroup.create
+      it "maintains the after each block order" do
+        group = ExampleGroup.describe
         group.after(:each) { 15 }
         group.after(:each) { 'A' }
         group.after(:each) { 33.5 }
@@ -135,14 +118,14 @@ module Rspec::Core
         group.after_eachs[2].call.should == 33.5
       end
 
-      it "should expose the after all blocks at after_alls" do
-        group = ExampleGroup.create
+      it "exposes the after all blocks at after_alls" do
+        group = ExampleGroup.describe
         group.after(:all) { 'foo' }
         group.should have(1).after_alls
       end
 
-      it "should maintain the after each block order" do
-        group = ExampleGroup.create
+      it "maintains the after each block order" do
+        group = ExampleGroup.describe
         group.after(:all) { 15 }
         group.after(:all) { 'A' }
         group.after(:all) { 33.5 }
@@ -152,8 +135,8 @@ module Rspec::Core
         group.after_alls[2].call.should == 33.5
       end
 
-      it "should expose the around each blocks at after_alls" do
-        group = ExampleGroup.create
+      it "exposes the around each blocks at after_alls" do
+        group = ExampleGroup.describe
         group.around(:each) { 'foo' }
         group.should have(1).around_eachs
       end
@@ -162,22 +145,22 @@ module Rspec::Core
 
     describe "adding examples" do
 
-      it "should allow adding an example using 'it'" do
-        group = ExampleGroup.create
+      it "allows adding an example using 'it'" do
+        group = ExampleGroup.describe
         group.it("should do something") { }
         group.examples.size.should == 1
       end
 
-      it "should expose all examples at examples" do
-        group = ExampleGroup.create
+      it "exposes all examples at examples" do
+        group = ExampleGroup.describe
         group.it("should do something 1") { }
         group.it("should do something 2") { }
         group.it("should do something 3") { }
         group.examples.size.should == 3
       end
 
-      it "should maintain the example order" do
-        group = ExampleGroup.create
+      it "maintains the example order" do
+        group = ExampleGroup.describe
         group.it("should 1") { }
         group.it("should 2") { }
         group.it("should 3") { }
@@ -211,54 +194,41 @@ module Rspec::Core
     end
 
     describe "#run_examples" do
-      before do
-        @fake_formatter = Formatters::BaseFormatter.new
-      end
-
-      def stub_example_group
-        stub('example_group', 
-          :metadata => Metadata.new.process(
-            'example_group_name',
-            :caller => ['foo_spec.rb:37']
-          )
-        ).as_null_object 
-      end
 
-      it "should return true if all examples pass" do
-        use_formatter(@fake_formatter) do
-          passing_example1 = Example.new(stub_example_group, 'description', {}, (lambda { 1.should == 1 }))
-          passing_example2 = Example.new(stub_example_group, 'description', {}, (lambda { 1.should == 1 }))
-          ExampleGroup.stub(:examples_to_run).and_return([passing_example1, passing_example2])
+      let(:reporter) { double("reporter").as_null_object }
 
-          ExampleGroup.run_examples(stub_example_group, mock('reporter').as_null_object).should be_true
+      it "returns true if all examples pass" do
+        group = ExampleGroup.describe('group') do
+          example('ex 1') { 1.should == 1 }
+          example('ex 2') { 1.should == 1 }
         end
+        group.stub(:examples_to_run) { group.examples }
+        group.run(reporter).should be_true
       end
 
-      it "should return false if any of the examples return false" do
-        use_formatter(@fake_formatter) do
-          failing_example = Example.new(stub_example_group, 'description', {}, (lambda { 1.should == 2 }))
-          passing_example = Example.new(stub_example_group, 'description', {}, (lambda { 1.should == 1 }))
-          ExampleGroup.stub!(:examples_to_run).and_return([failing_example, passing_example])
-
-          ExampleGroup.run_examples(stub_example_group, mock('reporter').as_null_object).should be_false
+      it "returns false if any of the examples fail" do
+        group = ExampleGroup.describe('group') do
+          example('ex 1') { 1.should == 1 }
+          example('ex 2') { 1.should == 2 }
         end
+        group.stub(:examples_to_run) { group.examples }
+        group.run(reporter).should be_false
       end
 
-      it "should run all examples, regardless of any of them failing" do
-        use_formatter(@fake_formatter) do
-          failing_example = Example.new(stub_example_group, 'description', {}, (lambda { 1.should == 2 }))
-          passing_example = Example.new(stub_example_group, 'description', {}, (lambda { 1.should == 1 }))
-          ExampleGroup.stub!(:examples_to_run).and_return([failing_example, passing_example])
-
-          passing_example.should_receive(:run)
-
-          ExampleGroup.run_examples(stub_example_group, mock('reporter', :null_object => true))
+      it "runs all examples, regardless of any of them failing" do
+        group = ExampleGroup.describe('group') do
+          example('ex 1') { 1.should == 2 }
+          example('ex 2') { 1.should == 1 }
         end
+        group.stub(:examples_to_run) { group.examples }
+        group.examples_to_run.each do |example|
+          example.should_receive(:run)
+        end
+        group.run(reporter).should be_false
       end
-
     end
 
-    describe "how instance variables inherit" do
+    describe "how instance variables are inherited" do
       before(:all) do
         @before_all_top_level = 'before_all_top_level'
       end
@@ -317,47 +287,6 @@ module Rspec::Core
       end
     end
 
-    describe "#let" do
-      let(:counter) do
-        Class.new do
-          def initialize
-            @count = 0
-          end
-          def count
-            @count += 1
-          end
-        end.new
-      end
-
-      it "generates an instance method" do
-        counter.count.should == 1
-      end
-
-      it "caches the value" do
-        counter.count.should == 1
-        counter.count.should == 2
-      end
-    end
-
-    describe "#let!" do
-      let!(:creator) do
-        class Creator
-          @count = 0
-          def self.count
-            @count += 1
-          end
-        end
-      end
-
-      it "evaluates the value non-lazily" do
-        lambda { Creator.count }.should_not raise_error
-      end
-
-      it "does not interfere between tests" do 
-        Creator.count.should == 1
-      end
-    end
-
     describe "#around" do
 
       around(:each) do |example|
@@ -374,6 +303,19 @@ module Rspec::Core
         SelfObserver.cache.length.should == 1
       end
     end
-  end
 
+    describe "top_level_description" do
+      it "returns the description from the outermost example group" do
+        group = nil
+        ExampleGroup.describe("top") do
+          context "middle" do
+            group = describe "bottom" do
+            end
+          end
+        end
+
+        group.top_level_description.should == "top"
+      end
+    end
+  end
 end