watir 1.5.6 → 1.6.2

data/{changes.rb → CHANGES}

@@ -1,4 +1,15 @@
-=begin rdoc
+== Watir 1.5.6
+
+To install this:
+
+  "gem update --system"
+  "gem install watir"
+
+Installer Fix
+
+This update fixes an installer problem in Watir 1.5.5 that affected some users. 
+If you installed 1.5.5 without error, there is no reason to get this update.
+
 == Watir 1.5.5.
 
 New Features
@@ -175,5 +186,3 @@ Changes in 1.3
    bug fix in text_fields iterator where it wasnt iterating through password or text ares. Added test for password fields
    bug fix for flash for tables
    bug fixes for images and links in cells
-   
-=end

data/bin/watir-console

@@ -1,2 +1,8 @@
 #!/usr/bin/env ruby
-exec 'irb.bat -r irb/completion -r watir/irb-history -r watir --simple-prompt --readline'
+$root = File.expand_path(File.join(File.dirname(__FILE__), '..', '..'))
+$watir_lib = File.join($root, 'watir', 'lib')
+$watir_common_lib = File.join($root, 'watir-common', 'lib')
+$firewatir_lib = File.join($root, 'firewatir', 'lib')
+$libs = "-I #{$watir_lib} -I #{$watir_common_lib} -I #{$firewatir_lib}"
+puts $libs
+exec "irb.bat #{$libs} -r irb/completion -r watir/irb-history -r watir --simple-prompt --readline"

data/lib/changes.rb

@@ -0,0 +1,3 @@
+=begin rdoc
+:include:../CHANGES   
+=end

data/{license.rb → lib/license.rb}

@@ -2,7 +2,8 @@
 
 License
   ---------------------------------------------------------------------------
-  Copyright (c) 2004-2007, Paul Rogers and Bret Pettichord
+  Copyright (c) 2004 - 2005, Paul Rogers and Bret Pettichord
+  Copyright (c) 2006 - 2008, Bret Pettichord
   All rights reserved.
   
   Redistribution and use in source and binary forms, with or without

data/{readme.rb → lib/readme.rb}

@@ -4,12 +4,7 @@ This is Watir - Web Application Testing In Ruby    http://wtr.rubyforge.org
 
 Install Ruby http://ruby-lang.org
    First you need to install Ruby using the one-click installer for Windows. We
-   recommend Ruby 1.8.5. (Ruby 1.8.6 has problems.)
-
-   However, if you wish to use Watir's support for the IE showModalDialog then
-   you must use Ruby 1.8.2-15 (or 1.8.2-14) and not a more recent version. This
-   dialog is the one that is posted with the showModalDialog() JavaScript
-   command and is supported with Watir's ie.modal_dialog command.
+   recommend Ruby 1.8.6. (Even if you are using modal dialogs.)
 
 Install Watir
    Watir is packaged as a gem, a Ruby library that can be installed over the
@@ -127,6 +122,9 @@ Contributors:
    Paul Taylor - Bug fix 194
    Vincent Xu - Chinese input support
    Tomislav Car - Filefield fix (210)
+   Michael Hwee & Aidy Lewis - Multiple attribute support for FireWatir (233)
+   Alan Baird - Fix for visible? method (253)
+   Jari Bakken - Regexp support for includes? and selected? methods for select lists (261)
 
 Acknowledgements:
    Chris Morris

data/{watir → lib/watir}/WindowHelper.rb

@@ -1,5 +1,5 @@
 require 'watir/win32ole'
-require 'watir' # for Watir.autoit
+require 'watir/ie' # for Watir.autoit
 
 class WindowHelper
     @@ie_window_name = "Windows Internet Explorer"

data/{watir → lib/watir}/close_all.rb

@@ -1,4 +1,4 @@
-require 'watir'
+require 'watir/ie'
 
 module Watir
   class IE

data/{watir → lib/watir}/collections.rb

@@ -146,7 +146,7 @@ module Watir
   end
   
   class Lis  < ElementCollections
-    include Watir::CommonCollection
+    include CommonCollection
     def element_class; Li; end
     
     def set_show_items

data/{watir → lib/watir}/container.rb

