rspec 1.0.5 → 1.0.6

data/spec/autotest/rspec_spec.rb

@@ -0,0 +1,257 @@
+require File.dirname(__FILE__) + "/../autotest_helper"
+
+class Autotest
+  
+  module AutotestHelper
+    def rspec_output
+      <<-HERE
+.............PPF
+
+1)
+'false should be false' FAILED
+expected: true,
+     got: false (using ==)
+./spec/autotest/rspec_spec.rb:203:
+
+Finished in 0.158674 seconds
+
+16 examples, 1 failure, 2 pending
+
+Pending:
+Autotest::Rspec handling failed results should return an array of failed examples and errors (TODO)
+Autotest::Rspec tests/specs for a given file should find all the specs for a given file (TODO)
+HERE
+    end
+    
+    
+    def common_setup
+      @proc = mock Proc
+      @kernel = mock Kernel
+      @kernel.stub!(:proc).and_return @proc
+
+      File.stub!(:exists).and_return true
+      @windows_alt_separator = "\\"
+      @posix_separator = '/'
+
+      @rspec_output = rspec_output
+    end
+  end
+
+  describe Rspec, "rspec_commands" do
+    it "should contain the various commands, ordered by preference" do
+      Rspec.new.spec_commands.should == ["bin/spec", "#{Config::CONFIG['bindir']}/spec"]
+    end
+  end
+  
+  describe Rspec, "selection of rspec command" do
+    include AutotestHelper
+    
+    before :each do
+      common_setup
+      @rspec_autotest = Rspec.new(@kernel)
+    end
+    
+    it "should try to find the spec command if it exists in ./bin and use it above everything else" do
+      File.stub!(:exists?).and_return true
+
+      File.should_receive(:exists?).with("bin/spec").and_return true
+      @rspec_autotest.spec_command.should == "bin/spec"
+    end
+
+    it "should otherwise select the default spec command in gem_dir/bin/spec" do
+      @rspec_autotest.stub!(:spec_commands).and_return ["/opt/local/bin/spec"]
+      Config::CONFIG.stub!(:[]).and_return "/opt/local/bin"
+
+      @rspec_autotest.spec_command.should == "#{Config::CONFIG['bindir']}/spec"
+    end
+    
+    it "should raise an error if no spec command is found at all" do
+      File.stub!(:exists?).and_return false
+      
+      lambda {
+        @rspec_autotest.spec_command
+      }.should raise_error(RspecCommandError, "No spec command could be found!")
+    end
+    
+  end
+  
+  describe Rspec, "selection of rspec command (windows compatibility issues)" do
+    include AutotestHelper
+    
+    before :each do
+      common_setup
+    end
+    
+    it "should use the ALT_SEPARATOR if it is non-nil" do
+      @rspec_autotest = Rspec.new(@kernel, @posix_separator, @windows_alt_separator)
+      @rspec_autotest.stub!(:spec_commands).and_return [File.join('bin', 'spec')]
+      @rspec_autotest.spec_command.should == "bin\\spec"
+    end
+    
+    it "should not use the ALT_SEPATOR if it is nil" do
+      @windows_alt_separator = nil
+      @rspec_autotest = Rspec.new(@kernel, @posix_separator, @windows_alt_separator)
+      @rspec_autotest.stub!(:spec_commands).and_return [File.join('bin', 'spec')]
+      @rspec_autotest.spec_command.should == "bin/spec"
+    end
+  end
+
+  describe Rspec, "adding spec.opts --options" do 
+    before :each do
+      @rspec_autotest = Rspec.new
+    end
+
+    it "should return the command line option to add spec.opts if the options file exists" do
+      File.stub!(:exist?).and_return true
+      @rspec_autotest.add_options_if_present.should == "-O spec/spec.opts "
+    end
+
+    it "should return an empty string if no spec.opts exists" do
+      File.stub!(:exist?).and_return false
+      Rspec.new.add_options_if_present.should == ""
+    end
+  end  
+  
+  describe Rspec do
+    before :each do
+      @rspec_autotest = Rspec.new
+      @rspec_autotest.stub!(:ruby).and_return "ruby"
+      @rspec_autotest.stub!(:add_options_if_present).and_return "-O spec/spec.opts"
+      
+      @ruby = @rspec_autotest.ruby
+      @spec_command = @rspec_autotest.spec_command
+      @options = @rspec_autotest.add_options_if_present
+      @files_to_test = {
+        :spec => ["file_one", "file_two"]
+      }
+      # this is not the inner representation of Autotest!
+      @rspec_autotest.stub!(:files_to_test).and_return @files_to_test
+      @files_to_test.stub!(:keys).and_return @files_to_test[:spec]
+      @to_test = @files_to_test.keys.flatten.join ' '
+    end
+    
+    it "should make the apropriate test command" do
+      @rspec_autotest.make_test_cmd(@files_to_test).should == "#{@ruby} -S #{@spec_command} #{@options} #{@to_test}"
+    end
+  end
+  
+  describe Rspec, "test mappings" do
+    before :each do
+      @proc = mock Proc
+      @kernel = mock Kernel
+      @kernel.stub!(:proc).and_return @proc
+      @rspec_autotest = Rspec.new(@kernel)
+    end
+      
+    it "should map all filenames in spec/ which end in .rb" do
+      @rspec_autotest.test_mappings[%r%^spec/.*\.rb$%].should == @proc
+    end
+    
+    it "should map all names in lib which end in .rb to the corresponding ones in spec/" do
+      @rspec_autotest.test_mappings[%r%^lib/(.*)\.rb$%].should == @proc
+    end
+    
+    it "should find all files in spec/shares/* and the spec helper in spec/spec_helper"  do
+      @rspec_autotest.test_mappings[%r%^spec/(spec_helper|shared/.*)\.rb$%].should == @proc
+    end
+  end
+  
+  describe Rspec, "handling results" do
+    include AutotestHelper
+    
+    before :each do
+      common_setup
+      @rspec_autotest = Rspec.new(@kernel, @posix_separator, @windows_alt_separator)
+      @rspec_autotest.stub!(:hook)
+      
+      @results = mock String
+      @results.stub!(:scan).and_return ""
+    end
+    
+    it "should call hook(:red) if there are failures" do
+      @rspec_autotest.stub!(:consolidate_failures).and_return ["spec/some_spec.rb"]
+      
+      @rspec_autotest.should_receive(:hook).with(:red)
+      @rspec_autotest.handle_results(@results)
+    end
+    
+    it "should call hook(:green) if there are no failures" do
+      @rspec_autotest.stub!(:consolidate_failures).and_return []
+      @rspec_autotest.should_receive(:hook).with(:green)
+      @rspec_autotest.handle_results(@results)
+    end
+  end
+  
+  describe Rspec, "handling failed results" do
+    include AutotestHelper
+    
+    before :each do
+      common_setup
+    end
+    
+    it %(should scan the output into a multi-dimensional array, 
+        consisting of the failing spec's name as the first element, 
+        and the failure as the second) do
+      @rspec_autotest = Rspec.new
+      @rspec_autotest.failed_results(@rspec_output).should == [
+        [
+          "false should be false", 
+          "expected: true,\n     got: false (using ==)\n./spec/autotest/rspec_spec.rb:203:"
+        ]
+      ]
+    end
+  end
+  
+  describe Rspec, "specs for a given file" do
+    before :each do
+      @lib_file = "lib/something.rb"
+      @spec_file = "spec/something_spec.rb"
+      @rspec_autotest = Rspec.new
+
+      @rspec_autotest.instance_variable_set("@files", {@lib_file => Time.now, @spec_file => Time.now})
+      @rspec_autotest.stub!(:find_files_to_test).and_return true
+    end
+    
+    it "should find the spec file for a given lib file" do
+      @rspec_autotest.specs_for_file(@lib_file).should == [@spec_file]
+    end
+    
+    it "should find the spec file if given a spec file" do
+      @rspec_autotest.specs_for_file(@spec_file).should == [@spec_file]
+    end
+    
+    it "should only find the file if the file is being tracked (in @file)"  do
+      @other_file = "lib/some_non_tracked_file"
+      @rspec_autotest.specs_for_file(@other_file).should == []
+    end
+  end
+  
+  describe Rspec, "consolidating failures" do
+    include AutotestHelper
+    
+    before :each do
+      common_setup
+      @rspec_autotest = Rspec.new
+      
+      @spec_file = "./spec/autotest/rspec_spec.rb"
+      @rspec_autotest.instance_variable_set("@files", {@spec_file => Time.now})
+      @rspec_autotest.stub!(:find_files_to_test).and_return true
+    end
+    
+    it "should return no failures if no failures were given in the output" do
+      @rspec_autotest.stub!(:failed_results).and_return [[]]
+      @rspec_autotest.consolidate_failures(@rspec_autotest.failed_results).should == {}
+    end
+    
+    it "should return a hash with the spec filename => spec name for each failure or error" do
+      @rspec_autotest.stub!(:failed_results).and_return([
+        [
+          "false should be false", 
+          "expected: true,\n     got: false (using ==)\n./spec/autotest/rspec_spec.rb:203:"
+        ]
+      ])
+      @rspec_autotest.consolidate_failures(@rspec_autotest.failed_results).should == {@spec_file => ["false should be false"]}
+    end
+    
+  end
+end

