spec_ui 0.1.0 → 0.2.0

data/Manifest.txt

@@ -3,18 +3,17 @@ Manifest.txt
 README.txt
 Rakefile
 lib/spec/ui.rb
-lib/spec/ui/behaviour.rb
-lib/spec/ui/configuration.rb
 lib/spec/ui/formatter.rb
-lib/spec/ui/rake_tasks.rb
-lib/spec/ui/rmagick_not_installed.png
-lib/spec/ui/screenshot_helper.rb
-lib/spec/ui/selenium_helper.rb
+lib/spec/ui/images/rmagick_not_installed.png
+lib/spec/ui/images/win32screenshot_not_installed.png
+lib/spec/ui/images/wrong_win32screenshot.png
+lib/spec/ui/screenshot_saver.rb
+lib/spec/ui/selenium
+lib/spec/ui/selenium/driver_ext.rb
 lib/spec/ui/version.rb
-lib/spec/ui/watir_helper.rb
-lib/spec/ui/webapp_helper.rb
-lib/spec/ui/win32screenshot_not_installed.png
-lib/spec/ui/wrong_win32screenshot.png
+lib/spec/ui/watir.rb
+lib/spec/ui/watir/browser.rb
+lib/spec/ui/watir/matchers.rb
 examples/selenium/Rakefile
 examples/selenium/README.txt
 examples/selenium/spec/google/find_rspecs_homepage_spec.rb
@@ -23,3 +22,5 @@ examples/watir/Rakefile
 examples/watir/README.txt
 examples/watir/spec/google/find_rspecs_homepage_spec.rb
 examples/watir/spec/spec_helper.rb
+spec/spec_helper.rb
+spec/spec/ui/watir/matchers_spec.rb

data/Rakefile

@@ -46,3 +46,7 @@ hoe = Hoe.new(GEM_NAME, VERS) do |p|
   #p.extra_deps     - An array of rubygem dependencies.
   #p.spec_extras    - A hash of extra values to set in the gemspec.
 end
+
+$LOAD_PATH.unshift File.dirname(__FILE__) + '/../rspec/lib'
+require 'spec/rake/spectask'
+Spec::Rake::SpecTask.new

data/examples/selenium/Rakefile

@@ -1,2 +1,12 @@
 require File.dirname(__FILE__) + '/spec/spec_helper'
-Spec::Ui.create_tasks
+require 'spec/rake/spectask'
+
+desc "Run UI Specs"
+Spec::Rake::SpecTask.new('spec:ui') do |t|
+  t.spec_files = FileList['spec/**/*.rb']
+  t.spec_opts = [
+    '--require', 'spec/spec_helper', 
+    '--format', 'Spec::Ui::ScreenshotFormatter:spec_report.html',
+    '--format', 'progress',
+  ]
+end

data/examples/selenium/spec/google/find_rspecs_homepage_spec.rb

@@ -29,7 +29,7 @@ describe "Google's search page" do
   end
 
   after(:each) do
-    save_screenshot_and_source(@browser)
+    Spec::Ui::WebappFormatter.browser = @browser
   end
 
   after(:all) do

data/examples/selenium/spec/spec_helper.rb

@@ -5,7 +5,4 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'rubygems'
 require 'spec'
 require 'spec/ui'
-
-Spec::Runner.configure do |config|
-  config.spec_ui_report_dir = File.dirname(__FILE__) + '/report'
-end
+require 'spec/ui/selenium'

data/examples/watir/Rakefile

@@ -1,2 +1,12 @@
 require File.dirname(__FILE__) + '/spec/spec_helper'
-Spec::Ui.create_tasks
+require 'spec/rake/spectask'
+
+desc "Run UI Specs"
+Spec::Rake::SpecTask.new('spec:ui') do |t|
+  t.spec_files = FileList['spec/**/*.rb']
+  t.spec_opts = [
+    '--require', 'spec/spec_helper', 
+    '--format', 'Spec::Ui::ScreenshotFormatter:spec_report.html',
+    '--format', 'progress',
+  ]
+end

