rspec 1.1.12 → 1.2.0

data/spec/spec/mocks/partial_mock_spec.rb

@@ -128,19 +128,34 @@ module Spec
 
       it 'should keep public methods public' do
         @object.should_receive(:public_method)
-        @object.public_methods.should include('public_method')
+        with_ruby('1.9') do
+          @object.public_methods.should include(:public_method)
+        end
+        with_ruby('1.8') do
+          @object.public_methods.should include('public_method')
+        end
         @object.public_method
       end
 
       it 'should keep private methods private' do
         @object.should_receive(:private_method)
-        @object.private_methods.should include('private_method')
+        with_ruby('1.9') do
+          @object.private_methods.should include(:private_method)
+        end
+        with_ruby('1.8') do
+          @object.private_methods.should include('private_method')
+        end
         @object.public_method
       end
 
       it 'should keep protected methods protected' do
         @object.should_receive(:protected_method)
-        @object.protected_methods.should include('protected_method')
+        with_ruby('1.9') do
+          @object.protected_methods.should include(:protected_method)
+        end
+        with_ruby('1.8') do
+          @object.protected_methods.should include('protected_method')
+        end
         @object.public_method
       end
 

data/spec/spec/mocks/{passing_mock_argument_constraints_spec.rb → passing_argument_matchers_spec.rb}

@@ -2,7 +2,7 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Mocks
-    describe "mock argument constraints", :shared => true do
+    describe "mock argument matchers", :shared => true do
       before(:each) do
         @mock = Mock.new("test mock")
         Kernel.stub!(:warn)
@@ -13,8 +13,8 @@ module Spec
       end
     end
     
-    describe Methods, "handling argument constraints" do
-      it_should_behave_like "mock argument constraints"
+    describe Methods, "handling argument matchers" do
+      it_should_behave_like "mock argument matchers"
 
       it "should accept true as boolean()" do
         @mock.should_receive(:random_call).with(boolean())
@@ -88,8 +88,8 @@ module Spec
         
     end
 