data/spec/autotest_helper.rb

@@ -0,0 +1,4 @@
+require 'autotest'
+require File.dirname(__FILE__) + "/../lib/autotest/rspec"
+
+

data/spec/spec/dsl/behaviour_eval_spec.rb

@@ -45,5 +45,35 @@ module Spec
         count.should == 8
       end
     end
+    
+    describe BehaviourEval, "instance methods" do
+      it "should support pending" do
+        lambda {
+          pending("something")
+        }.should raise_error(Spec::DSL::ExamplePendingError, "something")
+      end
+
+      it "should have #pending raise a Pending error when its block fails" do
+        block_ran = false
+        lambda {
+          pending("something") do
+            block_ran = true
+            raise "something wrong with my example"
+          end
+        }.should raise_error(Spec::DSL::ExamplePendingError, "something")
+        block_ran.should == true
+      end
+
+      it "should have #pending raise Spec::DSL::PendingFixedError when its block does not fail" do
+        block_ran = false
+        lambda {
+          pending("something") do
+            block_ran = true
+          end
+        }.should raise_error(Spec::DSL::PendingFixedError, "Expected pending 'something' to fail. No Error was raised.")
+        block_ran.should == true
+      end
+
+    end
   end
 end

data/spec/spec/dsl/behaviour_factory_spec.rb

