rspec 0.7.3 → 0.7.4

data/lib/spec/runner/option_parser.rb

@@ -74,7 +74,11 @@ module Spec
           opts.on("-s", "--spec SPECIFICATION_NAME", "Execute context or specification with matching name") do |spec_name|
             options.spec_name = spec_name
           end
-
+          
+          opts.on("-o", "--out OUTPUT_FILE", "Path to output file (defaults to STDOUT)") do |outfile|
+            options.out = File.new(outfile, 'w')
+          end
+          
           opts.on("-l", "--line LINE_NUMBER", Integer, "Execute context or specification at given line") do |line_number|
             options.line_number = line_number.to_i
           end

data/lib/spec/runner/specification.rb

@@ -1,68 +1,95 @@
 module Spec
   module Runner
     class Specification
-      
-      @@current_spec = nil
-    
-      def self.add_listener listener
-        @@current_spec.add_listener listener unless @@current_spec.nil?
+      module ClassMethods
+        attr_accessor :current
+        protected :current=
+
+        callback_events :before_setup, :after_teardown
       end
-      
+      extend ClassMethods
+
+      attr_reader :command
+      callback_events :before_setup, :after_teardown
+
       def initialize(name, opts={}, &block)
         @from = caller(0)[3]
         @name = name
         @options = opts
-        @block = block
-        @listeners = []
+        @command = block
       end
 
       def run(reporter, setup_block, teardown_block, dry_run, execution_context)
-        reporter.spec_started(@name) unless reporter.nil?
+        reporter.spec_started(@name) if reporter
         return reporter.spec_finished(@name) if dry_run
-        @@current_spec = self
-        errors = []
-        begin
-          execution_context.instance_exec(&setup_block) unless setup_block.nil?
-          setup_ok = true
-          execution_context.instance_exec(&@block)
-          spec_ok = true
-        rescue => e
-          errors << e
-        end
 
+        errors = []
         begin
-          execution_context.instance_exec(&teardown_block) unless teardown_block.nil?
-          teardown_ok = true
-        rescue => e
-          errors << e
+          set_current
+          setup_ok = setup_spec(execution_context, errors, &setup_block)
+          spec_ok = execute_spec(execution_context, errors) if setup_ok
+          teardown_ok = teardown_spec(execution_context, errors, &teardown_block)
         ensure
-          notify_after_teardown errors
-          @@current_spec = nil
+          clear_current
         end
 
         SpecShouldRaiseHandler.new(@from, @options).handle(errors)
-        reporter.spec_finished(@name, errors.first, failure_location(setup_ok, spec_ok, teardown_ok)) unless reporter.nil?
+        reporter.spec_finished(@name, errors.first, failure_location(setup_ok, spec_ok, teardown_ok)) if reporter
       end
 
       def matches_matcher?(matcher)
         matcher.matches? @name 
       end
 
-      def add_listener listener
-        @listeners << listener
+      private
+      def setup_spec(execution_context, errors, &setup_block)
+        notify_before_setup(errors)
+        execution_context.instance_eval(&setup_block) if setup_block
+        return errors.empty?
+      rescue => e
+        errors << e
+        return false
       end
 
-      def notify_after_teardown errors
-        @listeners.each do |listener|
-          begin
-            listener.spec_finished(self) if listener.respond_to?(:spec_finished)
-          rescue => e
-            errors << e
-          end
-        end
+      def execute_spec(execution_context, errors)
+        execution_context.instance_eval(&command)
+        return true
+      rescue => e
+        errors << e
+        return false
+      end
+
+      def teardown_spec(execution_context, errors, &teardown_block)
+        execution_context.instance_eval(&teardown_block) if teardown_block
+        notify_after_teardown(errors)
+        return errors.empty?
+      rescue => e
+        errors << e
+        return false
+      end
+
+      def notify_before_setup(errors)
+        self.class.send(:notify_callbacks, :before_setup, self, &append_errors(errors))
+        notify_callbacks(:before_setup, self, &append_errors(errors))
+      end
+      
+      def notify_after_teardown(errors)
+        notify_callbacks(:after_teardown, self, &append_errors(errors))
+        self.class.send(:notify_callbacks, :after_teardown, self, &append_errors(errors))
+      end
+      
+      def append_errors(errors)
+        proc {|error| errors << error}
+      end
+      
+      def set_current
+        self.class.send(:current=, self)
+      end
+
+      def clear_current
+        self.class.send(:current=, nil)
       end
 