-    describe Methods, "handling block constraints" do
-      it_should_behave_like "mock argument constraints"
+    describe Methods, "handling block matchers" do
+      it_should_behave_like "mock argument matchers"
       
       it "should match arguments against RSpec expectations" do
         @mock.should_receive(:random_call).with {|arg1, arg2, arr, *rest|
@@ -103,7 +103,7 @@ module Spec
       end
     end
     
-    describe Methods, "handling non-constraint arguments" do
+    describe Methods, "handling non-matcher arguments" do
       
       before(:each) do
         @mock = Mock.new("test mock")

data/spec/spec/mocks/stubbed_message_expectations_spec.rb

@@ -3,12 +3,24 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 module Spec
   module Mocks
     describe "Example with stubbed and then called message" do
-      it "should fail if the message is expected and then subsequently not called again" do
+      it "fails if the message is expected and then subsequently not called again" do
         mock_obj = mock("mock", :msg => nil)
         mock_obj.msg
         mock_obj.should_receive(:msg)
         lambda { mock_obj.rspec_verify }.should raise_error(Spec::Mocks::MockExpectationError)
       end
+
+      it "outputs arguments of all similar calls" do
+        m = mock('mock', :foo => true)
+        m.should_receive(:foo).with('first')
+        m.foo('second')
+        m.foo('third')
+        lambda do
+          m.rspec_verify
+        end.should raise_error(%q|Mock 'mock' expected :foo with ("first") but received it with (["second"], ["third"])|)
+        m.rspec_reset
+      end
     end
+    
   end
 end

data/spec/spec/package/bin_spec_spec.rb

@@ -5,7 +5,7 @@ describe "The bin/spec script" do
   include RubyForker
   
   it "should have no warnings" do
-    pending "Hangs on JRuby" if PLATFORM =~ /java/
+    pending "Hangs on JRuby" if RUBY_PLATFORM =~ /java/
     spec_path = "#{File.dirname(__FILE__)}/../../../bin/spec"
 
     output = ruby "-w #{spec_path} --help 2>&1"
@@ -13,7 +13,7 @@ describe "The bin/spec script" do
   end
   
   it "should show the help w/ no args" do
-    pending "Hangs on JRuby" if PLATFORM =~ /java/
+    pending "Hangs on JRuby" if RUBY_PLATFORM =~ /java/
     spec_path = "#{File.dirname(__FILE__)}/../../../bin/spec"
 
     output = ruby "-w #{spec_path} 2>&1"

data/spec/spec/runner/configuration_spec.rb

@@ -7,27 +7,27 @@ module Spec
         with_sandboxed_config do
           describe "#mock_with" do
             it "should default mock framework to rspec" do
-              config.mock_framework.should =~ /\/adapters\/mock_frameworks\/rspec$/
+              config.mock_framework.should =~ /\/spec\/adapters\/mock_frameworks\/rspec$/
             end
 
             it "should set rspec mocking explicitly" do
               config.mock_with(:rspec)
-              config.mock_framework.should =~ /\/adapters\/mock_frameworks\/rspec$/
+              config.mock_framework.should =~ /\/spec\/adapters\/mock_frameworks\/rspec$/
             end
 
             it "should set mocha" do
               config.mock_with(:mocha)
-              config.mock_framework.should =~ /\/adapters\/mock_frameworks\/mocha$/
+              config.mock_framework.should =~ /\/spec\/adapters\/mock_frameworks\/mocha$/
             end
 
             it "should set flexmock" do
               config.mock_with(:flexmock)
-              config.mock_framework.should =~ /\/adapters\/mock_frameworks\/flexmock$/
+              config.mock_framework.should =~ /\/spec\/adapters\/mock_frameworks\/flexmock$/
             end
 
             it "should set rr" do
               config.mock_with(:rr)
-              config.mock_framework.should =~ /\/adapters\/mock_frameworks\/rr$/
+              config.mock_framework.should =~ /\/spec\/adapters\/mock_frameworks\/rr$/
             end
 
             it "should set an arbitrary adapter module" do
@@ -40,7 +40,7 @@ module Spec
           describe "#include" do
           
             before(:each) do
-              @example_group_class = Class.new(ExampleGroup) {}
+              @example_group_class = Class.new(::Spec::Example::ExampleGroupDouble) {}
               Spec::Example::ExampleGroupFactory.register(:foobar, @example_group_class)
             end
 
@@ -58,7 +58,7 @@ module Spec
 
             it "should not include modules in a type they are not intended for" do
               mod = Module.new
-              @other_example_group_class = Class.new(ExampleGroup)
+              @other_example_group_class = Class.new(::Spec::Example::ExampleGroupDouble)
               Spec::Example::ExampleGroupFactory.register(:baz, @other_example_group_class)
 
               config.include mod, :type => :foobar
@@ -68,7 +68,7 @@ module Spec
             
             it "accepts an Array of types" do
               mod = Module.new
-              @other_example_group_class = Class.new(ExampleGroup)
+              @other_example_group_class = Class.new(::Spec::Example::ExampleGroupDouble)
               Spec::Example::ExampleGroupFactory.register(:baz, @other_example_group_class)
 
               config.include mod, :type => [:foobar, :baz]
@@ -82,7 +82,7 @@ module Spec
           describe "#extend" do
         
             before(:each) do
-              @example_group_class = Class.new(ExampleGroup) {}
+              @example_group_class = Class.new(::Spec::Example::ExampleGroupDouble) {}
               Spec::Example::ExampleGroupFactory.register(:foobar, @example_group_class)
             end
 
@@ -99,7 +99,7 @@ module Spec
             end
       
             it "should not extend non-specified groups" do
-              @other_example_group_class = Class.new(ExampleGroup)
+              @other_example_group_class = Class.new(::Spec::Example::ExampleGroupDouble)
               Spec::Example::ExampleGroupFactory.register(:baz, @other_example_group_class)
 
               mod = Module.new
@@ -114,9 +114,9 @@ module Spec
         describe "ordering methods: " do
         
           before(:each) do
-            @special_example_group = Class.new(ExampleGroup).describe("special_example_group")
+            @special_example_group = Class.new(::Spec::Example::ExampleGroupDouble).describe("special_example_group")
             @special_child_example_group = Class.new(@special_example_group).describe("special_child_example_group")
-            @nonspecial_example_group = Class.new(ExampleGroup).describe("nonspecial_example_group")
+            @nonspecial_example_group = Class.new(::Spec::Example::ExampleGroupDouble).describe("nonspecial_example_group")
             Spec::Example::ExampleGroupFactory.register(:special, @special_example_group)
             Spec::Example::ExampleGroupFactory.register(:special_child, @special_child_example_group)
             Spec::Example::ExampleGroupFactory.register(:non_special, @nonspecial_example_group)

data/spec/spec/runner/drb_command_line_spec.rb

@@ -2,96 +2,94 @@ require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
 module Spec
   module Runner
-    describe DrbCommandLine, "without running local server" do
-      unless jruby?
-        it "should print error when there is no running local server" do
-          err = StringIO.new
-          out = StringIO.new
-          DrbCommandLine.run(OptionParser.parse(['--version'], err, out))
+    unless jruby?
+      describe DrbCommandLine do
 
-          err.rewind
-          err.read.should =~ /No server is running/
-        end
-      end    
-    end
+        context "without server running" do
+          it "should print error when there is no running local server" do
+            err = out = StringIO.new
+            DrbCommandLine.run(OptionParser.parse(['--version'], err, out))
 
-    describe "with local server" do
+            err.rewind
+            err.read.should =~ /No server is running/
+          end
+        end    
 
-      class ::CommandLineForSpec
-        def self.run(argv, stderr, stdout)
-          orig_options = Spec::Runner.options
-          tmp_options = OptionParser.parse(argv, stderr, stdout)
-          Spec::Runner.use tmp_options
-          Spec::Runner::CommandLine.run(tmp_options)
-        ensure
-          Spec::Runner.use orig_options
-        end
-      end
-      
-      unless jruby?
-        before(:all) do
-          DRb.start_service("druby://127.0.0.1:8989", ::CommandLineForSpec)
-          @@drb_example_file_counter = 0
-        end
+        context "with server running" do
+          class ::CommandLineForDrbSpec
+            def self.run(argv, stderr, stdout)
+              orig_options = Spec::Runner.options
+              tmp_options = Spec::Runner::OptionParser.parse(argv, stderr, stdout)
+              Spec::Runner.use tmp_options
+              Spec::Runner::CommandLine.run(tmp_options)
+            ensure
+              Spec::Runner.use orig_options
+            end
+          end
 
-        before(:each) do
-          create_dummy_spec_file
-          @@drb_example_file_counter = @@drb_example_file_counter + 1
-        end
+          before(:all) do
+            DRb.start_service("druby://127.0.0.1:8989", ::CommandLineForDrbSpec)
+            @@drb_example_file_counter = 0
+          end
 
-        after(:each) do
-          File.delete(@dummy_spec_filename)
-        end
+          before(:each) do
+            create_dummy_spec_file
+            @@drb_example_file_counter = @@drb_example_file_counter + 1
+          end
 
-        after(:all) do
-          DRb.stop_service
-        end
+          after(:each) do
+            File.delete(@dummy_spec_filename)
+          end
 
-        it "should run against local server" do
-          out = run_spec_via_druby(['--version'])
-          out.should =~ /rspec \d+\.\d+\.\d+.*/n
-        end
+          after(:all) do
+            DRb.stop_service
+          end
 
-        it "should output green colorized text when running with --colour option" do
-          out = run_spec_via_druby(["--colour", @dummy_spec_filename])
-          out.should =~ /\e\[32m/n
-        end
+          it "should run against local server" do
+            out = run_spec_via_druby(['--version'])
+            out.should =~ /rspec \d+\.\d+\.\d+.*/n
+          end
 
-        it "should output red colorized text when running with -c option" do
-          out = run_spec_via_druby(["-c", @dummy_spec_filename])
-          out.should =~ /\e\[31m/n
-        end
+          it "should output green colorized text when running with --colour option" do
+            out = run_spec_via_druby(["--colour", @dummy_spec_filename])
+            out.should =~ /\e\[32m/n
+          end
 
-        def create_dummy_spec_file
-          @dummy_spec_filename = File.expand_path(File.dirname(__FILE__)) + "/_dummy_spec#{@@drb_example_file_counter}.rb"
-          File.open(@dummy_spec_filename, 'w') do |f|
-            f.write %{
-              describe "DUMMY CONTEXT for 'DrbCommandLine with -c option'" do
-                it "should be output with green bar" do
-                  true.should be_true
-                end
+          it "should output red colorized text when running with -c option" do
+            out = run_spec_via_druby(["-c", @dummy_spec_filename])
+            out.should =~ /\e\[31m/n
+          end
+
+          def create_dummy_spec_file
+            @dummy_spec_filename = File.expand_path(File.dirname(__FILE__)) + "/_dummy_spec#{@@drb_example_file_counter}.rb"
+            File.open(@dummy_spec_filename, 'w') do |f|
+              f.write %{
+                describe "DUMMY CONTEXT for 'DrbCommandLine with -c option'" do
+                  it "should be output with green bar" do
+                    true.should be_true
+                  end
 
-                it "should be output with red bar" do
-                  violated("I want to see a red bar!")
+                  it "should be output with red bar" do
+                    violated("I want to see a red bar!")
+                  end
                 end
-              end
-            }
+              }
+            end
           end
-        end
 
-        def run_spec_via_druby(argv)
-          err, out = StringIO.new, StringIO.new
-          out.instance_eval do
-            def tty?; true end
+          def run_spec_via_druby(argv)
+            err, out = StringIO.new, StringIO.new
+            out.instance_eval do
+              def tty?; true end
+            end
+            options = ::Spec::Runner::Options.new(err, out)
+            options.argv = argv
+            Spec::Runner::DrbCommandLine.run(options)
+            out.rewind; out.read
           end
-          options = ::Spec::Runner::Options.new(err, out)
-          options.argv = argv
-          Spec::Runner::DrbCommandLine.run(options)
-          out.rewind; out.read
         end
+
       end
-      
     end
-
   end
 end

data/spec/spec/runner/formatter/base_text_formatter_spec.rb

@@ -1,6 +1,5 @@
 require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'spec/runner/formatter/base_text_formatter'
-require 'fileutils'
 
 module Spec
   module Runner
@@ -16,7 +15,89 @@ module Spec
           File.stub!(:open)
           BaseTextFormatter.new({},"#{@sandbox}/temp.rb")
         end
+        
+        context "(deprecations)" do
+          before(:each) do
+            Kernel.stub!(:warn)
+            @io = StringIO.new
+            @options = mock('options')
+            @options.stub!(:dry_run).and_return(false)
+            @options.stub!(:colour).and_return(false)
+            @options.stub!(:autospec).and_return(false)
+            @formatter = Class.new(BaseTextFormatter) do
+              def method_that_class_magenta(message)
+                magenta(message)
+              end
+              def method_that_class_colourise(message, failure)
+                colourise(message, failure)
+              end
+            end.new(@options, @io)
+            @failure = stub('failure', :pending_fixed? => false)
+          end
+          
+          context "#colourise" do
+            it "warns when subclasses call colourise" do
+              Kernel.should_receive(:warn).with(/DEPRECATED/)
+              @formatter.method_that_class_colourise('this message', @failure)
+            end
+            
+            it "delegates to colorize_failure" do
+              @formatter.should_receive(:colorize_failure).with('this message', @failure)
+              @formatter.colourise('this message', @failure)
+            end
+          end
+          
+          context "#magenta" do
+            it "warns when subclasses call magenta" do
+              Kernel.should_receive(:warn).with(/DEPRECATED/)
+              @formatter.method_that_class_magenta('this message')
+            end
 
+            it "delegates to red" do
+              @formatter.should_receive(:red).with('this message')
+              @formatter.method_that_class_magenta('this message')
+            end
+          end
+          
+        end
+        
+        describe "#colour (protected)" do
+          before(:each) do
+            @original_RSPEC_COLOR = ENV['RSPEC_COLOR']
+          end
+          
+          it "colorizes when colour? and output_to_tty? return true" do
+            out = StringIO.new
+            options = stub('options', :colour => true, :autospec => false)
+            formatter = BaseTextFormatter.new(options,out)
+            formatter.stub!(:output_to_tty?).and_return(true)
+            formatter.__send__(:colour, 'foo', "\e[32m").should == "\e[32mfoo\e[0m"
+          end
+          
+          it "colorizes when ENV['RSPEC_COLOR'] is set even if colour? and output_to_tty? return false" do
+            out = StringIO.new
+            options = stub('options', :colour => false)
+            formatter = BaseTextFormatter.new(options,out)
+            formatter.stub!(:output_to_tty?).and_return(false)
+            
+            ENV['RSPEC_COLOR'] = 'true'
+            
+            formatter.__send__(:colour, 'foo', "\e[32m").should == "\e[32mfoo\e[0m"
+          end
+          
+          it "colorizes when autospec? is true even if colour? and output_to_tty? return false" do
+            out = StringIO.new
+            options = stub('options', :colour => true, :autospec => true)
+            formatter = BaseTextFormatter.new(options,out)
+            formatter.stub!(:output_to_tty?).and_return(false)
+            
+            formatter.__send__(:colour, 'foo', "\e[32m").should == "\e[32mfoo\e[0m"
+          end
+          
+          after(:each) do
+            ENV['RSPEC_COLOR'] = @original_RSPEC_COLOR
+          end
+        end
       end
     end
   end