data/examples/watir/spec/google/find_rspecs_homepage_spec.rb

@@ -26,9 +26,9 @@ describe "Google's search page" do
     @browser.button(:name, "btnG").click
     @browser.should_not have_text("Ali G")
   end
-
+  
   after(:each) do
-    save_screenshot_and_source(@browser)
+    Spec::Ui::ScreenshotFormatter.browser = @browser
   end
 
   after(:all) do

data/examples/watir/spec/spec_helper.rb

@@ -5,7 +5,10 @@ $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../../lib')
 require 'rubygems'
 require 'spec'
 require 'spec/ui'
+require 'spec/ui/watir'
 
-Spec::Runner.configure do |config|
-  config.spec_ui_report_dir = File.dirname(__FILE__) + '/report'
-end
+class Spec::DSL::Behaviour
+  def before_eval #:nodoc:
+    include Spec::Matchers::Watir # This gives us Watir matchers
+  end
+end

data/lib/spec/ui.rb

@@ -1,7 +1,2 @@
-require File.dirname(__FILE__) + '/ui/configuration'
-require File.dirname(__FILE__) + '/ui/behaviour'
-require File.dirname(__FILE__) + '/ui/webapp_helper'
-require File.dirname(__FILE__) + '/ui/watir_helper'
-require File.dirname(__FILE__) + '/ui/selenium_helper'
-require File.dirname(__FILE__) + '/ui/screenshot_helper'
-require File.dirname(__FILE__) + '/ui/rake_tasks'
+require 'spec/ui/formatter'
+require 'spec/ui/version'

data/lib/spec/ui/formatter.rb

@@ -1,14 +1,112 @@
+require 'tempfile'
+require 'base64'
+require 'cgi'
+require 'spec/ui/screenshot_saver'
+
 module Spec
   module Ui
     class ScreenshotFormatter < Spec::Runner::Formatter::HtmlFormatter
-      def extra_failure_content(failure)
-        super + "        <div><a href=\"images/#{current_example_number}.png\"><img width=\"25%\" height=\"25%\" src=\"images/#{current_example_number}.png\"></a></div>\n"
+      class << self
+        include ScreenshotSaver
+        attr_reader :html
+
+        # Takes screenshot and snapshot of the +browser+'s html.
+        # This method calls #screenshot! so that method should not be called
+        # when this method is used.
+        # This method *must* be called in an after(:each) block.
+        def browser=(browser)
+          screenshot!
+          @html = browser.html
+        end
+
+        # Takes a screenshot of the current window. Use this method when
+        # you don't have a browser object.
+        def screenshot!
+          @png_path = Tempfile.new("spec:ui").path
+          save_screenshot(png_path)
+        end
+        
+        def png_path
+          raise "Screenshot not taken. You must call #{self.class}#screenshot! or #{self.class}#browser=(@browser) from after(:each)" if @png_path.nil?
+          @png_path
+        end
+        
+        # Resets the screenshot and html. Do not call this method from your specs.
+        def reset!
+          @png_path = nil
+          @html = nil
+        end
+      end
+
+      def global_scripts
+        super + <<-EOF
+function showImage(e) {
+  w = window.open();
+  w.location = e.childNodes[0].src
+}
+
+// Lifted from Ruby RDoc
+function toggleSource( id ) {
+  var elem
+  var link
+
+  if( document.getElementById )
+  {
+    elem = document.getElementById( id )
+    link = document.getElementById( "l_" + id )
+  }
+  else if ( document.all )
+  {
+    elem = eval( "document.all." + id )
+    link = eval( "document.all.l_" + id )
+  }
+  else
+    return false;
+
+  if( elem.style.display == "block" )
+  {
+    elem.style.display = "none"
+    link.innerHTML = "show source"
+  }
+  else
+  {
+    elem.style.display = "block"
+    link.innerHTML = "hide source"
+  }
+}
+EOF
+      end
+
+      def global_styles
+        super + <<-EOF
+div.rspec-report textarea {
+  width: 100%;
+}
+
+div.rspec-report div.dyn-source {
+  background:#FFFFEE none repeat scroll 0%;
+  border:1px dotted black;
+  color:#000000;
+  display:none;
+  margin:0.5em 2em;
+  padding:0.5em;
+}
+EOF
       end
