rspec 1.2.6 → 1.2.7

data/spec/spec/matchers/operator_matcher_spec.rb

@@ -33,7 +33,7 @@ describe "should_not ==" do
   
   it "should return true on success" do
     subject = "apple"
-    (subject.should_not == "orange").should be_true
+    (subject.should_not == "orange").should be_false
   end
 
   it "should fail when target.==(actual) returns false" do

data/spec/spec/mocks/bug_report_10263_spec.rb

@@ -7,7 +7,10 @@ describe "Mock" do
     @mock.should_receive(:msg) do |b|
       b.should be_true #this call exposes the problem
     end
-    @mock.msg(false) rescue nil
+    begin
+      @mock.msg(false)
+    rescue Exception
+    end
   end
   
   specify "then the next example should behave as expected instead of saying" do

data/spec/spec/mocks/bug_report_830_spec.rb

@@ -0,0 +1,21 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe 'Calling a method that catches StandardError' do
+      class Foo
+        def self.foo
+          bar
+        rescue StandardError
+        end
+      end
+
+      it 'still reports mock failures' do
+        Foo.should_not_receive :bar
+        lambda do
+          Foo.foo
+        end.should raise_error(MockExpectationError)
+      end
+    end
+  end
+end

data/spec/spec/mocks/options_hash_spec.rb

@@ -8,7 +8,7 @@ module Spec
           mock = Spec::Mocks::Mock.new("a mock")
           mock.should_receive(:message, :expected_from => "/path/to/blah.ext:37")
           mock.rspec_verify
-        rescue => e
+        rescue Exception => e
         ensure
           e.backtrace.to_s.should =~ /\/path\/to\/blah.ext:37/m
         end

data/spec/spec/mocks/stub_chain_spec.rb

@@ -22,6 +22,13 @@ module Spec
         @subject.msg1.msg2.msg3.msg4.should equal(:return_value)
       end
 
+      it "returns expected value from chaining four method calls twice with some shared" do
+        @subject.stub_chain(:msg1, :msg2, :msg3, :msg4).and_return(:first)
+        @subject.stub_chain(:msg5, :msg2, :msg3, :msg4).and_return(:second)
+
+        @subject.msg1.msg2.msg3.msg4.should equal(:first)
+        @subject.msg5.msg2.msg3.msg4.should equal(:second)
+      end
     end
   end
 end

data/spec/spec/mocks/stub_implementation_spec.rb

@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+
+module Spec
+  module Mocks
+    describe "stub implementation" do
+      context "with no args" do
+        it "execs the block when called" do
+          obj = stub()
+          obj.stub(:foo) { :bar }
+          obj.foo.should == :bar
+        end
+      end
+
+      context "with one arg" do
+        it "execs the block with that arg when called" do
+          obj = stub()
+          obj.stub(:foo) {|given| given}
+          obj.foo(:bar).should == :bar
+        end
+      end
+
+      context "with variable args" do
+        it "execs the block when called" do
+          obj = stub()
+          obj.stub(:foo) {|*given| given.first}
+          obj.foo(:bar).should == :bar
+        end
+      end
+    end
+  end
+end

data/spec/spec/rake/spectask_spec.rb