@@ -22,6 +22,24 @@ module Spec
         }.should be_an_instance_of(behaviour_class)
       end
       
+      it "should type indicated by spec_path" do
+        behaviour_class = Class.new do
+          def initialize(*args, &block); end
+        end
+        Spec::DSL::BehaviourFactory.add_behaviour_class(:something_other_than_default, behaviour_class)
+        Spec::DSL::BehaviourFactory.create("behaviour", :spec_path => "./spec/something_other_than_default/some_spec.rb") {
+        }.should be_an_instance_of(behaviour_class)
+      end
+      
+      it "should type indicated by spec_path (with spec_path generated by caller on windows)" do
+        behaviour_class = Class.new do
+          def initialize(*args, &block); end
+        end
+        Spec::DSL::BehaviourFactory.add_behaviour_class(:something_other_than_default, behaviour_class)
+        Spec::DSL::BehaviourFactory.create("behaviour", :spec_path => "./spec\\something_other_than_default\\some_spec.rb") {
+        }.should be_an_instance_of(behaviour_class)
+      end
+      
       after(:each) do
         Spec::DSL::BehaviourFactory.remove_behaviour_class(:something_other_than_default)
       end

data/spec/spec/dsl/behaviour_spec.rb

@@ -8,7 +8,7 @@ module Spec
         @added_behaviour = description
       end
     end