-      private
       def failure_location(setup_ok, spec_ok, teardown_ok)
         return 'setup' unless setup_ok
         return @name unless spec_ok

data/lib/spec/version.rb

@@ -3,9 +3,9 @@ module Spec
     unless defined? MAJOR
       MAJOR  = 0
       MINOR  = 7
-      TINY   = 3
-      # RANDOM_TOKEN: 0.690694587701409
-      REV    = "$LastChangedRevision: 1137 $".match(/LastChangedRevision: (\d+)/)[1]
+      TINY   = 4
+      # RANDOM_TOKEN: 0.644898830762263
+      REV    = "$LastChangedRevision: 1201 $".match(/LastChangedRevision: (\d+)/)[1]
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       FULL_VERSION = "#{STRING} (r#{REV})"

data/vendor/{watir → web_spec/watir}/README.txt

@@ -22,9 +22,9 @@ and type:
 
   ruby find_rspecs_home_page.rb --format specdoc
 
-Or better:
+Or better - if you want to generate a super-hot HTML report with screenshots:
 
-  ruby find_rspecs_home_page.rb --format html > find_rspecs_home_page.html
+  spec find_rspecs_home_page.rb --require ../web_test_html_formatter.rb --format WebTestHtmlFormatter > report/report.html
 
 And upload find_rspecs_home_page.html to your project's web page or intranet.
 This will give immediate visibility to the intended behaviour of your web app,

data/vendor/web_spec/watir/find_rspecs_home_page.rb

@@ -0,0 +1,27 @@
+require File.dirname(__FILE__) + '/rspec_watir'
+
+context "Google's search page" do
+
+  setup do
+    @browser.goto('http://www.google.com')
+  end
+
+  specify "should find rspec's home page when I search for rspec" do
+    @browser.text_field(:name, "q").set("rspec")
+    @browser.button(:name, "btnG").click
+    @browser.contains_text("rspec.rubyforge.org").should_not_be nil # should_contain_text is RSpec sugar
+  end
+
+  specify "should find rspec's home page when I search for 'better than fudge' (will probably fail)" do
+    @browser.text_field(:name, "q").set("better than fudge")
+    @browser.button(:name, "btnG").click
+    @browser.contains_text("rspec.rubyforge.org").should_not_be nil
+  end
+
+  specify "should not find Ali G when I search for respec" do
+    @browser.text_field(:name, "q").set("respec")
+    @browser.button(:name, "btnG").click
+    @browser.contains_text("Ali G").should_be nil
+  end
+
+end

data/vendor/{watir → web_spec/watir}/rspec_watir.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'spec'
-require 'watir'
+require 'fileutils'
+require File.dirname(__FILE__) + '/../web_test_html_formatter_helper'
 
 # Comment out to enable ActiveRecord fixtures
 #require 'active_record'
@@ -11,13 +12,22 @@ require 'watir'
 #ActiveRecord::Base.establish_connection(config['db'])
 
 class RSpecWatir
+  include WebTestHtmlFormatterHelper
+
+  @@img_dir = File.dirname(__FILE__) + '/report/images'
+  FileUtils.mkdir_p(@@img_dir) unless File.exist?(@@img_dir)
+  @@n = 1
+  
   def setup
     #Fixtures.create_fixtures($fixture_path, @@fixtures)
-    @browser = Watir::IE.new
+    @browser = Watir::Browser.new
   end
 
   def teardown
-    @browser.close
+    save_screenshots(@@img_dir, @@n)
+    save_source(@@img_dir, @@n, @browser.html)
+    @@n += 1
+    @browser.close unless RUBY_PLATFORM =~ /darwin/
   end
   
   #def self.fixtures(*testdata)
@@ -34,12 +44,3 @@ module Spec
     end
   end
 end
-
-# Extensions to Watir to make it play nicer with RSpec
-module Watir
-  class IE
-    # @browser.should_contain("bla bla")
-    # @browser.should_not_contain("bla bla")
-    alias_method :contain?, :contains_text
-  end
-end

