rspec 0.7.3 → 0.7.4

data/lib/spec/expectations/should/have.rb

@@ -40,7 +40,7 @@ module Spec
         end
       
         def msg(sym, args, text)
-          "#{@target.inspect_for_expectation_not_met_error} #{text} #{sym}: #{args.collect{|arg| arg.inspect_for_expectation_not_met_error}.join(', ')}"
+          "#{@target.inspect} #{text} #{sym}: #{args.collect{|arg| arg.inspect}.join(', ')}"
         end
     
         def actual_size(collection)
@@ -49,7 +49,7 @@ module Spec
         end
     
         def build_message(sym, args)
-          message = "#{@target.inspect_for_expectation_not_met_error} should have"
+          message = "#{@target.inspect} should have"
           message += " at least" if @at_least
           message += " at most" if @at_most
           message += " #{@expected} #{sym} (has #{actual_size(collection(sym, args))})"

data/lib/spec/expectations/should/should.rb

@@ -7,7 +7,7 @@ module Spec
           @target = target
           @be_seen = false
         end
-      
+        
         def have(expected_number=nil)
           Have.new(@target, :exactly, expected_number)
         end
@@ -45,7 +45,8 @@ module Spec
   
         def __delegate_method_missing_to_target(original_sym, actual_sym, *args)
           return if @target.send(actual_sym, *args)
-          fail_with_message(default_message("should#{@be_seen ? ' be' : ''} #{original_sym}" + (args.empty? ? '' : ' ' + args[0].inspect)))
+          message = default_message("should#{@be_seen ? ' be' : ''} #{original_sym}", args[0])
+          fail_with_message(message)
         end
 
         def match(expected)
@@ -58,9 +59,9 @@ module Spec
           rescue exception => e
             unless message.nil?
               if message.is_a?(Regexp)
-                e.message.should_match message
+                e.message.should =~ message
               else
-                e.message.should_eql message
+                e.message.should == message
               end
             end
             return

data/lib/spec/mocks/error_generator.rb

@@ -3,7 +3,7 @@ module Spec
     class ErrorGenerator
       attr_writer :opts
       
-      def initialize target, name
+      def initialize(target, name)
         @target = target
         @name = name
       end
@@ -12,27 +12,34 @@ module Spec
         @opts ||= {}
       end
 
-      def raise_unexpected_message_error sym, *args
+      def raise_unexpected_message_error(sym, *args)
         __raise "#{intro} received unexpected message :#{sym}#{arg_message(*args)}"
       end
       
-      def raise_expectation_error sym, expected_received_count, actual_received_count, *args
+      def raise_unexpected_message_args_error(expectation, *args)
+        #this is either :no_args or an Array
+        expected_args = (expectation.expected_args == :no_args ? "(no args)" : format_args(*expectation.expected_args))
+        actual_args = args.empty? ? "(no args)" : format_args(*args)
+        __raise "#{intro} expected #{expectation.sym.inspect} with #{expected_args} but received it with #{actual_args}"
+      end
+      
+      def raise_expectation_error(sym, expected_received_count, actual_received_count, *args)
         __raise "#{intro} expected :#{sym}#{arg_message(*args)} #{count_message(expected_received_count)}, but received it #{count_message(actual_received_count)}"
       end
       
-      def raise_out_of_order_error sym
+      def raise_out_of_order_error(sym)
         __raise "#{intro} received :#{sym} out of order"
       end
       
-      def raise_block_failed_error sym, detail
+      def raise_block_failed_error(sym, detail)
         __raise "#{intro} received :#{sym} but passed block failed with: #{detail}"
       end
       
-      def raise_missing_block_error args_to_yield
+      def raise_missing_block_error(args_to_yield)
         __raise "#{intro} asked to yield |#{arg_list(*args_to_yield)}| but no block was passed"
       end
       
-      def raise_wrong_arity_error args_to_yield, arity
+      def raise_wrong_arity_error(args_to_yield, arity)
         __raise "#{intro} yielded |#{arg_list(*args_to_yield)}| to block with arity of #{arity}"
       end
       
@@ -41,15 +48,19 @@ module Spec
         @name ? "Mock '#{@name}'" : @target.to_s
       end
       
-      def __raise message
+      def __raise(message)
         message = opts[:message] unless opts[:message].nil?
         Kernel::raise(Spec::Mocks::MockExpectationError, message)
       end
       