-
+    
     describe Behaviour, "class methods" do
       before :each do
         @reporter = FakeReporter.new(mock("formatter", :null_object => true), mock("backtrace_tweaker", :null_object => true))
@@ -32,7 +32,7 @@ module Spec
 
       it "should not run any example if before(:all) fails" do
         spec_ran = false
-        Behaviour.before(:all) { raise "help" }
+        Behaviour.before(:all) { raise NonStandardError }
         @behaviour.it("test") {spec_ran = true}
         @behaviour.run(@reporter)
         spec_ran.should be_false
@@ -40,7 +40,7 @@ module Spec
 
       it "should run after(:all) if before(:all) fails" do
         after_all_ran = false
-        Behaviour.before(:all) { raise }
+        Behaviour.before(:all) { raise NonStandardError }
         Behaviour.after(:all) { after_all_ran = true }
         @behaviour.run(@reporter)
         after_all_ran.should be_true
@@ -48,7 +48,7 @@ module Spec
 
       it "should run after(:all) if before(:each) fails" do
         after_all_ran = false
-        Behaviour.before(:each) { raise }
+        Behaviour.before(:each) { raise NonStandardError }
         Behaviour.after(:all) { after_all_ran = true }
         @behaviour.run(@reporter)
         after_all_ran.should be_true
@@ -56,32 +56,95 @@ module Spec
 
       it "should run after(:all) if any example fails" do
         after_all_ran = false
-        @behaviour.it("should") { raise "before all error" }
+        @behaviour.it("should") { raise NonStandardError }
         Behaviour.after(:all) { after_all_ran = true }
         @behaviour.run(@reporter)
         after_all_ran.should be_true
       end
 
+      
+      it "should unregister a given after(:each) block" do
+        after_all_ran = false
+        @behaviour.it("example") {}
+        proc = Proc.new { after_all_ran = true }
+        Behaviour.after(:each, &proc)
+        @behaviour.run(@reporter)
+        after_all_ran.should be_true
+        
+        after_all_ran = false
+        Behaviour.remove_after(:each, &proc)
+        @behaviour.run(@reporter)
+        after_all_ran.should be_false
+      end
+      
+      it "should run second after(:each) block even if the first one fails" do
+        example = @behaviour.it("example") {}
+        second_after_ran = false
+        @behaviour.after(:each) do
+          second_after_ran = true
+          raise "second"
+        end
+        first_after_ran = false
+        @behaviour.after(:each) do
+          first_after_ran = true
+          raise "first"
+        end
+
+        @reporter.should_receive(:example_finished) do |example, error, location, example_not_implemented|
+          example.should equal(example)
+          error.message.should eql("first")
+          location.should eql("after(:each)")
+          example_not_implemented.should be_false
+        end
+        @behaviour.run(@reporter)
+        first_after_ran.should be_true
+        second_after_ran.should be_true
+      end
+
+      it "should not run second before(:each) if the first one fails" do
+        @behaviour.it("example") {}
+        first_before_ran = false
+        @behaviour.before(:each) do
+          first_before_ran = true
+          raise "first"
+        end
+        second_before_ran = false
+        @behaviour.before(:each) do
+          second_before_ran = true
+          raise "second"
+        end
+
+        @reporter.should_receive(:example_finished) do |name, error, location, example_not_implemented|
+          name.should eql("example")
+          error.message.should eql("first")
+          location.should eql("before(:each)")
+          example_not_implemented.should be_false
+        end
+        @behaviour.run(@reporter)
+        first_before_ran.should be_true
+        second_before_ran.should be_false
+      end
+
       it "should supply before(:all) as description if failure in before(:all)" do
-        @reporter.should_receive(:example_finished) do |name, error, location|
-          name.should eql("before(:all)")
-          error.message.should eql("in before(:all)")
+        @reporter.should_receive(:example_finished) do |example, error, location|
+          example.description.should eql("before(:all)")
+          error.message.should == "in before(:all)"
           location.should eql("before(:all)")
         end
 
-        Behaviour.before(:all) { raise "in before(:all)" }
+        Behaviour.before(:all) { raise NonStandardError.new("in before(:all)") }
         @behaviour.it("test") {true}
         @behaviour.run(@reporter)
       end
 
       it "should provide after(:all) as description if failure in after(:all)" do