@@ -50,7 +50,7 @@ module Watir
     
     # Determine the how and what when defaults are possible.
     def process_default(default_attribute, how, what)
-      if how.class == String && what == nil
+      if what.nil? && String === how
         what = how
         how = default_attribute
       end
@@ -331,7 +331,7 @@ module Watir
     #    ie.select_list(:name, /n_/)                       # access the first select box whose name matches n_
     #    ie.select_list(:index, 2)                         # access the second select box on the page (1 based, so the first field is accessed with :index,1)
     #    ie.select(:xpath, "//select[@id='currency']/")    # access the select box with an id of currency
-    def select_list(how, what)
+    def select_list(how, what=nil)
       SelectList.new(self, how, what)
     end
     
@@ -374,8 +374,8 @@ module Watir
     #    ie.checkbox(:id, 'day_to_send', 'monday')         # access the check box with an id of day_to_send and a value of monday
     #    ie.checkbox(:name,'email_frequency', 'weekly')    # access the check box with a name of email_frequency and a value of 'weekly'
     #    ie.checkbox(:xpath, "//input[@name='email_frequency' and @value='daily']/")     # access the checkbox with a name of email_frequency and a value of 'daily'
-    def checkbox(how, what, value=nil)
-      CheckBox.new(self, how, what, ["checkbox"], value)
+    def checkbox(how, what=nil, value=nil)
+      CheckBox.new(self, how, what, value)
     end
     
     # this is the method for accessing the check boxes iterator. Returns a CheckBoxes object
@@ -416,8 +416,8 @@ module Watir
     #    ie.radio(:id, 'day_to_send', 'monday')         # access the radio button with an id of day_to_send and a value of monday
     #    ie.radio(:name,'email_frequency', 'weekly')     # access the radio button with a name of email_frequency and a value of 'weekly'
     #    ie.radio(:xpath, "//input[@name='email_frequency' and @value='daily']/")     # access the radio button with a name of email_frequency and a value of 'daily'
-    def radio(how, what, value=nil)
-      Radio.new(self, how, what, ["radio"], value)
+    def radio(how, what=nil, value=nil)
+      Radio.new(self, how, what, value)
     end
     
     # This is the method for accessing the radio buttons iterator. Returns a Radios object
@@ -725,11 +725,20 @@ module Watir
     #   * types - what object types we will look at.
     #   * value - used for objects that have one name, but many values. ex. radio lists and checkboxes
     def locate_input_element(how, what, types, value=nil)
+      case how
+      when :xpath
+        return element_by_xpath(what)
+      when :ole_object
+        return what
+      end
+      # else:
+      
       locator = InputElementLocator.new self, types
-      locator.document = document rescue true
+      locator.specifier = [how, what, value]
+      locator.document = document
       return locator.element if locator.fast_locate
+      # todo: restrict search to elements.getElementsByTag('INPUT'); faster
       locator.elements = ole_inner_elements if locator.elements.nil?
-      locator.specifier = [how, what, value]
       locator.locate
     end
     

data/{watir → lib/watir}/contrib/visible.rb

@@ -29,10 +29,10 @@ class Watir::Element
     object = document
     while object
       begin
-        if object.style.invoke('visibility') =~ /^hidden$/i
+        if object.currentstyle.invoke('visibility') =~ /^hidden$/i
           return false
         end
-        if object.style.invoke('display') =~ /^none$/i
+        if object.currentstyle.invoke('display') =~ /^none$/i
           return false
         end
         if object.invoke('isDisabled')

data/{watir → lib/watir}/dialog.rb

@@ -1,4 +1,4 @@
-require 'watir'
+require 'watir/ie'
 # TODO: move this file to watir/contrib
 
 module Watir

data/{watir → lib/watir}/element.rb

@@ -41,19 +41,15 @@ module Watir
                           end
                         end"
     end
-    # return a message indicating how the element is being located
-    def located_using_message
-      result = "using #{@how.inspect}"
-      result << ", #{@what.inspect}" if @what
-      result
-    end
+
+
 
     public
     def assert_exists
       locate if defined?(locate)
       unless ole_object
         raise UnknownObjectException.new(
-          "Unable to locate element, #{located_using_message}")
+          Watir::Exception.message_for_unable_to_locate(@how, @what))
       end
     end
     def assert_enabled

