rspec-core 2.0.0.beta.17 → 2.0.0.beta.18

data/spec/rspec/core/core_spec.rb

@@ -3,29 +3,29 @@ require 'spec_helper'
 describe RSpec::Core do
 
   describe "#configuration" do
-    
+
     it "returns the same object every time" do
       RSpec.configuration.should equal(RSpec.configuration)
     end
 
   end
-  
+
   describe "#configure" do
-    
+
     it "yields the current configuration" do
       RSpec.configure do |config|
         config.should == RSpec::configuration
       end
     end
-    
+
   end
-  
+
   describe "#world" do
-    
+
     it "returns the RSpec::Core::World instance the current run is using" do
       RSpec.world.should be_instance_of(RSpec::Core::World)
     end
-    
+
   end
-    
+
 end

data/spec/rspec/core/deprecations_spec.rb

@@ -3,7 +3,7 @@ require "spec_helper"
 describe "deprecations" do
   describe "Spec" do
     it "is deprecated" do
-      RSpec.should_receive(:warn_deprecation).with /Spec .* RSpec/i
+      RSpec.should_receive(:warn_deprecation).with(/Spec .* RSpec/i)
       Spec
     end
 
@@ -16,7 +16,7 @@ describe "deprecations" do
   describe RSpec::Core::ExampleGroup do
     describe 'running_example' do
       it 'is deprecated' do
-        RSpec.should_receive(:warn_deprecation).with /running_example.*example/m
+        RSpec.should_receive(:warn_deprecation).with(/running_example.*example/m)
         self.running_example
       end
 

data/spec/rspec/core/drb_command_line_spec.rb

@@ -26,13 +26,13 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       err.rewind
       err.read.should =~ /No DRb server is running/
     end
-    
+
     it "returns false" do
       result = run_with []
       result.should be_false
     end
   end
-  
+
   describe "--drb-port" do
     def with_RSPEC_DRB_set_to(val)
       original = ENV['RSPEC_DRB']
@@ -50,7 +50,7 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
           drb_command_line([]).drb_port.should == 8989
         end
       end
-      
+
       it "sets the DRb port" do
         with_RSPEC_DRB_set_to(nil) do
           drb_command_line(["--drb-port", "1234"]).drb_port.should == 1234
@@ -68,7 +68,7 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
           end
         end
       end
-        
+
       context "and config variable set" do
         it "uses configured value" do
           with_RSPEC_DRB_set_to('9000') do
@@ -81,7 +81,7 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
 
   context "with server running" do
     class ::FakeDrbSpecServer
-      def self.run(argv, err, out) 
+      def self.run(argv, err, out)
         options = RSpec::Core::ConfigurationOptions.new(argv)
         options.parse_options
         RSpec::Core::CommandLine.new(options, RSpec::Core::Configuration.new).run(err, out)
@@ -91,7 +91,7 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
     def dummy_spec_filename
       @dummy_spec_filename ||= File.expand_path(File.dirname(__FILE__)) + "/_dummy_spec#{@drb_example_file_counter}.rb"
     end
-  
+
     before(:all) do
       @drb_port = 8990
       @drb_example_file_counter = 0
@@ -132,7 +132,7 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       result = drb_command_line(["--drb-port", @drb_port.to_s]).run(err, out)
       result.should be_true
     end