-      def arg_message *args
-        return "" if [:any_args] == args
-        return if args.empty?
-        " with [" + arg_list(*args) + "]"
+      def arg_message(*args)
+        " with " + format_args(*args)
+      end
+      
+      def format_args(*args)
+        return "(no args)" if args.empty? || args == :no_args || args == [:no_args]
+        return "(any args)" if [:any_args] == args
+        "(" + arg_list(*args) + ")"
       end
 
       def arg_list(*args)

data/lib/spec/mocks/message_expectation.rb

@@ -22,6 +22,10 @@ module Spec
         @at_most = nil
         @args_to_yield = nil
       end
+      
+      def expected_args
+        @args_expectation.args
+      end
 
       def and_return(*values, &return_block)
         Kernel::raise AmbiguousReturnError unless @method_block.nil?

data/lib/spec/mocks/mock_handler.rb

@@ -41,14 +41,11 @@ module Spec
       end
 
       def __add expected_from, sym, block
-        Runner::Specification.add_listener(self) if @options[:auto_verify]
+        current_spec = Runner::Specification.current
+        current_spec.after_teardown {verify} if current_spec && @options[:auto_verify]
         define_expected_method(sym)
       end
 
-      def spec_finished spec
-        verify
-      end
-
       def define_expected_method(sym)
         if @target.respond_to?(sym) && !@proxied_methods[sym]
           @proxied_methods[sym] = @target.method(sym)
@@ -106,7 +103,7 @@ module Spec
         @proxied_methods.clear
       end
 
-      def metaclass_eval str
+      def metaclass_eval(str)
         (class << @target; self; end).class_eval str
       end
 
@@ -137,13 +134,17 @@ module Spec
         elsif stub = find_matching_method_stub(sym)
           stub.invoke([], nil)
         elsif expectation = find_almost_matching_expectation(sym, *args)
-          raise_unexpected_message_error(sym, *args) unless has_negative_expectation?(sym) unless null_object?
+          raise_unexpected_message_args_error(expectation, *args) unless has_negative_expectation?(sym) unless null_object?
         else
           @target.send :method_missing, sym, *args, &block
         end
       end
 
-      def raise_unexpected_message_error sym, *args
+      def raise_unexpected_message_args_error(expectation, *args)
+        @error_generator.raise_unexpected_message_args_error expectation, *args
+      end
+
+      def raise_unexpected_message_error(sym, *args)
         @error_generator.raise_unexpected_message_error sym, *args
       end
 

data/lib/spec/rake/spectask.rb

@@ -12,8 +12,9 @@ module Spec
     #
     # Example:
     #  
-    #   Rake::SpecTask.new do |t|
+    #   Spec::Rake::SpecTask.new do |t|
     #     t.warning = true
+    #     t.rcov = true
     #   end
     #
     # This will create a task that can be run with:

data/lib/spec/runner.rb

@@ -11,6 +11,5 @@ require 'spec/runner/backtrace_tweaker'
 require 'spec/runner/reporter'
 require 'spec/runner/spec_matcher'
 require 'spec/runner/extensions/kernel'
-require 'spec/runner/extensions/object'
 require 'spec/runner/spec_should_raise_handler'
 require 'spec/runner/spec_parser'

data/lib/spec/runner/backtrace_tweaker.rb

@@ -29,6 +29,7 @@ module Spec
           line = nil if line =~ /\/lib\/spec\/mocks\//
           line = nil if line =~ /\/lib\/spec\/rake\//
           line = nil if line =~ /\/lib\/spec\/runner\//
+          line = nil if line =~ /\/lib\/spec\/callback\//
           line = nil if line =~ /bin\/spec:/
           line = nil if line =~ /bin\/rcov:/
           line = nil if line =~ /lib\/rspec_on_rails/

data/lib/spec/runner/context_eval.rb

@@ -98,7 +98,7 @@ module Spec
               if part.is_a?(UnboundMethod)
                 part.bind(self).call
               else
-                instance_exec(&part)
+                instance_eval(&part)
               end
             end
           end

data/lib/spec/runner/formatter/base_text_formatter.rb

@@ -92,7 +92,7 @@ module Spec
       protected
       
         def backtrace_line(line)
-          line
+          line.sub(/\A([^:]+:\d+)$/, '\\1:')
         end
 
         def colour(text, colour_code)

data/lib/spec/runner/formatter/html_formatter.rb