-        @reporter.should_receive(:example_finished) do |name, error, location|
-          name.should eql("after(:all)")
+        @reporter.should_receive(:example_finished) do |example, error, location|
+          example.description.should eql("after(:all)")
           error.message.should eql("in after(:all)")
           location.should eql("after(:all)")
         end
 
-        Behaviour.after(:all) { raise "in after(:all)" }
+        Behaviour.after(:all) { raise NonStandardError.new("in after(:all)") }
         @behaviour.run(@reporter)
       end
     end
@@ -159,8 +222,8 @@ module Spec
       end
 
       it "should supply before(:all) as description if failure in before(:all)" do
-        @reporter.should_receive(:example_finished) do |name, error, location|
-          name.should eql("before(:all)")
+        @reporter.should_receive(:example_finished) do |example, error, location|
+          example.description.should eql("before(:all)")
           error.message.should eql("in before(:all)")
           location.should eql("before(:all)")
         end
@@ -171,8 +234,8 @@ module Spec
       end
 
       it "should provide after(:all) as description if failure in after(:all)" do
-        @reporter.should_receive(:example_finished) do |name, error, location|
-          name.should eql("after(:all)")
+        @reporter.should_receive(:example_finished) do |example, error, location|
+          example.description.should eql("after(:all)")
           error.message.should eql("in after(:all)")
           location.should eql("after(:all)")
         end
@@ -427,42 +490,6 @@ module Spec
         mod1_method_called.should be_true
         mod2_method_called.should be_true
       end
-      
-      it "should not include untargeted modules" do
-        special_method_called = false
-        special_mod = Module.new do
-          define_method :special_method do
-            special_method_called = true
-          end
-        end
-
-        behaviour = Behaviour.new("I'm not special", :behaviour_type => :not_special) {}
-        behaviour.include special_mod, :behaviour_type => :special
-        behaviour.it "test" do
-          special_method
-        end
-        behaviour.run(@reporter)
-
-        special_method_called.should be_false
-      end
-
-      it "should include targeted modules" do
-        special_method_called = false
-        special_mod = Module.new do
-          define_method :special_method do
-            special_method_called = true
-          end
-        end
-
-        behaviour = Behaviour.new("I'm not special", :behaviour_type => :special) {}
-        behaviour.include special_mod, :behaviour_type => :special
-        behaviour.it "test" do
-          special_method
-        end
-        behaviour.run(@reporter)
-
-        special_method_called.should be_true
-      end
 
       it "should have accessible class methods from included module" do
         mod1_method_called = false
@@ -522,7 +549,9 @@ module Spec
         @behaviour.should be_matches(['jalla'])
       end
       
-      it "should include any modules included using configuration" do
+      it "should include targetted modules included using configuration" do
+        $included_modules = []
+        
         mod1 = Module.new do
           class << self
             def included(mod)
@@ -539,21 +568,29 @@ module Spec
           end
         end
 
+        mod3 = Module.new do
+          class << self
+            def included(mod)
+              $included_modules << self
+            end
+          end
+        end
+
         begin
-          $included_modules = []
           Spec::Runner.configuration.include(mod1, mod2)
+          Spec::Runner.configuration.include(mod3, :behaviour_type => :cat)
 
-          behaviour = Behaviour.new('example') do
+          behaviour = Behaviour.new("I'm special", :behaviour_type => :dog) do
           end.run(@reporter)
         
           $included_modules.should include(mod1)
           $included_modules.should include(mod2)
+          $included_modules.should_not include(mod3)
         ensure
-          Spec::Runner.configuration.included_modules.delete(mod1)
-          Spec::Runner.configuration.included_modules.delete(mod2)
+          Spec::Runner.configuration.exclude(mod1, mod2, mod3)
         end
       end
-      
+
       it "should include any predicate_matchers included using configuration" do
         $included_predicate_matcher_found = false
         Spec::Runner.configuration.predicate_matchers[:do_something] = :does_something?