data/{watir → lib/watir}/form.rb

@@ -20,7 +20,7 @@ module Watir
   # wraps around a form OLE object
   class FormWrapper
     include FormAccess
-    def initialize(ole_object)
+    def initialize ole_object
       @ole_object = ole_object
     end
   end
@@ -30,7 +30,7 @@ module Watir
     include FormAccess
     include Container
     
-    attr_accessor :form
+    attr_accessor :form, :ole_object
     
     #   * container   - the containing object, normally an instance of IE
     #   * how         - symbol - how we access the form (:name, :id, :index, :action, :method)
@@ -52,9 +52,6 @@ module Watir
           next unless @ole_object == nil
           
           wrapped = FormWrapper.new(thisForm)
-          
-          log "form on page, name is " + wrapped.name
-          
           @ole_object =
           case @how
           when :name, :id, :method, :action
@@ -64,7 +61,7 @@ module Watir
           else
             raise MissingWayOfFindingObjectException, "#{how} is an unknown way of finding a form (#{what})"
           end
-          count = count +1
+          count += 1
         end
       end
       super(@ole_object)
@@ -77,15 +74,22 @@ module Watir
     end
     alias :exist? :exists?
     
+    def assert_exists
+      unless exists?
+        raise UnknownFormException, 
+          "Unable to locate a form using #{@how} and #{@what}" 
+      end
+    end
+    
     # Submit the data -- equivalent to pressing Enter or Return to submit a form.
-    def submit # XXX use assert_exists
-      raise UnknownFormException, "Unable to locate a form using #{@how} and #{@what} " if @ole_object == nil
-      @ole_object.submit
+    def submit 
+      assert_exists
+      @ole_object.invoke('submit')
       @container.wait
     end
     
-    def ole_inner_elements # XXX use assert_exists
-      raise UnknownFormException, "Unable to locate a form using #{@how} and #{@what} " if @ole_object == nil
+    def ole_inner_elements
+      assert_exists
       @ole_object.elements
     end
     private :ole_inner_elements
@@ -148,4 +152,20 @@ module Watir
     
   end # class Form
   
+end
+
+module Watir
+  class Forms < ElementCollections
+    def element_class; Form; end
+    def element_tag; 'FORM'; end
+    def length
+      @container.document.getElementsByTagName("FORM").length
+    end
+  end
+
+  module Container
+    def forms
+      Forms.new(self)
+    end
+  end
 end

data/{watir/ie.rb → lib/watir/ie-class.rb}

@@ -4,9 +4,6 @@ module Watir
     include Container
     include PageContainer
     
-    def self.quit
-    end
-    
     # Maximum number of seconds to wait when attaching to a window
     def self.reset_attach_timeout
       @@attach_timeout = 2.0
@@ -19,10 +16,13 @@ module Watir
       @@attach_timeout = timeout
     end
 
-		def self.defaults 	
+    # Return the options used when creating new instances of IE.
+    # BUG: this interface invites misunderstanding/misuse such as IE.options[:speed] = :zippy]
+		def self.options 	
 			{:speed => self.speed, :visible => self.visible}
-		end
-		def self.defaults= options
+	  end
+    # set values for options used when creating new instances of IE.
+		def self.set_options options
 			options.each do |name, value|
 				send "#{name}=", value
 			end
@@ -51,15 +51,6 @@ module Watir
 			@@visible = x
 		end
 		    
-    # The revision number (according to Subversion)
-    REVISION_STRING = '$Revision: 1263 $'
-    REVISION_STRING.scan(/Revision: (\d*)/)
-    REVISION = $1 or 'unknown'
-    
-    # The Release number
-    VERSION_SHORT = '1.5.6'
-    VERSION = VERSION_SHORT + '.' + REVISION
-    
     # Used internally to determine when IE has finished loading a page
     READYSTATE_COMPLETE = 4
        
@@ -75,9 +66,6 @@ module Watir
     # the last command
     attr_reader :down_load_time
     
-    # Whether the speed is :fast or :slow
-    attr_reader :speed
-    
     # the OLE Internet Explorer object
     attr_accessor :ie
     
@@ -194,19 +182,25 @@ module Watir
       @url_list = []
     end
 