-    end
 
-    class WebappFormatter < ScreenshotFormatter
       def extra_failure_content(failure)
-        super + "        <div><a href=\"images/#{current_example_number}.html\">HTML source</a></div>\n"
+        result = super(failure)
+        # Add embedded image to the report.
+        img_data = Base64.encode64(File.open(self.class.png_path, "rb").read)
+        result += "        <div><a href=\"#\" onclick=\"showImage(this)\"><img width=\"25%\" height=\"25%\" src=\"data:image/png;base64,#{img_data}\" /></a></div>\n"
+        if self.class.html
+          escaped_html = CGI::escapeHTML(self.class.html)
+          source_id = "#{current_example_number}_source"
+          result += "        <div>[<a id=\"l_#{source_id}\" href=\"javascript:toggleSource('#{source_id}')\">show source</a>]</div>\n"
+          result += "        <div id=\"#{source_id}\" class=\"dyn-source\"><textarea rows=\"20\">#{escaped_html}</textarea></div>\n"
+        end
+        self.class.reset!
+        result
       end
     end
   end

data/lib/spec/ui/{screenshot_helper.rb → screenshot_saver.rb}

@@ -2,34 +2,25 @@ require 'fileutils'
 
 module Spec
   module Ui
-    module ScreenshotHelper
-      def md(dir)
-        FileUtils.mkdir_p(dir) unless File.directory?(dir)
-      end
-      
+    module ScreenshotSaver
       if RUBY_PLATFORM =~ /darwin/
-        def save_screenshot(dir, spec_number)
-          md(dir)
-          img_path = "#{dir}/#{spec_number}.png"
+        def save_screenshot(png_path)
           # How do we capture the current window??
-          `screencapture #{img_path}`
+          `screencapture #{png_path}`
         end
       else # Win32
         begin
+          # TODO: Move all this code to win32screenshot
           require 'rubygems'
           require 'RMagick'
           gem 'win32screenshot', '>=0.0.2'
           require 'win32screenshot'
-          def save_screenshot(dir, spec_number)
-            md(dir)
+          def save_screenshot(png_path)
             width, height, bmp = ::Win32::Screenshot.foreground
             begin
               img = Magick::Image.from_blob(bmp)[0]
-              img_path = "#{dir}/#{spec_number}.png"
-              dir = File.dirname(img_path)
-              FileUtils.mkdir_p(dir) unless File.exist?(dir)
               img.write(img_path)
-              img
+              nil
             rescue Magick::ImageMagickError => e
               if e.message =~ /Insufficient image data in file/
                 e.message << "\nTry this:\n1) Open your app (e.g. Internet Explorer)\n2) Resize the app to be bigger (without maximizing).\n3) close it so Windows remembers its size.\n" +
@@ -39,20 +30,17 @@ module Spec
             end
           end
         rescue Gem::LoadError => e
-          def save_screenshot(dir, spec_number)
-            md(dir)
-            FileUtils.cp(File.dirname(__FILE__) + '/wrong_win32screenshot.png', "#{dir}/#{spec_number}.png")
+          def save_screenshot(png_path)
+            FileUtils.cp(File.dirname(__FILE__) + '/images/wrong_win32screenshot.png', png_path)
           end
         rescue LoadError => e
           if(e.message =~ /win32screenshot/)
-            def save_screenshot(dir, spec_number)
-              md(dir)
-              FileUtils.cp(File.dirname(__FILE__) + '/win32screenshot_not_installed.png', "#{dir}/#{spec_number}.png")
+            def save_screenshot(png_path)
+              FileUtils.cp(File.dirname(__FILE__) + '/images/win32screenshot_not_installed.png', png_path)
             end
           else
