rspec 1.1.12 → 1.2.0

data/lib/spec/runner/reporter.rb

@@ -32,15 +32,14 @@ module Spec
         end
       end
 
-      def failure(example, error)
+      def example_failed(example, error)
         backtrace_tweaker.tweak_backtrace(error)
-        failure = Failure.new(example, error)
+        failure = Failure.new(example_groups.empty? ? "" : example_groups.last.description, example, error)
         @failures << failure
         formatters.each do |f|
           f.example_failed(example, @failures.length, failure)
         end
       end
-      alias_method :example_failed, :failure
 
       def start(number_of_examples)
         clear
@@ -134,11 +133,10 @@ module Spec
       class Failure
         attr_reader :example, :exception
         
-        def initialize(example, exception)
-          @example = example
-          @exception = exception
+        def initialize(group, example, exception)
+          @group, @example, @exception = group, example, exception
         end
-
+        
         def header
           if expectation_not_met?
             "'#{example_name}' FAILED"
@@ -157,9 +155,10 @@ module Spec
           @exception.is_a?(Spec::Expectations::ExpectationNotMetError)
         end
 
-        protected
+      protected
+
         def example_name
-          @example.full_description
+          "#{@group} #{@example.description}"
         end
       end
     end

data/lib/spec/test/unit.rb

@@ -0,0 +1,10 @@
+require 'spec/interop/test'
+
+# Hack to stop active_support/dependencies from complaining about
+# 'spec/test/unit' not defining Spec::Test::Unit
+module Spec
+  module Test
+    module Unit
+    end
+  end
+end

data/lib/spec/version.rb

@@ -2,8 +2,8 @@ module Spec
   module VERSION
     unless defined? MAJOR
       MAJOR  = 1
-      MINOR  = 1
-      TINY   = 12
+      MINOR  = 2
+      TINY   = 0
       MINESCULE = nil
       
 

data/{features/support → resources}/helpers/cmdline.rb

@@ -1,7 +1,7 @@
-$:.push File.join(File.dirname(__FILE__), *%w[.. .. .. lib])
+$:.push File.join(File.dirname(__FILE__), *%w[.. .. lib])
 require 'spec'
 