+    # Specifies the speed that commands will be executed at. Choices are:
+    # * :slow (default)
+    # * :fast 
+    # * :zippy
+    # With IE#speed=  :zippy, text fields will be entered at once, instead of
+    # character by character (default).
     def speed= how_fast
       case how_fast
-      when :zippy :
+      when :zippy then
 	      @typingspeed = 0
 	      @pause_after_wait = 0.01
 	      @type_keys = false
 	      @speed = :fast
-      when :fast : 
+      when :fast then
 	      @typingspeed = 0
 	      @pause_after_wait = 0.01
 	      @type_keys = true
 	      @speed = :fast
-      when :slow :
+      when :slow then
 	      @typingspeed = 0.08
 	      @pause_after_wait = 0.1
 	      @type_keys = true
@@ -216,6 +210,11 @@ module Watir
       end
     end
     
+    def speed
+      return @speed if @speed == :slow
+      return @type_keys ? :fast : :zippy
+    end
+    
     # deprecated: use speed = :fast instead
     def set_fast_speed
     	self.speed = :fast
@@ -389,6 +388,7 @@ module Watir
     
     # Closes the Browser
     def close
+      return unless exists?
       @closing = true
       @ie.quit
     end
@@ -496,7 +496,7 @@ module Watir
           doc.frames.length.times do |n|
             begin
               documents_to_wait_for << doc.frames[n.to_s].document
-            rescue WIN32OLERuntimeError
+            rescue WIN32OLERuntimeError, NoMethodError
             end
           end
         rescue WIN32OLERuntimeError

data/{watir.rb → lib/watir/ie.rb}

@@ -2,7 +2,7 @@
   license
   ---------------------------------------------------------------------------
   Copyright (c) 2004 - 2005, Paul Rogers and Bret Pettichord
-  Copyright (c) 2006 - 2007, Bret Pettichord
+  Copyright (c) 2006 - 2008, Bret Pettichord
   All rights reserved.
 
   Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,6 @@
   (based on BSD Open Source License)
 =end
 
-
 require 'watir/win32ole'
 
 require 'logger'
@@ -43,37 +42,23 @@ require 'watir/winClicker'
 require 'watir/exceptions'
 require 'watir/utils'
 require 'watir/close_all'
-require 'watir/waiter'
 require 'watir/ie-process'
 
 require 'dl/import'
 require 'dl/struct'
 require 'Win32API'
 
-class String
-  def matches(x)
-    return self == x
-  end
-end
-
-class Regexp
-  def matches(x)
-    return self.match(x)
-  end
-end
-
-class Integer
-  def matches(x)
-    return self == x
-  end
-end
+require 'watir/matches'
 
-# ARGV needs to be deleted to enable the Test::Unit functionality that grabs
+# these switches need to be deleted from ARGV to enable the Test::Unit 
+# functionality that grabs
 # the remaining ARGV as a filter on what tests to run.
 # Note: this means that watir must be require'd BEFORE test/unit.
+# (Alternatively, you could require test/unit first and then put the Watir::IE
+# arguments after the '--'.)
 
 # Make Internet Explorer invisible. -b stands for background
-$HIDE_IE = ARGV.delete('-b')
+$HIDE_IE ||= ARGV.delete('-b')
 
 # Run fast
 $FAST_SPEED = ARGV.delete('-f')
@@ -86,7 +71,8 @@ require 'watir/win32'
 require 'watir/container'
 require 'watir/locator'
 require 'watir/page-container'
-require 'watir/ie'
+require 'watir/ie-class'
+require 'watir/version'
 require 'watir/popup'
 require 'watir/element'
 require 'watir/frame'
@@ -100,16 +86,14 @@ require 'watir/image'
 require 'watir/link'
 require 'watir/collections'
 
+require 'watir'
+
 module Watir
   include Watir::Exception
   
   # Directory containing the watir.rb file
   @@dir = File.expand_path(File.dirname(__FILE__))
 
-  def wait_until(*args)
-    Waiter.wait_until(*args) {yield}
-  end
-
   ATTACHER = Waiter.new
   # Like regular Ruby "until", except that a TimeOutException is raised
   # if the timeout is exceeded. Timeout is IE.attach_timeout.