-            def save_screenshot(dir, spec_number)
-              md(dir)
-              FileUtils.cp(File.dirname(__FILE__) + '/rmagick_not_installed.png', "#{dir}/#{spec_number}.png")
+            def save_screenshot(png_path)
+              FileUtils.cp(File.dirname(__FILE__) + '/images/rmagick_not_installed.png', png_path)
             end
           end
         end

data/lib/spec/ui/version.rb

@@ -2,7 +2,7 @@ module Spec
   module Ui
     module VERSION #:nodoc:
       MAJOR = 0
-      MINOR = 1
+      MINOR = 2
       TINY  = 0
 
       STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/spec/ui/watir.rb

@@ -0,0 +1,2 @@
+require 'spec/ui/watir/browser'
+require 'spec/ui/watir/matchers'

data/lib/spec/ui/watir/browser.rb

@@ -0,0 +1,37 @@
+require 'rubygems'
+
+if RUBY_PLATFORM =~ /darwin/
+  require 'safariwatir'
+  Watir::Browser = Watir::Safari
+else
+  require 'watir'
+  Watir::Browser = Watir::IE
+
+  class Watir::Browser
+    alias old_initialize initialize
+    # Brings the IE to the foreground (provided Win32::Screenshot is installed)
+    def initialize
+      result = old_initialize
+      ::Win32::Screenshot.setForegroundWindow(self.getIE.hwnd) rescue nil
+      result
+    end
+  end
+end
+
+class Watir::Browser
+  def kill!
+    close
+  end
+  
+  alias _old_goto goto
+  # Redefinition of Watir's original goto, which gives a better
+  # exception message (the URL is in the message)
+  def goto(url)
+    begin
+      _old_goto(url)
+    rescue => e
+      e.message << "\nURL: #{url}"
+      raise e
+    end
+  end
+end

data/lib/spec/ui/watir/matchers.rb

@@ -0,0 +1,97 @@
+# Matchers for Watir::IE/Watir::Safari instances
+module Spec::Matchers::Watir
+  class ContentMatcher # :nodoc
+    def initialize(kind, text_or_regexp)
+      @kind, @text_or_regexp = kind, text_or_regexp
+    end
+    
+    def matches?(container)
+      @container = container
+      @content = container.__send__(@kind)
+      if @text_or_regexp.is_a?(Regexp)
+        !!@content =~ @text_or_regexp
+      else
+        !!@content.index(@text_or_regexp.to_s)
+      end
+    end
+    
+    def failure_message
+      "Expected #{@container.class} to have #{@kind} matching #{@text_or_regexp}, but it was not found in:\n#{@content}"
+    end
+
+    def negative_failure_message
+      "Expected #{@container.class} to not have #{@kind} matching #{@text_or_regexp}, but it was found in:\n#{@content}"
+    end
+  end
+
+  # RSpec matcher that passes if @container#text matches +text_or_regexp+ (String or Regexp) 
+  def have_text(text_or_regexp)
+    ContentMatcher.new(:text, text_or_regexp)
+  end
+
+  # RSpec matcher that passes if @container#html matches +text_or_regexp+ (String or Regexp) 
+  def have_html(text_or_regexp)
+    ContentMatcher.new(:html, text_or_regexp)
+  end
+
+  class ElementMatcher # :nodoc
+    def initialize(kind, *args)
+      @kind, @args = kind, args
+    end
+    
+    def matches?(container)
+      @container = container
+      begin
+        element = @container.__send__(@kind, *@args)
+        if element.respond_to?(:assert_exists)
+          # IE
+          element.assert_exists
+          true
+        else
+          # Safari
+          element.exists?
+        end
+      rescue ::Watir::Exception::UnknownObjectException => e
+        false
+      end
+    end
+    
+    def failure_message
+      "Expected #{@container.class} to have #{@kind}(#{arg_string}), but it was not found"
+    end
+
+    def negative_failure_message
+      "Expected #{@container.class} to not have #{@kind}(#{arg_string}), but it was found"
+    end
+    
+    def arg_string
+      @args.map{|a| a.inspect}.join(", ")
+    end
+  end
+
+  # All the xxx(what, how) methods in Watir
+  [
+    :button, 
+    :cell, 
+    :checkbox, 
+    :div, 
+    :file_field, 
+    :form, 
+    :hidden, 
+    :image, 
+    :label,
+    :link,
+    :p, 
+    :radio, 
+    :row, 
+    :select_list,
+    :span,
+    :table,
+    :text_field
+  ].each do |kind|
+    # RSpec matcher that passes if container##{kind}(*args) returns an existing #{kind} element.
+    define_method("have_#{kind}".to_sym) do |*args|
+      ElementMatcher.new(kind, *args)
+    end
+  end
+end