@@ -4,83 +4,98 @@ module Spec
       class HtmlFormatter < BaseTextFormatter
         def initialize(output, dry_run=false, colour=false)
           super
-          @current_count = 0
-          @spec_count = 0
+          @current_spec_number = 0
+          @current_context_number = 0
         end
-      
+
         def start(spec_count)
           @spec_count = spec_count
-      
-          @output.puts HEADER
+
+          @output.puts @@header
           STDOUT.flush
         end
 
         def add_context(name, first)
+          @current_context_number += 1
           unless first
-            @output.puts "  </ul>"
+            @output.puts "  </dl>"
             @output.puts "</div>"
           end
           @output.puts "<div class=\"context\">"
-          @output.puts "  <ul>"
-          @output.puts "  <li class=\"context_name\">#{name}</li>"
+          @output.puts "  <dl>"
+          @output.puts "  <dt id=\"context_#{@current_context_number}\">#{name}</dt>"
           STDOUT.flush
         end
 
         def start_dump
-          @output.puts "  </ul>"
+          @output.puts "  </dl>"
           @output.puts "</div>"
           STDOUT.flush
         end
 
         def spec_started(name)
           @current_spec = name
-          @current_count += 1
+          @current_spec_number += 1
           STDOUT.flush
         end
 
         def spec_passed(name)
           move_progress
-          @output.puts "    <li class=\"spec passed\"><div class=\"passed_spec_name\">#{escape(@current_spec)}</div></li>"
+          @output.puts "    <dd class=\"spec passed\"><span class=\"passed_spec_name\">#{escape(@current_spec)}</span></dd>"
           STDOUT.flush
         end
 
         def spec_failed(name, counter, failure)
-          @output.puts "    <script type=\"text/javascript\">makeProgressbarRed();</script>"
+          @output.puts "    <script type=\"text/javascript\">makeRed('header');</script>"
+          @output.puts "    <script type=\"text/javascript\">makeRed('context_#{@current_context_number}');</script>"
           move_progress
-          @output.puts "    <li class=\"spec failed\">"
-          @output.puts "      <div class=\"failed_spec_name\">#{escape(@current_spec)}</div>"
+          @output.puts "    <dd class=\"spec failed\">"
+          @output.puts "      <span class=\"failed_spec_name\">#{escape(@current_spec)}</span>"
           @output.puts "      <div class=\"failure\" id=\"failure_#{counter}\">"
           @output.puts "        <div class=\"message\"><pre>#{escape(failure.exception.message)}</pre></div>" unless failure.exception.nil?
           @output.puts "        <div class=\"backtrace\"><pre>#{format_backtrace(failure.exception.backtrace)}</pre></div>" unless failure.exception.nil?
+          extra_failure_content
           @output.puts "      </div>"
-          @output.puts "    </li>"
+          @output.puts "    </dd>"
           STDOUT.flush
         end
         
+        # Override this method if you wish to output extra HTML for a failed spec. For example, you
+        # could output links to images or other files produced during the specs. Example:
+        #
+        #
+        def extra_failure_content
+        end
+        
         def move_progress