data/vendor/web_spec/web_test_html_formatter.rb

@@ -0,0 +1,8 @@
+# Customizes the HTML report to include screenshots and browser source, which
+# are saved in teardown defined in rspec_watir.rb
+class WebTestHtmlFormatter < Spec::Runner::Formatter::HtmlFormatter
+  def extra_failure_content
+    @output.puts "        <div><a href=\"images/#{@current_count}.png\"><img src=\"images/#{@current_count}_thumb.png\"></a></div>"
+    @output.puts "        <div><a href=\"images/#{@current_count}.html\">HTML source</a></div>"
+  end
+end

data/vendor/web_spec/web_test_html_formatter_helper.rb

@@ -0,0 +1,26 @@
+require 'rubygems'
+require 'RMagick'
+
+# include this module in your spec and call +save_screenshot+ and +save_source+ from
+# teardown.
+module WebTestHtmlFormatterHelper
+  if RUBY_PLATFORM =~ /darwin/
+    require File.dirname(__FILE__) + '/web_test_html_formatter_osx_helper'
+    include WebTestHtmlFormatterOsxHelper
+    Watir::Browser = Watir::Safari
+  else
+    require File.dirname(__FILE__) + '/web_test_html_formatter_win_helper'
+    include WebTestHtmlFormatterWinHelper
+    Watir::Browser = Watir::IE
+  end
+
+  def save_thumb(img, dir, spec_number)
+    thumb = img.scale(0.25)
+    thumb_file = "#{dir}/#{spec_number}_thumb.png"
+    thumb.write(thumb_file)
+  end
+
+  def save_source(dir, spec_number, html)
+    File.open("#{dir}/#{spec_number}.html", "w") {|io| io.write(html)}
+  end
+end

data/vendor/web_spec/web_test_html_formatter_osx_helper.rb

@@ -0,0 +1,19 @@
+require 'rubygems'
+require 'safariwatir'
+
+module WebTestHtmlFormatterOsxHelper  
+  def save_screenshots(dir, spec_number)
+    img_path = "#{dir}/#{spec_number}.png"
+    # How do we capture the current window??
+    `screencapture #{img_path}`
+
+    img = Magick::Image.read(img_path)[0]
+    save_thumb(img, dir, spec_number)
+  end
+end
+
+class Watir::AppleScripter
+  def document_html
+    execute(%|document.documentElement.innerHTML;|)
+  end
+end

data/vendor/web_spec/web_test_html_formatter_win_helper.rb

@@ -0,0 +1,14 @@
+require 'rubygems'
+require 'win32screenshot'
+require 'watir'
+
+module WebTestHtmlFormatterWinHelper
+  def save_screenshots(dir, spec_number)
+    width, height, bmp = Win32::Screenshot.foreground
+
+    img = Magick::Image.from_blob(bmp)[0]
+    img_path = "#{dir}/#{spec_number}.png"
+    img.write(img_path)
+    save_thumb(img, dir, spec_number)
+  end
+end

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rspec
 version: !ruby/object:Gem::Version 
-  version: 0.7.3
-date: 2006-11-25 00:00:00 +00:00
-summary: RSpec-0.7.3 (r1137) - BDD for Ruby http://rspec.rubyforge.org/
+  version: 0.7.4
+date: 2006-12-02 00:00:00 +01:00
+summary: RSpec-0.7.4 (r1201) - BDD for Ruby http://rspec.rubyforge.org/
 require_paths: 
 - lib
 email: rspec-devel@rubyforge.org
@@ -39,20 +39,22 @@ files:
 - Rakefile
 - README
 - lib/spec.rb
+- lib/spec/callback.rb
 - lib/spec/expectations.rb
 - lib/spec/mocks.rb
 - lib/spec/runner.rb
 - lib/spec/version.rb
+- lib/spec/callback/callback_container.rb
+- lib/spec/callback/extensions/module.rb
+- lib/spec/callback/extensions/object.rb
 - lib/spec/expectations/diff.rb
 - lib/spec/expectations/errors.rb
 - lib/spec/expectations/extensions.rb
 - lib/spec/expectations/should.rb
 - lib/spec/expectations/sugar.rb
 - lib/spec/expectations/differs/default.rb