data/spec/spec/ui/watir/matchers_spec.rb

@@ -0,0 +1,40 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+require 'spec/ui/watir/matchers'
+
+class BrowserStub
+  def label(*args)
+    LabelStub.new(*args)
+  end
+end
+
+class LabelStub
+  def initialize(how, what)
+    @how, @what = how, what
+  end
+  
+  def exists?
+    @what
+  end
+end
+
+describe "Browser" do
+  include Spec::Matchers::Watir
+
+  before do
+    @b = BrowserStub.new
+  end
+  
+  it "should support should have_label" do
+    lambda do
+      @b.should have_label(:foo, false)
+    end.should raise_error(Spec::Expectations::ExpectationNotMetError, 
+      'Expected BrowserStub to have label(:foo, false), but it was not found')
+  end
+
+  it "should support should_not have_label" do
+    lambda do
+      @b.should_not have_label(:foo, true)
+    end.should raise_error(Spec::Expectations::ExpectationNotMetError, 
+      'Expected BrowserStub to not have label(:foo, true), but it was found')
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+$LOAD_PATH.unshift(File.dirname(__FILE__) + '/../lib')
+require 'spec/ui'

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.1
+rubygems_version: 0.9.2
 specification_version: 1
 name: spec_ui
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
-date: 2007-05-01 00:00:00 +02:00
+  version: 0.2.0
+date: 2007-05-10 00:00:00 +02:00
 summary: Run UI RSpec examples with screenshot reports
 require_paths: 
 - lib
@@ -34,18 +34,17 @@ files:
 - README.txt
 - Rakefile
 - lib/spec/ui.rb
-- lib/spec/ui/behaviour.rb
-- lib/spec/ui/configuration.rb
 - lib/spec/ui/formatter.rb
-- lib/spec/ui/rake_tasks.rb
-- lib/spec/ui/rmagick_not_installed.png
-- lib/spec/ui/screenshot_helper.rb
-- lib/spec/ui/selenium_helper.rb
+- lib/spec/ui/images/rmagick_not_installed.png
+- lib/spec/ui/images/win32screenshot_not_installed.png
+- lib/spec/ui/images/wrong_win32screenshot.png
+- lib/spec/ui/screenshot_saver.rb
+- lib/spec/ui/selenium
+- lib/spec/ui/selenium/driver_ext.rb
 - lib/spec/ui/version.rb
-- lib/spec/ui/watir_helper.rb
-- lib/spec/ui/webapp_helper.rb
-- lib/spec/ui/win32screenshot_not_installed.png
-- lib/spec/ui/wrong_win32screenshot.png
+- lib/spec/ui/watir.rb
+- lib/spec/ui/watir/browser.rb
+- lib/spec/ui/watir/matchers.rb
 - examples/selenium/Rakefile
 - examples/selenium/README.txt
 - examples/selenium/spec/google/find_rspecs_homepage_spec.rb