-# Uncommenting next line will break the output story (no output!!)
+# Uncommenting next line will break the output feature (no output!!)
 # rspec_options
 options = Spec::Runner::OptionParser.parse(
   ARGV, $stderr, $stdout

data/resources/rake/verify_rcov.rake

@@ -1,7 +1,7 @@
 require 'rake'
 require 'spec/rake/verify_rcov'
 
-RCov::VerifyTask.new(:verify_rcov => :spec) do |t|
+RCov::VerifyTask.new(:verify_rcov => 'spec:rcov') do |t|
   t.threshold = 100.0
   t.index_html = 'coverage/index.html'
 end

data/resources/spec/example_group_with_should_methods.rb

@@ -1,5 +1,5 @@
 $:.push File.join(File.dirname(__FILE__), *%w[.. .. lib])
-require 'spec'
+require 'spec/autorun'
 
 class MySpec < Spec::ExampleGroup
   def should_pass_with_should

data/resources/spec/simple_spec.rb

@@ -1,5 +1,5 @@
 $:.push File.join(File.dirname(__FILE__), *%w[.. .. lib])
-require 'spec'
+require 'spec/autorun'
 
 describe "Running an Example" do
   it "should not output twice" do

data/resources/test/spec_and_test_together.rb

@@ -1,7 +1,6 @@
 $:.push File.join(File.dirname(__FILE__), *%w[.. .. lib])
-require 'spec'
-# TODO - this should not be necessary, ay?
-require 'spec/interop/test'
+require 'spec/autorun'
+require 'spec/test/unit'
 
 describe "An Example" do
   it "should pass with assert" do

data/resources/test/spec_including_test_but_not_unit.rb

@@ -1,5 +1,5 @@
 $:.push File.join(File.dirname(__FILE__), *%w[.. .. lib])
-require 'spec'
+require 'spec/autorun'
 
 module Test
 end

data/resources/test/test_case_with_should_methods.rb

@@ -1,7 +1,6 @@
 $:.push File.join(File.dirname(__FILE__), *%w[.. .. lib])
-require 'test/unit'
-require 'spec'
-require 'spec/interop/test'
+require 'spec/autorun'
+require 'spec/test/unit'
 
 class MyTest < Test::Unit::TestCase
   def should_pass_with_should

data/spec/autotest/autotest_helper.rb

@@ -1,4 +1,3 @@
-require "rubygems"
 require 'autotest'
 dir = File.dirname(__FILE__)
 require File.expand_path("#{dir}/../spec_helper")

data/spec/autotest/rspec_spec.rb

@@ -1,114 +1,111 @@
 require File.dirname(__FILE__) + "/autotest_helper"
 
-class Autotest
-  
-  describe Rspec do
-    describe "adding spec.opts --options" do 
-      before(:each) do
-        @rspec_autotest = Rspec.new
-      end
+describe Autotest::Rspec do
+  describe "adding spec.opts --options" do 
+    before(:each) do
+      @rspec_autotest = 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 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 "commands" 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_cmd = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec'))
-        @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 return an empty string if no spec.opts exists" do
+      File.stub!(:exist?).and_return false
+      Autotest::Rspec.new.add_options_if_present.should == ""
+    end
+  end  
+
+  describe "commands" do
+    before(:each) do
+      @rspec_autotest = Autotest::Rspec.new
+      @rspec_autotest.stub!(:ruby).and_return "ruby"
+      @rspec_autotest.stub!(:add_options_if_present).and_return "-O spec/spec.opts"
     
-      it "should make the appropriate test command" do
-        @rspec_autotest.make_test_cmd(@files_to_test).should == "#{@ruby} #{@spec_cmd} #{@to_test} #{@options}"
-      end
+      @ruby = @rspec_autotest.ruby
+      @spec_cmd = File.expand_path(File.join(File.dirname(__FILE__), '..', '..', 'bin', 'spec'))
+      @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 appropriate test command" do
+      @rspec_autotest.make_test_cmd(@files_to_test).should == "#{@ruby} #{@spec_cmd} --autospec #{@to_test} #{@options}"
+    end
 
-      it "should return a blank command for no files" do
-        @rspec_autotest.make_test_cmd({}).should == ''
-      end
+    it "should return a blank command for no files" do
+      @rspec_autotest.make_test_cmd({}).should == ''
     end
+  end
+
+  describe "mappings" do
   
-    describe "mappings" do
-    
-      before(:each) do
-        @lib_file = "lib/something.rb"
-        @spec_file = "spec/something_spec.rb"
-        @rspec_autotest = Rspec.new
-        @rspec_autotest.hook :initialize
-      end
-    
-      it "should find the spec file for a given lib file" do
-        @rspec_autotest.should map_specs([@spec_file]).to(@lib_file)
-      end
-    
-      it "should find the spec file if given a spec file" do
-        @rspec_autotest.should map_specs([@spec_file]).to(@spec_file)
-      end
-    
-      it "should ignore files in spec dir that aren't specs" do
-        @rspec_autotest.should map_specs([]).to("spec/spec_helper.rb")
-      end
-    
-      it "should ignore untracked files (in @file)"  do
-        @rspec_autotest.should map_specs([]).to("lib/untracked_file")
-      end
+    before(:each) do
+      @lib_file = "lib/something.rb"
+      @spec_file = "spec/something_spec.rb"
+      @rspec_autotest = Autotest::Rspec.new
+      @rspec_autotest.hook :initialize
     end
   
-    describe "consolidating failures" do
-      before(:each) do
-        @rspec_autotest = Rspec.new
-      
-        @spec_file = "spec/autotest/some_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.consolidate_failures([[]]).should == {}
-      end
+    it "should find the spec file for a given lib file" do
+      @rspec_autotest.should map_specs([@spec_file]).to(@lib_file)
+    end
+  
+    it "should find the spec file if given a spec file" do
+      @rspec_autotest.should map_specs([@spec_file]).to(@spec_file)
+    end
+  
+    it "should ignore files in spec dir that aren't specs" do
+      @rspec_autotest.should map_specs([]).to("spec/spec_helper.rb")
+    end
+  
+    it "should ignore untracked files (in @file)"  do
+      @rspec_autotest.should map_specs([]).to("lib/untracked_file")
+    end
+  end
+
+  describe "consolidating failures" do
+    before(:each) do
+      @rspec_autotest = Autotest::Rspec.new
     
-      it "should return a hash with the spec filename => spec name for each failure or error" do
-        @rspec_autotest.stub!(:test_files_for).and_return "spec/autotest/some_spec.rb"
-        failures = [
-          [
-            "false should be false", 
-            "expected: true,\n     got: false (using ==)\n#{@spec_file}:203:"
-          ]
+      @spec_file = "spec/autotest/some_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.consolidate_failures([[]]).should == {}
+    end
+  
+    it "should return a hash with the spec filename => spec name for each failure or error" do
+      @rspec_autotest.stub!(:test_files_for).and_return "spec/autotest/some_spec.rb"
+      failures = [
+        [
+          "false should be false", 
+          "expected: true,\n     got: false (using ==)\n#{@spec_file}:203:"
         ]
-        @rspec_autotest.consolidate_failures(failures).should == {
-          @spec_file => ["false should be false"]
-        }
-      end
-    
-      it "should not include the subject file" do
-        subject_file = "lib/autotest/some.rb"
-        @rspec_autotest.stub!(:test_files_for).and_return "spec/autotest/some_spec.rb"
-        failures = [
-          [
-            "false should be false", 
-            "expected: true,\n     got: false (using ==)\n#{subject_file}:143:\n#{@spec_file}:203:"
-          ]
+      ]
+      @rspec_autotest.consolidate_failures(failures).should == {
+        @spec_file => ["false should be false"]
+      }
+    end
+  
+    it "should not include the subject file" do
+      subject_file = "lib/autotest/some.rb"
+      @rspec_autotest.stub!(:test_files_for).and_return "spec/autotest/some_spec.rb"
+      failures = [
+        [
+          "false should be false", 
+          "expected: true,\n     got: false (using ==)\n#{subject_file}:143:\n#{@spec_file}:203:"
         ]
-        @rspec_autotest.consolidate_failures(failures).keys.should_not include(subject_file)
-      end
+      ]
+      @rspec_autotest.consolidate_failures(failures).keys.should_not include(subject_file)
     end
   end
 end

data/spec/spec/dsl/main_spec.rb

@@ -10,7 +10,7 @@ module Spec
       [:describe, :context].each do |method|
         describe "##{method}" do
           it "should delegate to Spec::Example::ExampleGroupFactory.create_example_group" do
-            block = lambda {}
+            block = lambda {|a,b|}
             Spec::Example::ExampleGroupFactory.should_receive(:create_example_group).with(
               "The ExampleGroup", hash_including(:spec_path), &block
             )
@@ -22,7 +22,7 @@ module Spec
       [:share_examples_for, :shared_examples_for].each do |method|
         describe "##{method}" do
           it "should create a shared ExampleGroup" do
-            block = lambda {}
+            block = lambda {|a,b|}
             Spec::Example::ExampleGroupFactory.should_receive(:create_shared_example_group).with(
               "shared group", hash_including(:spec_path), &block
             )
@@ -63,7 +63,7 @@ module Spec
         end
         
         it "registers a shared ExampleGroup" do
-          block = lambda {}
+          block = lambda {|a,b|}
           Spec::Example::ExampleGroupFactory.should_receive(:create_shared_example_group).with(
             group_name, hash_including(:spec_path), &block
           )

data/spec/spec/dsl/matchers_spec.rb

@@ -0,0 +1,25 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+module Spec
+  module DSL
+    module Matchers
+      describe "#create" do
+        it "creates a method that initializes a new matcher with the submitted name and expected arg" do
+          # FIXME - this expects new to be called, but we need something
+          # more robust - that expects new to be called with a specific
+          # block (lambda, proc, whatever)
+          mod = Module.new
+          mod.extend Spec::DSL::Matchers
+          mod.create(:foo)
+    
+          obj = Object.new
+          obj.extend mod
+    
+          Spec::Matchers::Matcher.should_receive(:new).with(:foo, 3)
+    
+          obj.foo(3)
+        end
+      end
+    end
+  end
+end

data/spec/spec/example/example_group_class_definition_spec.rb

@@ -3,18 +3,14 @@ require File.dirname(__FILE__) + '/../../spec_helper'
 module Spec
   module Example
     class ExampleGroupSubclass < ExampleGroup
-      def self.examples_ran
-        @examples_ran
-      end
-
-      def self.examples_ran=(examples_ran)
-        @examples_ran = examples_ran
+      class << self
+        attr_accessor :examples_ran
       end
 
       @@class_variable = :class_variable
       CONSTANT = :constant
 
-      before do
+      before(:each) do
         @instance_variable = :instance_variable
       end
       
@@ -22,25 +18,28 @@ module Spec
         self.class.examples_ran = true
       end
 
-      it "should have access to instance variables" do
+      def a_method
+        22
+      end
+
+      it "can access instance variables defined before(:each)" do
         @instance_variable.should == :instance_variable
       end
 
-      it "should have access to class variables" do
-        @@class_variable.should == :class_variable
+      it "can access class variables (Ruby 1.8 only)" do
+        with_ruby 1.8 do
+          @@class_variable.should == :class_variable
+        end
       end
 
-      it "should have access to constants" do
+      it "can access constants" do
         CONSTANT.should == :constant
       end
 
-      it "should have access to methods defined in the Example Group" do
+      it "can access methods defined in the Example Group" do
         a_method.should == 22
       end
       
-      def a_method
-        22
-      end
     end
 
     describe ExampleGroupSubclass do