-    
+
     it "integrates via Runner.new.run" do
       err, out = StringIO.new, StringIO.new
       result = RSpec::Core::Runner.run(%W[ --drb --drb-port #{@drb_port} #{dummy_spec_filename}], err, out)
@@ -144,16 +144,16 @@ describe "::DRbCommandLine", :ruby => "!jruby" do
       out.rewind
       out.read
     end
-    
+
     it "should output 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
       pending "figure out a way to properly sandbox this"
       run_spec_via_druby.should =~ /\e\[31m/m
     end
   end
-  
+
 end

data/spec/rspec/core/example_group_spec.rb

@@ -254,23 +254,47 @@ module RSpec::Core
         order.should == [3,2,1]
       end
 
-      it "runs before all, before each, example, after each, after all, in that order" do
-        group = ExampleGroup.describe
+      it "runs before_all_defined_in_config, before all, before each, example, after each, after all, after_all_defined_in_config in that order" do
         order = []
-        group.after(:all)   { order << :after_all   }
-        group.after(:each)  { order << :after_each  }
+
+        RSpec.configure do |c|
+          c.before(:all) { order << :before_all_defined_in_config }
+          c.after(:all) { order << :after_all_defined_in_config }
+        end
+
+        group = ExampleGroup.describe
+        group.before(:all)  { order << :top_level_before_all  }
         group.before(:each) { order << :before_each }
-        group.before(:all)  { order << :before_all  }
-        group.example("example") { order << :example }
+        group.after(:each)  { order << :after_each  }
+        group.after(:all)   { order << :top_level_after_all   }
+        group.example("top level example") { order << :top_level_example }
+
+        context1 = group.describe("context 1")
+        context1.before(:all) { order << :nested_before_all }
+        context1.example("nested example 1") { order << :nested_example_1 }
+
+        context2 = group.describe("context 2")
+        context2.after(:all) { order << :nested_after_all }
+        context2.example("nested example 2") { order << :nested_example_2 }
 
         group.run_all
 
         order.should == [
-          :before_all,
+          :before_all_defined_in_config,
+          :top_level_before_all,
+          :before_each,
+          :top_level_example,
+          :after_each,
+          :nested_before_all,
+          :before_each,
+          :nested_example_1,
+          :after_each,
           :before_each,
-          :example,
+          :nested_example_2,
           :after_each,
-          :after_all
+          :nested_after_all,
+          :top_level_after_all,
+          :after_all_defined_in_config
         ]
       end
 
@@ -376,7 +400,7 @@ module RSpec::Core
 
     end
 
-    describe Object, "describing nested example_groups", :little_less_nested => 'yep' do 
+    describe Object, "describing nested example_groups", :little_less_nested => 'yep' do
 
       describe "A sample nested group", :nested_describe => "yep" do
         it "sets the described class to the constant Object" do
@@ -511,6 +535,18 @@ module RSpec::Core
         end
         its(:nil_value) { should be_nil }
       end
+
+      context "with nested attributes" do
+        subject do
+          Class.new do
+            def name
+              "John"
+            end
+          end.new
+        end
+        its("name.size") { should == 4 }
+        its("name.size.class") { should == Fixnum }
+      end
     end
 
     describe "#top_level_description" do

data/spec/rspec/core/example_spec.rb

@@ -16,18 +16,6 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
     end
   end
 
-  describe '#inspect' do
-    it "should return 'group description - description'" do
-      example_instance.inspect.should == 'group description example description'
-    end
-  end
-
-  describe '#to_s' do
-    it "should return #inspect" do
-      example_instance.to_s.should == example_instance.inspect
-    end
-  end
-
   describe '#described_class' do
     it "returns the class (if any) of the outermost example group" do
       described_class.should == RSpec::Core::Example
@@ -140,4 +128,50 @@ describe RSpec::Core::Example, :parent_metadata => 'sample' do
       example.should_not be_in_block
     end
   end
+
+  describe "#pending" do
+    context "in the example" do
+      it "sets the example to pending" do
+        group = RSpec::Core::ExampleGroup.describe do
+          example { pending }
+        end
+        group.run_all
+        group.examples.first.should be_pending
+      end
+    end
+      
+    context "in before(:each)" do
+      it "sets the example to pending" do
+        group = RSpec::Core::ExampleGroup.describe do
+          before(:each) { pending }
+          example {}
+        end
+        group.run_all
+        group.examples.first.should be_pending
+      end
+    end
+
+    context "in around(:each)" do
+      it "sets the example to pending" do
+        group = RSpec::Core::ExampleGroup.describe do
+          around(:each) { pending }
+          example {}
+        end
+        group.run_all
+        group.examples.first.should be_pending
+      end
+    end
+
+    context "in before(:all)" do
+      it "is not supported" do
+        group = RSpec::Core::ExampleGroup.describe do
+          before(:all) { pending }
+          example {}
+        end
+        expect do
+          group.run_all
+        end.to raise_error(/undefined method `metadata'/)
+      end
+    end
+  end
 end

data/spec/rspec/core/formatters/base_formatter_spec.rb

@@ -1,58 +1,14 @@
 require "spec_helper"
 
 describe RSpec::Core::Formatters::BaseFormatter do
-  
+
   let(:output)    { StringIO.new }
   let(:formatter) { RSpec::Core::Formatters::BaseFormatter.new(output) }
 
-  it "has start as an interface with one argument" do
-    formatter.should have_interface_for(:start).with(1).argument
-  end
-
-  it "has add_example_group as an interface with one argument" do
-    formatter.should have_interface_for(:add_example_group).with(1).argument
-  end
-
-  it "has example_passed as an interface with one argument" do
-    formatter.should have_interface_for(:example_passed).with(1).arguments
-  end
-
-  it "has example_pending as an interface with one argument" do
-    formatter.should have_interface_for(:example_pending).with(1).arguments
-  end
-
-  it "has example_failed as an interface with one argument" do
-    formatter.should have_interface_for(:example_failed).with(1).arguments
-  end
-
-  it "has start_dump as an interface with 1 arguments" do
-    formatter.should have_interface_for(:start_dump).with(1).arguments
-  end
-
-  it "has dump_failures as an interface with no arguments" do
-    formatter.should have_interface_for(:dump_failures).with(0).arguments
-  end
-
-  it "has dump_summary as an interface with zero arguments" do
-    formatter.should have_interface_for(:dump_summary).with(0).arguments
-  end
-
-  it "has dump_pending as an interface with zero arguments" do
-    formatter.should have_interface_for(:dump_pending).with(0).arguments
-  end
-
-  it "has close as an interface with zero arguments" do
-    formatter.should have_interface_for(:close).with(0).arguments
-  end
-  
-  describe '#format_backtrace' do
-    it "displays the full backtrace when the example is given the :full_backtrace => true option", :full_backtrace => true
-  end
-
   describe "backtrace_line" do
     it "trims current working directory" do
       formatter.__send__(:backtrace_line, File.expand_path(__FILE__)).should == "./spec/rspec/core/formatters/base_formatter_spec.rb"
     end
   end
-  
+
 end

data/spec/rspec/core/formatters/base_text_formatter_spec.rb

@@ -27,15 +27,16 @@ module RSpec::Core::Formatters
     end
 
     describe "#dump_failures" do
-      it "preserves formatting" do 
+      it "preserves formatting" do
         output = StringIO.new
-        group = RSpec::Core::ExampleGroup.describe
-        example = group.example { "this".should eq("that") }
+        group = RSpec::Core::ExampleGroup.describe("group name")
+        example = group.example("example name") { "this".should eq("that") }
         formatter = RSpec::Core::Formatters::BaseTextFormatter.new(output)
         group.run_all(formatter)
 
         RSpec.configuration.stub(:color_enabled?) { false }
         formatter.dump_failures
+        output.string.should =~ /group name example name/m
         output.string.should =~ /(\s+)expected \"that\"\n\1     got \"this\"/m
       end
     end

data/spec/rspec/core/formatters/documentation_formatter_spec.rb

@@ -19,7 +19,7 @@ module RSpec::Core::Formatters
       RSpec.configuration.stub(:color_enabled?) { false }
 
       formatter = RSpec::Core::Formatters::DocumentationFormatter.new(output)
-      
+
       examples.each {|e| formatter.example_failed(e) }
 
       output.string.should =~ /first example \(FAILED - 1\)/m

data/spec/rspec/core/formatters/helpers_spec.rb

@@ -39,8 +39,8 @@ describe RSpec::Core::Formatters::Helpers do
         helper.format_seconds(5.0).should == "5"
       end
 
-    end    
+    end
   end
 
-  
+
 end

data/spec/rspec/core/formatters/html_formatted-1.8.7.html

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html 
+<!DOCTYPE html
   PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">

data/spec/rspec/core/formatters/html_formatted-1.9.1.html

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html 
+<!DOCTYPE html
   PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">

data/spec/rspec/core/formatters/html_formatted-1.9.2.html

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html 
+<!DOCTYPE html
   PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">

data/spec/rspec/core/formatters/progress_formatter_spec.rb

@@ -2,28 +2,29 @@ require 'spec_helper'
 require 'stringio'
 
 describe RSpec::Core::Formatters::ProgressFormatter do
-  
+
    before do
      @output = StringIO.new
      @formatter = RSpec::Core::Formatters::ProgressFormatter.new(@output)
      @formatter.start(2)
      @formatter.stub!(:color_enabled?).and_return(false)
    end
-   
+
    it "should produce line break on start dump" do
-     @formatter.start_dump(3)
+     @formatter.start_dump
      @output.string.should == "\n"
    end
-   
+
    it "should produce standard summary without pending when pending has a 0 count" do
-     @formatter.start_dump(3)
-     @formatter.dump_summary
-     @output.string.should =~ /Finished in 3 seconds\n2 examples/i
+     @formatter.start_dump
+     @formatter.dump_summary(0.00001, 2, 0, 0)
+     @output.string.should =~ /2 examples, 0 failures/i
+     @output.string.should_not =~ /0 pending/i
    end
-   
+
    it "should push nothing on start" do
      @formatter.start(4)
      @output.string.should == ""
    end
-   
+
 end