@@ -54,6 +53,8 @@ files:
 - examples/watir/README.txt
 - examples/watir/spec/google/find_rspecs_homepage_spec.rb
 - examples/watir/spec/spec_helper.rb
+- spec/spec_helper.rb
+- spec/spec/ui/watir/matchers_spec.rb
 test_files: []
 
 rdoc_options: []

data/lib/spec/ui/behaviour.rb

@@ -1,6 +0,0 @@
-class Spec::DSL::Behaviour
-  def before_eval #:nodoc:
-    include Spec::Ui::WebappHelper
-    include Spec::Watir # This gives us Watir matchers
-  end
-end

data/lib/spec/ui/configuration.rb

@@ -1,7 +0,0 @@
-class Spec::DSL::Configuration
-  attr_accessor :spec_ui_report_dir
-  
-  def spec_ui_image_dir
-    File.join(spec_ui_report_dir, 'images')
-  end
-end

data/lib/spec/ui/rake_tasks.rb

@@ -1,31 +0,0 @@
-module Spec
-  module Ui
-    def self.create_tasks
-      require 'spec/rake/spectask'
-
-      if Spec::Runner.configuration.spec_ui_report_dir.nil?
-        STDERR.puts <<-EOF
-You must tell Spec::Ui where the report should go.
-Please put the following in your spec/spec_helper.rb file:
-
-require 'spec'
-require 'spec/ui'
-
-Spec::Runner.configure do |config|
-  config.spec_ui_report_dir = File.dirname(__FILE__) + '/report'
-end
-EOF
-      end
-        
-      FileUtils.rm_rf(Spec::Runner.configuration.spec_ui_report_dir) if File.exist?(Spec::Runner.configuration.spec_ui_report_dir)
-      FileUtils.mkdir_p(Spec::Runner.configuration.spec_ui_report_dir)
-      
-      desc "Run UI Specs"
-      Spec::Rake::SpecTask.new('spec:ui') do |t|
-        t.spec_files = FileList['spec/**/*.rb']
-        t.spec_opts = ['--require', 'spec/spec_helper', '--format', 'Spec::Ui::WebappFormatter']
-        t.out = "#{Spec::Runner.configuration.spec_ui_report_dir}/index.html"
-      end
-    end
-  end
-end

data/lib/spec/ui/watir_helper.rb