@@ -0,0 +1,150 @@
+require File.dirname(__FILE__) + '/../../spec_helper.rb'
+require File.dirname(__FILE__) + '/../../../lib/spec/rake/spectask.rb'
+
+module Spec
+  module Rake
+
+    class MockTask
+      class << self
+        attr_accessor :last_instance, :last_cmd
+      end
+
+      def self.tasks
+        @tasks ||= {}
+      end
+      
+      def self.reset_tasks
+        @tasks = {}
+      end
+      
+      def self.task(name)
+        tasks[name]
+      end
+      
+      def self.register_task(name, block)
+        tasks[name] = block
+      end
+
+      def initialize(name, &block)
+        MockTask.register_task(name, block)
+        MockTask.last_instance = block
+      end
+      
+      def self.create_task(name, &block)
+        new(name, &block)
+      end
+    end
+
+    class SpecTask
+      def task(name, &block)
+        MockTask.create_task(name, &block)
+      end
+
+      def system(cmd)
+        MockTask.last_cmd = cmd
+        true
+      end
+
+      def default_ruby_path
+        RUBY
+      end
+    end
+    
+    describe SpecTask do
+
+      before(:each) do
+        MockTask.reset_tasks
+      end
+
+      it "should execute rake's ruby path by default" do
+        task = SpecTask.new
+        MockTask.last_instance.call
+        MockTask.last_cmd.should match(/^#{task.default_ruby_path} /)
+      end
+
+      it "should execute the command with system if ruby_cmd is specified" do
+        task = SpecTask.new {|t| t.ruby_cmd = "path_to_multiruby"}
+        task.should_receive(:system).and_return(true)
+        MockTask.last_instance.call
+      end
+
+      it "should execute the ruby_cmd path if specified" do
+        SpecTask.new {|t| t.ruby_cmd = "path_to_multiruby"}
+        MockTask.last_instance.call
+        MockTask.last_cmd.should match(/^path_to_multiruby /)
+      end
+      
+      it "should produce a deprecation warning if the out option is used" do
+        SpecTask.new {|t| t.out = "somewhere_over_the_rainbow"}
+        STDERR.should_receive(:puts).with("The Spec::Rake::SpecTask#out attribute is DEPRECATED and will be removed in a future version. Use --format FORMAT:WHERE instead.")
+        MockTask.last_instance.call
+      end
+      
+      it "should produce an error if failure_message is set and the command fails" do
+        task = SpecTask.new {|t| t.failure_message = "oops"; t.fail_on_error = false}
+        STDERR.should_receive(:puts).with("oops")
+        task.stub(:system).and_return(false)
+        MockTask.last_instance.call
+      end
+      
+      it "should raise if fail_on_error is set and the command fails" do
+        task = SpecTask.new
+        task.stub(:system).and_return(false)
+        lambda {MockTask.last_instance.call}.should raise_error
+      end
+      
+      it "should not raise if fail_on_error is not set and the command fails" do
+        task = SpecTask.new {|t| t.fail_on_error = false}
+        task.stub(:system).and_return(false)
+        lambda {MockTask.last_instance.call}.should_not raise_error
+      end
+      
+      context "with ENV['SPEC'] set" do
+        before(:each) do
+          @orig_env_spec = ENV['SPEC']
+          ENV['SPEC'] = 'foo.rb'
+        end
+        after(:each) do
+          ENV['SPEC'] = @orig_env_spec
+        end
+        it "should use the provided file list" do
+          task = SpecTask.new
+          task.spec_file_list.should == ["foo.rb"]
+        end
+      end
+      
+      context "with the rcov option" do
+        
+        it "should create a clobber_rcov task" do
+          MockTask.stub!(:create_task)
+          MockTask.should_receive(:create_task).with(:clobber_rcov)
+          SpecTask.new(:rcov) {|t| t.rcov = true}
+        end
+
+        it "should setup the clobber_rcov task to remove the rcov directory" do
+          task = SpecTask.new(:rcov) {|t| t.rcov = true; t.rcov_dir = "path_to_rcov_directory"}
+          task.should_receive(:rm_r).with("path_to_rcov_directory")
+          MockTask.task(:clobber_rcov).call
+        end
+
+        it "should make the clobber task depend on clobber_rcov" do
+          MockTask.stub!(:create_task)
+          MockTask.should_receive(:create_task).with(:clobber => [:clobber_rcov])
+          SpecTask.new(:rcov) {|t| t.rcov = true}
+        end
+
+        it "should make the rcov task depend on clobber_rcov" do
+          MockTask.stub!(:create_task)
+          MockTask.should_receive(:create_task).with(:rcov => :clobber_rcov)
+          SpecTask.new(:rcov) {|t| t.rcov = true}
+        end
+        
+        it "creates an rcov options list" do
+          MockTask.stub!(:create_task)
+          task = SpecTask.new(:rcov) {|t| t.rcov = true, t.rcov_opts = ['a','b']}
+          task.rcov_option_list.should == "a b"
+        end
+      end
+    end
+  end
+end

data/spec/spec/runner/{spec_parser/spec_parser_fixture.rb → line_number_query/line_number_query_fixture.rb}

@@ -20,24 +20,24 @@ describe "d" do
 
 end
 
-class SpecParserSubject
+class LineNumberQuerySubject
 end
 
-describe SpecParserSubject do
+describe LineNumberQuerySubject do
 
   it "5" do
   end
 
 end
 
-describe SpecParserSubject, "described" do
+describe LineNumberQuerySubject, "described" do
 
   it "6" do
   end
 
 end
 
-describe SpecParserSubject, "described", :something => :something_else do
+describe LineNumberQuerySubject, "described", :something => :something_else do
 
    it "7" do
    end

data/spec/spec/runner/{spec_parser_spec.rb → line_number_query_spec.rb}

@@ -1,12 +1,12 @@
 require File.dirname(__FILE__) + '/../../spec_helper.rb'
 
-describe "SpecParser" do
+describe "LineNumberQuery" do
   with_sandboxed_options do    
     attr_reader :parser, :file
     
     before do
-      @parser = Spec::Runner::SpecParser.new(options)
-      @file = "#{File.dirname(__FILE__)}/spec_parser/spec_parser_fixture.rb"
+      @parser = Spec::Runner::LineNumberQuery.new(options)
+      @file = "#{File.dirname(__FILE__)}/line_number_query/line_number_query_fixture.rb"
       load file
     end
 
@@ -43,27 +43,27 @@ describe "SpecParser" do
     end
 
     it "should find context name for type" do
-      parser.spec_name_for(file, 26).should == "SpecParserSubject"
+      parser.spec_name_for(file, 26).should == "LineNumberQuerySubject"
     end
 
     it "should find context and spec name for type" do
-      parser.spec_name_for(file, 28).should == "SpecParserSubject 5"
+      parser.spec_name_for(file, 28).should == "LineNumberQuerySubject 5"
     end
 
     it "should find context and description for type" do
-      parser.spec_name_for(file, 33).should == "SpecParserSubject described"
+      parser.spec_name_for(file, 33).should == "LineNumberQuerySubject described"
     end
 
     it "should find context and description and example for type" do
-      parser.spec_name_for(file, 36).should == "SpecParserSubject described 6"
+      parser.spec_name_for(file, 36).should == "LineNumberQuerySubject described 6"
     end
 
     it "should find context and description for type with modifications" do
-      parser.spec_name_for(file, 40).should == "SpecParserSubject described"
+      parser.spec_name_for(file, 40).should == "LineNumberQuerySubject described"
     end
 
     it "should find context and described and example for type with modifications" do
-      parser.spec_name_for(file, 43).should == "SpecParserSubject described 7"
+      parser.spec_name_for(file, 43).should == "LineNumberQuerySubject described 7"
     end
 
     it "should find example group" do
@@ -91,9 +91,30 @@ describe "SpecParser" do
       options = stub('options', :example_groups => [
         stub('example_group', :location => nil)
       ])
-      parser = Spec::Runner::SpecParser.new(options)
+      parser = Spec::Runner::LineNumberQuery.new(options)
       parser.spec_name_for('foo',37).should == nil
     end
 
+    describe "#example_line_for" do
+      it "should find example declared on same line" do
+        parser.example_line_for(file, 5).should == 5
+      end
+
+      it "should find example declared on the line above, while still inside the example" do
+        parser.example_line_for(file, 6).should == 5
+      end
+
+      it "should find example declared from empty line below the example" do
+        parser.example_line_for(file, 7).should == 5
+      end
+
+      it "should find the group declared on the same line" do
+        parser.example_line_for(file, 3).should == 3
+      end
+
+      it "should find the group declared above the first example" do
+        parser.example_line_for(file, 4).should == 3
+      end
+    end
   end
 end

data/spec/spec/runner/option_parser_spec.rb

@@ -267,7 +267,7 @@ describe "OptionParser" do
     attr_reader :file, :dir
     before(:each) do
       @original_rspec_options = Spec::Runner.options
-      @file = "#{File.dirname(__FILE__)}/spec_parser/spec_parser_fixture.rb"
+      @file = "#{File.dirname(__FILE__)}/line_number_query/line_number_query_fixture.rb"
       @dir = File.dirname(file)
     end
   

data/spec/spec/runner/options_spec.rb

@@ -19,26 +19,34 @@ module Spec
         Spec::Expectations.differ = nil
       end
       
+      describe "#require_ruby_debug" do
+        it "should require ruby-debug" do
+          @options.stub!(:require)
+          @options.should_receive(:require).with("ruby-debug")
+          @options.require_ruby_debug
+        end
+      end
+
       describe "#examples" do
         it "should default to empty array" do
           @options.examples.should == []
         end
       end
-      
+
       describe "#include_pattern" do
         it "should default to '**/*_spec.rb'" do
           @options.filename_pattern.should == "**/*_spec.rb"
         end
       end
-      
+
       describe "#files_to_load" do
-        
+
         it "should load files not following pattern if named explicitly" do
           file = File.expand_path(File.dirname(__FILE__) + "/resources/a_bar.rb")
           @options.files << file
           @options.files_to_load.should include(file)
         end
-        
+
         describe "with default --pattern" do
           it "should load files named _spec.rb" do
             dir = File.expand_path(File.dirname(__FILE__) + "/resources/")
@@ -46,33 +54,33 @@ module Spec
             @options.files_to_load.should == ["#{dir}/a_spec.rb"]
           end
         end
-        
+
         describe "with explicit pattern (single)" do
           before(:each) do
             @options.filename_pattern = "**/*_foo.rb"
           end
-        
+
           it "should load files following pattern" do
             file = File.expand_path(File.dirname(__FILE__) + "/resources/a_foo.rb")
             @options.files << file
             @options.files_to_load.should include(file)
           end
-        
+
           it "should load files in directories following pattern" do
             dir = File.expand_path(File.dirname(__FILE__) + "/resources")
             @options.files << dir
             @options.files_to_load.should include("#{dir}/a_foo.rb")
           end
-        
+
           it "should not load files in directories not following pattern" do
             dir = File.expand_path(File.dirname(__FILE__) + "/resources")
             @options.files << dir
             @options.files_to_load.should_not include("#{dir}/a_bar.rb")
           end
         end
-        
+
         describe "with explicit pattern (comma,separated,values)" do
-          
+
           before(:each) do
             @options.filename_pattern = "**/*_foo.rb,**/*_bar.rb"
           end
@@ -83,16 +91,16 @@ module Spec
             @options.files_to_load.should include("#{dir}/a_foo.rb")
             @options.files_to_load.should include("#{dir}/a_bar.rb")
           end
-        
+
           it "should support comma separated values with spaces" do
             dir = File.expand_path(File.dirname(__FILE__) + "/resources")
             @options.files << dir
             @options.files_to_load.should include("#{dir}/a_foo.rb")
             @options.files_to_load.should include("#{dir}/a_bar.rb")
           end
-        
+
         end
-      
+
       end
 
       describe "#backtrace_tweaker" do
@@ -106,7 +114,7 @@ module Spec
           @options.dry_run.should == false
         end
       end
-      
+
       describe "#debug" do
         it "should default to false" do
           @options.debug.should == false
@@ -228,7 +236,7 @@ module Spec
           @options.run_examples.should be_true
         end
       end
-      
+
       describe "debug option not specified" do
         it "should not cause ruby_debug to be required" do
           @options.debug = false
@@ -236,7 +244,7 @@ module Spec
           @options.run_examples.should be_true
         end
       end
-      
+
       describe "#load_class" do
         it "should raise error when not class name" do
           lambda do
@@ -251,7 +259,7 @@ module Spec
           @options.reporter.options.should === @options
         end
       end
-      
+
       describe "#number_of_examples" do
         context "when --example is parsed" do
           it "provides the number of examples parsed instead of the total number of examples collected" do
@@ -339,16 +347,16 @@ module Spec
             Spec::Runner.configuration.stub!(:predicate_matchers).and_return({:this => :that?})
             group = Class.new(::Spec::Example::ExampleGroupDouble).describe("Some Examples")
             example = group.new(::Spec::Example::ExampleProxy.new)
-            
+
             @options.run_examples
             example.this
           end
-          
+
           after(:each) do
             Spec::Example::ExampleMethods.class_eval "undef :this"
           end
         end
-        
+
         describe "with a mock framework defined as a Symbol" do
           it "includes Spec::Adapters::MockFramework" do
             Spec::Runner.configuration.stub!(:mock_framework).and_return('spec/adapters/mock_frameworks/rspec')
@@ -358,7 +366,7 @@ module Spec
             @options.run_examples
           end
         end
-        
+
         describe "with a mock framework defined as a Module" do
           it "includes the module in ExampleMethods" do
             mod = Module.new
@@ -367,7 +375,7 @@ module Spec
             @options.run_examples
           end
         end
-        
+
         describe "when not given a custom runner" do
           it "should use the standard" do
             runner = ::Spec::Runner::ExampleGroupRunner.new(@options)
@@ -430,7 +438,7 @@ module Spec
               @options.after_suite_parts << lambda do |success|
                 success_result = success
               end
-              
+
               @options.run_examples
               success_result.should be_true
             end
@@ -457,12 +465,12 @@ module Spec
               @heckle_runner_mock = mock("HeckleRunner")
               @options.heckle_runner = @heckle_runner_mock
             end
-            
+
             it "should heckle" do
               @heckle_runner_mock.should_receive(:heckle_with)
               @options.run_examples
             end
-            
+
             it "shouldn't heckle recursively" do
               heckled = false
               @heckle_runner_mock.should_receive(:heckle_with) {