-- lib/spec/expectations/extensions/inspect_for_expectation_not_met_error.rb
 - lib/spec/expectations/extensions/numeric.rb
 - lib/spec/expectations/extensions/object.rb
-- lib/spec/expectations/extensions/symbol.rb
 - lib/spec/expectations/should/base.rb
 - lib/spec/expectations/should/change.rb
 - lib/spec/expectations/should/have.rb
@@ -84,7 +86,6 @@ files:
 - lib/spec/runner/spec_should_raise_handler.rb
 - lib/spec/runner/specification.rb
 - lib/spec/runner/extensions/kernel.rb
-- lib/spec/runner/extensions/object.rb
 - lib/spec/runner/formatter/base_text_formatter.rb
 - lib/spec/runner/formatter/html_formatter.rb
 - lib/spec/runner/formatter/progress_bar_formatter.rb
@@ -103,14 +104,18 @@ files:
 - examples/stack_spec.rb
 - examples/stubbing_example.rb
 - examples/test_case_spec.rb
-- vendor/watir/find_rspecs_home_page.rb
-- vendor/watir/rspec_watir.rb
-- vendor/watir/find_rspecs_home_page.txt
-- vendor/watir/README.txt
-- vendor/selenium/find_rspecs_home_page.rb
-- vendor/selenium/rspec_selenium.rb
-- vendor/selenium/start_browser_once.patch
-- vendor/selenium/README.txt
+- vendor/web_spec/web_test_html_formatter.rb
+- vendor/web_spec/web_test_html_formatter_helper.rb
+- vendor/web_spec/web_test_html_formatter_osx_helper.rb
+- vendor/web_spec/web_test_html_formatter_win_helper.rb
+- vendor/web_spec/selenium/find_rspecs_home_page.rb
+- vendor/web_spec/selenium/rspec_selenium.rb
+- vendor/web_spec/watir/find_rspecs_home_page.rb
+- vendor/web_spec/watir/rspec_watir.rb
+- vendor/web_spec/selenium/README.txt
+- vendor/web_spec/watir/find_rspecs_home_page.txt
+- vendor/web_spec/watir/README.txt
+- vendor/web_spec/selenium/start_browser_once.patch
 test_files: []
 
 rdoc_options: 

data/lib/spec/expectations/extensions/inspect_for_expectation_not_met_error.rb

@@ -1,15 +0,0 @@
-class Object
-  def inspect_for_expectation_not_met_error
-    return "#{inspect}" if inspect.include? "<"
-    return "<#{inspect}>" unless inspect.include? "<"
-  end
-end
-class TrueClass; def inspect_for_expectation_not_met_error; "true" end end
-class FalseClass; def inspect_for_expectation_not_met_error; "false" end end
-class NilClass; def inspect_for_expectation_not_met_error; "nil" end end
-class Class; def inspect_for_expectation_not_met_error; "<#{name}>" end end
-class Proc; def inspect_for_expectation_not_met_error; "<Proc>" end end
-class Array; def inspect_for_expectation_not_met_error; inspect end end
-class String; def inspect_for_expectation_not_met_error; inspect end end
-class Numeric; def inspect_for_expectation_not_met_error; inspect end end
-class Hash; def inspect_for_expectation_not_met_error; inspect end end

data/lib/spec/expectations/extensions/symbol.rb

@@ -1,5 +0,0 @@
-class Symbol
-  def supported_by_rspec?
-    return ["<","<=",">=",">","==","=~"].include?(to_s)
-  end
-end

data/lib/spec/runner/extensions/object.rb

@@ -1,21 +0,0 @@
-# http://eigenclass.org/hiki.rb?bounded+space+instance_exec
-class Object
-  module InstanceExecHelper; end
-  include InstanceExecHelper
-  def instance_exec(*args, &block)
-    begin
-      old_critical, Thread.critical = Thread.critical, true
-      n = 0
-      n += 1 while respond_to?(mname="__instance_exec#{n}")
-      InstanceExecHelper.module_eval{ define_method(mname, &block) }
-    ensure
-      Thread.critical = old_critical
-    end
-    begin
-      ret = send(mname, *args)
-    ensure
-      InstanceExecHelper.module_eval{ remove_method(mname) } rescue nil
-    end
-    ret
-  end
-end