@@ -1,167 +0,0 @@
-require File.dirname(__FILE__) + '/webapp_helper'
-require 'rubygems'
-
-if RUBY_PLATFORM =~ /darwin/
-  require 'safariwatir'
-  Watir::Browser = Watir::Safari
-else
-  require 'watir'
-  Watir::Browser = Watir::IE
-
-  class Watir::Browser
-    alias old_initialize initialize
-    # Brings the IE to the foreground (provided Win32::Screenshot is installed)
-    def initialize
-      result = old_initialize
-      ::Win32::Screenshot.setForegroundWindow(self.getIE.hwnd) rescue nil
-      result
-    end
-  end
-end
-
-class Watir::Browser
-  def kill!
-    close
-  end
-  
-  alias contain_text? contains_text
-
-  alias old_goto goto
-  # Redefinition of Watir's original goto, which gives a better
-  # exception message (the URL is in the message)
-  def goto(url)
-    begin
-      old_goto(url)
-    rescue => e
-      e.message << "\nURL: #{url}"
-      raise e
-    end
-  end
-end
-
-module Spec
-  # Matchers for Watir::IE/Watir::Safari instances
-  module Watir
-    # RSpec matcher that passes if @browser#text matches +text+ (String or Regexp) 
-    def have_text(text)
-      Spec::Watir::HaveText.new(text)
-    end
-
-    class HaveText # :nodoc
-      def initialize(text_or_regexp)
-        @text_or_regexp = text_or_regexp
-      end
-      
-      def matches?(browser)
-        @browser = browser
-        if @text_or_regexp.is_a?(Regexp)
-          !!browser.text =~ @text_or_regexp
-        else
-          !!browser.text.index(@text_or_regexp.to_s)
-        end
-      end
-      
-      def failure_message
-        "Expected browser to have text matching #{@text_or_regexp}, but it was not found in:\n#{@browser.text}"
-      end
-
-      def negative_failure_message
-        "Expected browser to not have text matching #{@text_or_regexp}, but it was found in:\n#{@browser.text}"
-      end
-    end
-
-    # RSpec matcher that passes if @browser#html matches +text+ (String or Regexp) 
-    def have_html(text)
-      Spec::Watir::HaveHtml.new(text)
-    end
-
-    class HaveHtml # :nodoc
-      def initialize(text_or_regexp)
-        @text_or_regexp = text_or_regexp
-      end
-      
-      def matches?(browser)
-        @browser = browser
-        if @text_or_regexp.is_a?(Regexp)
-          !!browser.html =~ @text_or_regexp
-        else
-          !!browser.html.index(@text_or_regexp.to_s)
-        end
-      end
-      
-      def failure_message
-        "Expected browser to have HTML matching #{@text_or_regexp}, but it was not found in:\n#{@browser.html}"
-      end
-
-      def negative_failure_message
-        "Expected browser to not have HTML matching #{@text_or_regexp}, but it was found in:\n#{@browser.html}"
-      end
-    end
-
-    # RSpec matcher that passes if @browser#link(+how+,+what+) returns an existing link.
-    def have_link(how, what)
-      Spec::Watir::HaveLink.new(how, what)
-    end
-
-    class HaveLink # :nodoc
-      def initialize(how, what)
-        @how, @what = how, what
-      end
-      
-      def matches?(browser)
-        @browser = browser
-        begin
-          link = @browser.link(@how, @what)
-          if link.respond_to?(:assert_exists)
-            # IE
-            link.assert_exists
-            true
-          else
-            # Safari
-            link.exists?
-          end
-        rescue ::Watir::Exception::UnknownObjectException => e
-          false
-        end
-      end
-      
-      def failure_message
-        "Expected browser to have link(#{@how}, #{@what}), but it was not found"
-      end
-
-      def negative_failure_message
-        "Expected browser not to have link(#{@how}, #{@what}), but it was found"
-      end
-    end
-
-    # RSpec matcher that passes if @browser#text_field(+how+,+what+) returns an existing text field.
-    def have_text_field(how, what)
-      Spec::Watir::HaveTextField.new(how, what)
-    end
-
-    class HaveTextField # :nodoc
-      def initialize(how, what)
-        @how, @what = how, what
-      end
-      
-      def matches?(browser)
-        @browser = browser
-        begin
-          text_field = @browser.text_field(@how, @what)
-          text_field.assert_exists
-          true
-        rescue ::Watir::Exception::UnknownObjectException => e
-          false
-        end
-      end
-      
-      def failure_message
-        "Expected browser to have text_field(#{@how}, #{@what}), but it was not found"
-      end
-
-      def negative_failure_message
-        "Expected browser not to have text_field(#{@how}, #{@what}), but it was found"
-      end
-    end
-  end
-end

data/lib/spec/ui/webapp_helper.rb

@@ -1,23 +0,0 @@
-require 'spec'
-require File.dirname(__FILE__) + '/screenshot_helper'
-require File.dirname(__FILE__) + '/formatter'
-
-module Spec
-  module Ui
-    module WebappHelper
-      include Spec::Ui::ScreenshotHelper
-      @@spec_number = 0
-
-      # Call this method from your teardown block to have source and screenshot written to disk.
-      def save_screenshot_and_source(browser)
-        save_screenshot(Spec::Runner.configuration.spec_ui_image_dir, @@spec_number)
-        save_source(Spec::Runner.configuration.spec_ui_image_dir, @@spec_number, browser.html)
-        @@spec_number += 1
-      end
-
-      def save_source(dir, spec_number, html)
-        File.open("#{dir}/#{spec_number}.html", "w") {|io| io.write(html)}
-      end
-    end
-  end
-end