-          percent_done = @spec_count == 0 ? 100.0 : (@current_count.to_f / @spec_count.to_f * 1000).to_i / 10.0
+          percent_done = @spec_count == 0 ? 100.0 : (@current_spec_number.to_f / @spec_count.to_f * 1000).to_i / 10.0
           @output.puts "    <script type=\"text/javascript\">moveProgressBar('#{percent_done}');</script>"
         end
         
         def escape(string)
           string.gsub(/&/n, '&amp;').gsub(/\"/n, '&quot;').gsub(/>/n, '&gt;').gsub(/</n, '&lt;')
         end
-    
+
         def dump_failure(counter, failure)
         end
 
         def dump_summary(duration, spec_count, failure_count)
+          if @dry_run
+            totals = "This was a dry-run"
+          else
+            totals = "#{spec_count} specification#{'s' unless spec_count == 1}, #{failure_count} failure#{'s' unless failure_count == 1}"
+          end
+          @output.puts "<script type=\"text/javascript\">document.getElementById('duration').innerHTML = \"Finished in <strong>#{duration} seconds</strong>\";</script>"
+          @output.puts "<script type=\"text/javascript\">document.getElementById('totals').innerHTML = \"#{totals}\";</script>"
+          @output.puts "</div>"
           @output.puts "</body>"
           @output.puts "</html>"
           STDOUT.flush
         end
-        
-        RED_BACKGROUND   = '#CD0000'
-        GREEN_BACKGROUND = '#659D32'
-        
-        HEADER = <<-HEADER
+
+        @@header = <<-HEADER
 <?xml version="1.0" encoding="iso-8859-1"?>
-<!DOCTYPE html 
+<!DOCTYPE html
      PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
@@ -91,98 +106,103 @@ module Spec
   <meta http-equiv="Content-Script-Type" content="text/javascript" />
   <script type="text/javascript">
   function moveProgressBar(percentDone) {
-    document.getElementById("progress-bar").style.width = percentDone +"%";
+    document.getElementById("header").style.width = percentDone +"%";
   }
-  function makeProgressbarRed() {
-    document.getElementById('progress-bar').style.background = '#{RED_BACKGROUND}';
+  function makeRed(element_id) {
+    document.getElementById(element_id).style.background = '#C40D0D';
   }
   </script>
   <style type="text/css">
   body {
-    font-size: 9pt;
-    font-family: verdana, arial, helvetica;
-    width: 85%;
+    margin: 0; padding: 0;
+    background: #fff;
   }
 
-  #progress-bar-bg {
-    background-color: #C9C9C9; 
-    border-bottom: 1px solid gray; 
-    border-right: 1px solid gray;
+  #header {
+    background: #65C400; color: #fff;
   }
 
-  #progress-bar {
-    background-color: #{GREEN_BACKGROUND};
-    width: 0px;
+  h1 {
+    margin: 0 0 10px;
+    padding: 10px;
+    font: bold 18px "Lucida Grande", Helvetica, sans-serif;
   }
 
-  div.context {
-    padding: 0px;
-    background: #fff;
-    margin-top: 0px;
+  #summary {
+    margin: 0; padding: 5px 10px;
+    font: bold 10px "Lucida Grande", Helvetica, sans-serif;
+    text-align: right;
+    position: absolute;
+    top: 0px;
+    right: 0px;
   }
 
-  ul {
-    padding-left: 0px;
+  #summary p {
+    margin: 0 0 2px;
   }
 
-  li { 
-    list-style-type: none; 
-    margin: 0;
-    border: 1px solid #fff;
+  #summary #totals {
+    font-size: 14px;
   }
 
-  li.context_name {
-    font-size: 1.3em;
-    font-weight: bold;
-    color: #589CCF;
+  .context {
+    margin: 0 10px 5px;
+    background: #fff;
   }
 
-  div.passed_spec_name {
-    font-weight: bold;
-    color: #324F17;
+  dl {
+    margin: 0; padding: 0 0 5px;
+    font: normal 11px "Lucida Grande", Helvetica, sans-serif;
   }
 
-  div.failed_spec_name {
+  dt {
+    padding: 3px;
+    background: #65C400;
+    color: #fff;
     font-weight: bold;
-    color: #EEB4B4;
   }
 
-  li.passed {
-    display: block; 
-    background: #659D32; 
-    padding: 1px 4px; 
+  dd {
+    margin: 5px 0 5px 5px;
+    padding: 3px 3px 3px 18px;
   }
 
-  li.failed {
-    display: block; 
-    background: #CD0000; 
-    color: #000; 
-    padding: 2px 4px; 
+  dd.spec.passed {
+    border-left: 5px solid #65C400;
+    border-bottom: 1px solid #65C400;
+    background: #DBFFB4; color: #3D7700;
   }
 
-  li.failed .failure {
-    font-weight: normal;
-    font-size: 9pt;
+  dd.spec.failed {
+    border-left: 5px solid #C20000;
+    border-bottom: 1px solid #C20000;
+    color: #C20000; background: #FFFBD3;
   }
 
   div.backtrace {
-    color: #fff; 
+    color: #000;
+    font-size: 12px;
   }
 
-  div.backtrace a {
-    color: #fff; 
+  a {
+    color: #BE5C00;
   }
-
   </style>
 </head>
 <body>
 
-<div id="progress-bar-bg">
-  <div id="progress-bar">&nbsp;</div>
+<div id="header">
+  <h1>RSpec Results</h1>
+
+  <div id="summary">
+    <p id="duration">&nbsp;</p>
+    <p id="totals">&nbsp;</p>
+  </div>
 </div>
 
+<div id="results">
 HEADER
       end
     end
   end
-end
+end