RubyGems - watir - Versions diffs - 1.5.3 → 1.5.4 - Mend

watir 1.5.3 → 1.5.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (16) hide show

data/changes.rb +13 -2
data/readme.rb +2 -0
data/unittests/form_test.rb +1 -1
data/unittests/html/forms2.html +1 -1
data/unittests/setup.rb +1 -1
data/unittests/speed_settings_test.rb +39 -5
data/unittests/textfield_for_ch_char_test.rb +30 -0
data/unittests/textfields_test.rb +3 -3
data/watir/assertions.rb +1 -1
data/watir/close_all.rb +1 -1
data/watir/container.rb +8 -57
data/watir/element.rb +4 -1
data/watir/ie.rb +62 -32
data/watir/input_elements.rb +79 -46
data/watir/locator.rb +69 -0
metadata +12 -2

data/changes.rb CHANGED

@@ -1,5 +1,16 @@
 =begin rdoc
-Major Changes in 1.5
+== Version 1.5.3
+Bug fixes and minor cleanup.
+* Fix text areas bugs.
+* Fix warning messages caused by redefined constants.
+* Break out watir.rb into multiple files.
+* Fix [WTR-90] error when running tests when installing gem.
+  http://jira.openqa.org/browse/WTR-90
+* Fix tests.
+* Update documentation.
+Major Changes in 1.5.1
     Support for IE's Modal Dialogs.
       showModalDialog()
     Any method can be used to specify an element (:text, :class, etc.).
@@ -9,7 +20,7 @@ Major Changes in 1.5
     One can now use multiple attributes to specify an element.
       ie.span(:class =>'Label', :text => 'Add new').click
-Other Changes in 1.5
+Other Changes in 1.5.1
     * Migrated IE.new_process from watir/contrib and improved its reliability. We now recommend IE.new_process over IE.new as a way to avoid numerous errors detailed in http://jira.openqa.org/browse/WTR-150.
     * Added IE.start_process. This works like IE.start, but uses the new_process mechanism to start IE.
     * Added IE.new_window and IE.start_window. This are synonyms for IE.new and IE.start.

data/readme.rb CHANGED

@@ -139,6 +139,8 @@ Contributors:
    Xavier Noria
    Jeff Fry
    Zeljko Filipin
+   Paul Taylor - Bug fix 194
+   Vincent Xu - Chinese input support
 Acknowledgements:
    Chris Morris

data/unittests/form_test.rb CHANGED

@@ -1,5 +1,5 @@
 # feature tests for Forms
-# revision: $Revision: 1079 $
+# revision: $Revision: 1294 $
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'

data/unittests/html/forms2.html CHANGED

@@ -5,7 +5,7 @@ Test page for Forms
 </title>
 </head>
 <body>
-CVS Revision: "$Revision: 1009 $"
+CVS Revision: "$Revision: 1294 $"
 <br>
 <br>
 <table>

data/unittests/setup.rb CHANGED

@@ -41,7 +41,7 @@ $non_core_tests =
 $core_tests = $all_tests - $non_core_tests - $window_tests - $xpath_tests
 $ie = Watir::IE.new
-$ie.set_fast_speed
+$ie.speed = :fast
 $myDir = File.expand_path(File.dirname(__FILE__))
 $myDir.sub!( %r{/cygdrive/(\w)/}, '\1:/' ) # convert from cygwin to dos

data/unittests/speed_settings_test.rb CHANGED

@@ -1,22 +1,56 @@
 # tests for ability to set defaults for Watir
-# revision: $Revision: 958 $
+# revision: $Revision: 1293 $
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'test/unit'
 require 'watir'
-class TC_Defaults < Test::Unit::TestCase
+class TC_instance_options < Test::Unit::TestCase
   include Watir
   def test_using_default
-    @ie1 = IE.new
+    @ie1 = Watir::IE.new
     @ie1.speed = :fast
     assert_equal(:fast, @ie1.speed)
     @ie1.speed = :slow
     assert_equal(:slow, @ie1.speed)
     assert_raise(ArgumentError){@ie1.speed = :fubar}
-  end
+  end
   def teardown
     @ie1.close if @ie1
   end
+end
+class TC_class_options < Test::Unit::TestCase
+	include Watir
+	@@hide_ie = $HIDE_IE
+	def setup
+		@previous = Watir::IE.defaults
+	end
+	def test_class_defaults
+		assert_equal({:speed => :slow, :visible => ! @@hide_ie}, IE.defaults)
+	end
+	def test_change_defaults
+		IE.defaults = {:speed => :fast}
+		assert_equal(:fast, IE.speed)
+		IE.defaults = {:visible => false}
+		assert_equal(false, IE.visible)
+		IE.defaults = {:speed => :slow}
+		assert_equal(:slow, IE.speed)
+		IE.defaults = {:visible => true}
+		assert_equal(true, IE.visible)
+	end
+	def test_defaults_affect_on_instance
+		IE.defaults = {:speed => :fast}
+		@ie1 = IE.new
+		assert_equal(:fast, @ie1.speed)
+		IE.defaults = {:speed => :slow}
+		@ie2 = IE.new
+		assert_equal(:slow, @ie2.speed)
+	end
+	def teardown
+		IE.defaults = @previous
+		@ie1.close if @ie1
+		@ie2.close if @ie2
+	end
 end

data/unittests/textfield_for_ch_char_test.rb ADDED

@@ -0,0 +1,30 @@
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
+require 'unittests/setup'
+class TC_Fields_For_Chinese_Char < Test::Unit::TestCase
+  def setup()
+    $ie.goto($htmlRoot + "textfields1.html")
+  end
+  def test_chinese_char_should_be_appended_to_text_field
+    $ie.text_field(:name, "text1").append(" ĳĳ")
+    assert_equal(  "Hello World ĳĳ" , $ie.text_field(:name, "text1").getContents )
+  end
+  def test_mixed_char_should_be_appended_to_text_field
+    $ie.text_field(:name, "text1").append(" ĳaĳa")
+    assert_equal(  "Hello World ĳaĳa" , $ie.text_field(:name, "text1").getContents )
+  end
+  def test_chinese_char_should_be_set_to_text_field
+    $ie.text_field(:name, "text1").set("ĳĳ")
+    assert_equal(  "ĳĳ" , $ie.text_field(:name, "text1").getContents )
+  end
+  def test_mixed_char_should_be_set_to_text_field
+    $ie.text_field(:name, "text1").set("ĳaĳa")
+    assert_equal(  "ĳaĳa" , $ie.text_field(:name, "text1").getContents )
+  end
+end

data/unittests/textfields_test.rb CHANGED

@@ -1,5 +1,5 @@
 # feature tests for Text Fields & Labels
-# revision: $Revision: 1196 $
+# revision: $Revision: 1295 $
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..') if $0 == __FILE__
 require 'unittests/setup'
@@ -151,12 +151,12 @@ class TC_Fields < Test::Unit::TestCase
   end
   def test_JS_Events
-    $ie.text_field(:name, 'events_tester').set('p')
+    $ie.text_field(:name, 'events_tester').requires_typing.set('p')
     # the following line has an extra keypress at the begining, as we mimic the delete key being pressed
     assert_equal( "keypresskeydownkeypresskeyup" , $ie.text_field(:name , 'events_text').value.gsub("\r\n" , "")  )
     $ie.button(:value , "Clear Events Box").click
-    $ie.text_field(:name , 'events_tester').set('ab')
+    $ie.text_field(:name , 'events_tester').requires_typing.set('ab')
     # the following line has an extra keypress at the begining, as we mimic the delete key being pressed
     assert_equal( "keypresskeydownkeypresskeyupkeydownkeypresskeyup" , $ie.text_field(:name , 'events_text').value.gsub("\r\n" , "") )

data/watir/assertions.rb CHANGED

@@ -10,7 +10,7 @@ module Watir
     # Whether true or false, the assertion count is incremented.
     def verify boolean, message = 'verify failed.'
       add_assertion
-      add_failure message, caller unless boolean
+      add_failure message.to_s, caller unless boolean
     end
     def verify_equal expected, actual, message=nil

data/watir/close_all.rb CHANGED

@@ -14,7 +14,7 @@ module Watir
     def self.close_all_but(except=nil)
       Watir::IE.each do |ie|
         ie.close_modal
-        ie.close unless except and except.hwnd == window.hwnd
+        ie.close unless except and except.hwnd == ie.hwnd
       end
       sleep 1.0 # replace with polling for window count to be zero?
     end

data/watir/container.rb CHANGED

@@ -25,6 +25,7 @@ module Watir
     # This is used to change the typing speed when entering text on a page.
     attr_accessor :typingspeed
+    attr_accessor :type_keys
     # The color we want to use for the active object. This can be any valid web-friendly color.
     attr_accessor :activeObjectHighLightColor
     # The PageContainer object containing this element
@@ -32,6 +33,7 @@ module Watir
     def copy_test_config(container) # only used by form and frame
       @typingspeed = container.typingspeed
+      @type_keys = container.type_keys
       @activeObjectHighLightColor = container.activeObjectHighLightColor
     end
     private :copy_test_config
@@ -813,63 +815,12 @@ 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)
-      elements = nil
-      # Searching through all elements returned by ole_inner_elements
-      # is *significantly* slower than IE's getElementById() and
-      # getElementsByName() calls when how is :id or :name.  However
-      # IE doesn't match Regexps, so first we make sure what is a String.
-      # In addition, IE's getElementById() will also return an element
-      # where the :name matches, so we will only return the results of
-      # getElementById() if the matching element actually HAS a matching
-      # :id.
-      begin
-        if what.class == String   # Only use fast calls with String what.
-          if how == :id
-            element = document.getElementById(what)
-            # Return if our fast match really HAS a matching :id
-            return element if element.nil? or element.invoke('id') == what
-          elsif how == :name
-            elements = document.getElementsByName(what)
-          end
-        end
-      rescue
-      end
-      # Use slow methods if the faster methods didn't match
-      elements = ole_inner_elements if elements.nil?
-      how = :value if how == :caption
-      how = :class_name if how == :class
-      what = what.to_i if how == :index
-      value = value.to_s if value
-      log "getting object - how is #{how} what is #{what} types = #{types} value = #{value}"
-      object_index = 1
-      elements.each do |object|
-        element = Element.new(object)
-        if types.include?(element.type)
-          if how == :index
-            attribute = object_index
-          else
-            begin
-              attribute = element.send(how)
-            rescue NoMethodError
-              raise MissingWayOfFindingObjectException,
-                            "#{how} is an unknown way of finding an <INPUT> element (#{what})"
-            end
-          end
-          if what.matches(attribute)
-            if value
-              if element.value == value
-                return object
-              end
-            else
-              return object
-            end
-          end
-          object_index += 1
-        end
-      end
-      return nil
+      locator = InputElementLocator.new self, types
+      locator.document = document rescue true
+      return locator.element if locator.fast_locate
+      locator.elements = ole_inner_elements if locator.elements.nil?
+      locator.specifier = [how, what, value]
+      locator.locate
     end
     # returns the ole object for the specified element

data/watir/element.rb CHANGED

@@ -147,7 +147,10 @@ module Watir
     def typingspeed
       @container.typingspeed
     end
+		def type_keys
+			return @container.type_keys if @type_keys.nil?
+			@type_keys
+		end
     def activeObjectHighLightColor
       @container.activeObjectHighLightColor
     end

data/watir/ie.rb CHANGED

@@ -18,27 +18,51 @@ module Watir
     def self.attach_timeout=(timeout)
       @@attach_timeout = timeout
     end
+		def self.defaults
+			{:speed => self.speed, :visible => self.visible}
+		end
+		def self.defaults= options
+			options.each do |name, value|
+				send "#{name}=", value
+			end
+		end
+		# The globals $FAST_SPEED and $HIDE_IE are checked both at initialization
+		# and later, because they
+		# might be set after initialization. Setting them beforehand (e.g. from
+		# the command line) will affect the class, otherwise it is only a temporary
+		# effect
+		@@speed = $FAST_SPEED ? :fast : :slow
+		def self.speed
+			return :fast if $FAST_SPEED
+			@@speed
+		end
+		def self.speed= x
+			$FAST_SPEED = nil
+			@@speed = x
+		end
+		@@visible = $HIDE_IE ? false : true
+		def self.visible
+			return false if $HIDE_IE
+			@@visible
+		end
+		def self.visible= x
+			$HIDE_IE = nil
+			@@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.3'
+    VERSION_SHORT = '1.5.4'
     VERSION = VERSION_SHORT + '.' + REVISION
     # Used internally to determine when IE has finished loading a page
     READYSTATE_COMPLETE = 4
-    # TODO: the following constants should be able to be specified by object (not class)
-    # The delay when entering text on a web page when speed = :slow.
-    DEFAULT_TYPING_SPEED = 0.08
-    # The default time we wait after a page has loaded when speed = :slow.
-    DEFAULT_SLEEP_TIME = 0.1
     # The default color for highlighting objects as they are accessed.
     HIGHLIGHT_COLOR = 'yellow'
@@ -77,7 +101,7 @@ module Watir
     def _new_window_init
       create_browser_window
-      set_defaults
+      initialize_options
       goto 'about:blank' # this avoids numerous problems caused by lack of a document
     end
@@ -108,7 +132,7 @@ module Watir
       iep = Process.start
       @ie = iep.window
       @process_id = iep.process_id
-      set_defaults
+      initialize_options
       goto 'about:blank'
     end
@@ -138,7 +162,7 @@ module Watir
     # this method is used internally to attach to an existing window
     def _attach_init how, what
       attach_browser_window how, what
-      set_defaults
+      initialize_options
       wait
     end
@@ -147,7 +171,7 @@ module Watir
     def self.bind window
       ie = new true
       ie.ie = window
-      ie.set_defaults
+      ie.initialize_options
       ie
     end
@@ -156,18 +180,15 @@ module Watir
     end
     private :create_browser_window
-    def set_defaults
-      self.visible = ! $HIDE_IE
+    def initialize_options
+      self.visible = IE.visible
+      self.speed = IE.speed
       @ole_object = nil
       @page_container = self
       @error_checkers = []
       @activeObjectHighLightColor = HIGHLIGHT_COLOR
-      if $FAST_SPEED
-        set_fast_speed
-      else
-        set_slow_speed
-      end
       @logger = DefaultLogger.new
       @url_list = []
@@ -175,8 +196,21 @@ module Watir
     def speed= how_fast
       case how_fast
-      when :fast : set_fast_speed
-      when :slow : set_slow_speed
+      when :zippy :
+	      @typingspeed = 0
+	      @pause_after_wait = 0.01
+	      @type_keys = false
+	      @speed = :fast
+      when :fast :
+	      @typingspeed = 0
+	      @pause_after_wait = 0.01
+	      @type_keys = true
+	      @speed = :fast
+      when :slow :
+	      @typingspeed = 0.08
+	      @pause_after_wait = 0.1
+	      @type_keys = true
+	      @speed = :slow
       else
         raise ArgumentError, "Invalid speed: #{how_fast}"
       end
@@ -184,16 +218,12 @@ module Watir
     # deprecated: use speed = :fast instead
     def set_fast_speed
-      @typingspeed = 0
-      @defaultSleepTime = 0.01
-      @speed = :fast
+    	self.speed = :fast
     end
     # deprecated: use speed = :slow instead
     def set_slow_speed
-      @typingspeed = DEFAULT_TYPING_SPEED
-      @defaultSleepTime = DEFAULT_SLEEP_TIME
-      @speed = :slow
+    	self.speed = :slow
     end
     def visible
@@ -453,7 +483,7 @@ module Watir
       rescue WIN32OLERuntimeError # IE window must have been closed
         @down_load_time = Time.now - start_load_time
-        sleep @defaultSleepTime unless no_sleep
+        sleep @pause_after_wait unless no_sleep
         return @down_load_time
       end
@@ -475,7 +505,7 @@ module Watir
       @down_load_time = Time.now - start_load_time
       run_error_checks
-      sleep @defaultSleepTime unless no_sleep
+      sleep @pause_after_wait unless no_sleep
       @down_load_time
     end

data/watir/input_elements.rb CHANGED

@@ -17,6 +17,10 @@ module Watir
       super(nil)
     end
   end
+  #
+  # Input: Select
+  #
   # This class is the way in which select boxes are manipulated.
   # Normally a user would not need to create this object as it is returned by the Watir::Container#select_list method
@@ -26,6 +30,7 @@ module Watir
     attr_accessor :o
     # This method clears the selected items in the select box
+    # TODO: fix Camel case
     def clearSelection
       assert_exists
       highlight(:set)
@@ -99,7 +104,7 @@ module Watir
     # Returns the selected items as an array.
     # Raises UnknownObjectException if the select box is not found.
-    def getSelectedItems
+    def getSelectedItems     # TODO: fix camel case
       assert_exists
       returnArray = []
       @container.log "There are #{@o.length} items"
@@ -185,12 +190,18 @@ module Watir
     end
   end
-  # This is the main class for accessing buttons.
-  # Normally a user would not need to create this object as it is
-  # returned by the Watir::Container#button method
+  #
+  # Input: Button
+  #
+  # Returned by the Watir::Container#button method
   class Button < InputElement
     INPUT_TYPES = ["button", "submit", "image", "reset"]
   end
+  #
+  # Input: Text
+  #
   # This class is the main class for Text Fields
   # Normally a user would not need to create this object as it is returned by the Watir::Container#text_field method
@@ -203,23 +214,21 @@ module Watir
       assert_exists
       begin
         ole_object.invoke('maxlength').to_i
-      rescue
+      rescue WIN32OLERuntimeError
         0
       end
     end
     # Returns true or false if the text field is read only.
     #   Raises UnknownObjectException if the object can't be found.
     def_wrap :readonly?, :readOnly
     def text_string_creator
       n = []
-      n <<   "length:".ljust(TO_S_SIZE) + self.size.to_s
-      n <<   "max length:".ljust(TO_S_SIZE) + self.maxlength.to_s
-      n <<   "read only:".ljust(TO_S_SIZE) + self.readonly?.to_s
-      return n
+      n << "length:".ljust(TO_S_SIZE) + self.size.to_s
+      n << "max length:".ljust(TO_S_SIZE) + self.maxlength.to_s
+      n << "read only:".ljust(TO_S_SIZE) + self.readonly?.to_s
+      n
     end
     private :text_string_creator
@@ -227,28 +236,30 @@ module Watir
       assert_exists
       r = string_creator
       r += text_string_creator
-      return r.join("\n")
+      r.join("\n")
     end
     def assert_not_readonly
-      raise ObjectReadOnlyException, "Textfield #{@how} and #{@what} is read only." if self.readonly?
+      if self.readonly?
+        raise ObjectReadOnlyException,
+          "Textfield #{@how} and #{@what} is read only."
+      end
     end
-    # This method returns true or false if the text field contents is either a string match
-    # or a regular expression match to the supplied value.
+    # Returns true if the text field contents is matches the specified target,
+    # which can be either a string or a regular expression.
     #   Raises UnknownObjectException if the object can't be found
-    #   * containsThis - string or reg exp - the text to verify
-    def verify_contains(containsThis) # FIXME: verify_contains should have same name and semantics as IE#contains_text (prolly make this work for all elements)
+    def verify_contains(target) # FIXME: verify_contains should have same name and semantics as IE#contains_text (prolly make this work for all elements)
       assert_exists
-      if containsThis.kind_of? String
-        return true if self.value == containsThis
-      elsif containsThis.kind_of? Regexp
-        return true if self.value.match(containsThis) != nil
+      if target.kind_of? String
+        return true if self.value == target
+      elsif target.kind_of? Regexp
+        return true if self.value.match(target) != nil
       end
       return false
     end
-    # this method is used to drag the entire contents of the text field to another text field
+    # Drag the entire contents of the text field to another text field
     #  19 Jan 2005 - It is added as prototype functionality, and may change
     #   * destination_how   - symbol, :id, :name how we identify the drop target
     #   * destination_what  - string or regular expression, the name, id, etc of the text field that will be the drop target
@@ -273,7 +284,7 @@ module Watir
       self.value = ""
     end
-    # This method clears the contents of the text box.
+    # Clears the contents of the text box.
     #   Raises UnknownObjectException if the object can't be found
     #   Raises ObjectDisabledException if the object is disabled
     #   Raises ObjectReadOnlyException if the object is read only
@@ -294,61 +305,73 @@ module Watir
       highlight(:clear)
     end
-    # This method appens the supplied text to the contents of the text box.
+    # Appends the specified string value to the contents of the text box.
     #   Raises UnknownObjectException if the object cant be found
     #   Raises ObjectDisabledException if the object is disabled
     #   Raises ObjectReadOnlyException if the object is read only
-    #   * setThis  - string - the text to append
-    def append(setThis)
+    def append(value)
       assert_enabled
       assert_not_readonly
       highlight(:set)
       @o.scrollIntoView
       @o.focus
-      doKeyPress(setThis)
+      type_by_character(value)
       highlight(:clear)
     end
-    # This method sets the contents of the text box to the supplied text
+    # Sets the contents of the text box to the specified text value
     #   Raises UnknownObjectException if the object cant be found
     #   Raises ObjectDisabledException if the object is disabled
     #   Raises ObjectReadOnlyException if the object is read only
-    #   * setThis - string - the text to set
-    def set(setThis)
+    def set(value)
       assert_enabled
       assert_not_readonly
       highlight(:set)
       @o.scrollIntoView
-      @o.focus
-      @o.select
-      @o.fireEvent("onSelect")
-      @o.value = ""
-      @o.fireEvent("onKeyPress")
-      doKeyPress(setThis)
+      if type_keys
+	      @o.focus
+	      @o.select
+	      @o.fireEvent("onSelect")
+	      @o.fireEvent("onKeyPress")
+	      @o.value = ""
+	      type_by_character(value)
+	      @o.fireEvent("onChange")
+	      @o.fireEvent("onBlur")
+	    else
+				@o.value = limit_to_maxlength(value)
+	    end
       highlight(:clear)
-      @o.fireEvent("onChange")
-      @o.fireEvent("onBlur")
     end
-    # this method sets the value of the text field directly. It causes no events to be fired or exceptions to be raised, so generally shouldnt be used
-    # it is preffered to use the set method.
+    # Sets the value of the text field directly.
+    # It causes no events to be fired or exceptions to be raised,
+    # so generally shouldn't be used.
+    # It is preffered to use the set method.
     def value=(v)
       assert_exists
       @o.value = v.to_s
     end
+    def requires_typing
+    	@type_keys = true
+    	self
+    end
+    def abhors_typing
+    	@type_keys = false
+    	self
+    end
     private
-    # This method is used internally by setText and appendText
+    # Type the characters in the specified string (value) one by one.
     # It should not be used externally.
     #   * value - string - The string to enter into the text field
-    def doKeyPress(value)
+    def type_by_character(value)
       value = limit_to_maxlength(value)
-      for i in 0 .. value.length - 1
+      characters_in(value) do |c|
         sleep @container.typingspeed
-        c = value[i,1]
         @o.value = @o.value.to_s + c
         @o.fireEvent("onKeyDown")
         @o.fireEvent("onKeyPress")
@@ -356,6 +379,16 @@ module Watir
       end
     end
+    # Supports double-byte characters
+    def characters_in(value)
+      index = 0
+      while index < value.length
+        len = value[index] > 128 ? 2 : 1
+        yield value[index, len]
+        index += len
+      end
+    end
     # Return the value (a string), limited to the maxlength of the element.
     def limit_to_maxlength(value)
       return value if @o.invoke('type') =~ /textarea/i # text areas don't have maxlength
@@ -393,7 +426,7 @@ module Watir
   end
-  # This class is the class for fields that accept file uploads
+  # For fields that accept file uploads
   # Windows dialog is opened and handled in this case by autoit
   # launching into a new process.
   class FileField < InputElement

data/watir/locator.rb CHANGED

@@ -76,4 +76,73 @@ module Watir
     end
   end
+  class InputElementLocator
+    attr_accessor :document, :element, :elements
+    def initialize container, types
+      @container = container
+      @types = types
+      @elements = nil
+    end
+    def specifier= arg
+      how, what, value = arg
+      how = :value if how == :caption
+      how = :class_name if how == :class
+      what = what.to_i if how == :index
+      value = value.to_s if value
+      @how = how
+      @what = what
+      @value = value
+    end
+    def locate
+      object_index = 1
+      @elements.each do |object|
+        element = Element.new(object)
+        if @types.include?(element.type)
+          if @how == :index
+            attribute = object_index
+          else
+            begin
+              attribute = element.send(@how)
+            rescue NoMethodError
+              raise MissingWayOfFindingObjectException,
+                "#{@how} is an unknown way of finding an <INPUT> element (#{@what})"
+            end
+          end
+          if @what.matches(attribute)
+            if @value
+              if element.value == @value
+                return object
+              end
+            else
+              return object
+            end
+          end
+          object_index += 1
+        end
+      end
+      return nil
+    end
+    def fast_locate
+      # Searching through all elements returned by ole_inner_elements
+      # is *significantly* slower than IE's getElementById() and
+      # getElementsByName() calls when how is :id or :name.  However
+      # IE doesn't match Regexps, so first we make sure what is a String.
+      # In addition, IE's getElementById() will also return an element
+      # where the :name matches, so we will only return the results of
+      # getElementById() if the matching element actually HAS a matching
+      # :id.
+      begin
+        if @what.class == String   # Only use fast calls with String what.
+          if @how == :id
+            @element = @document.getElementById(what)
+            # Return if our fast match really HAS a matching :id
+            return @element if @element.nil? or @element.invoke('id') == what
+          elsif how == :name
+            @elements = @document.getElementsByName(what)
+          end
+        end
+      rescue
+      end
+    end
+  end
 end

metadata CHANGED

@@ -3,8 +3,8 @@ rubygems_version: 0.9.2
 specification_version: 1
 name: watir
 version: !ruby/object:Gem::Version
-  version: 1.5.3
-date: 2007-10-22 00:00:00 -05:00
+  version: 1.5.4
+date: 2008-04-23 00:00:00 -05:00
 summary: Automated testing tool for web applications.
 require_paths:
 - .
@@ -124,6 +124,7 @@ files:
 - unittests/textarea_xpath_test.rb
 - unittests/textfields_test.rb
 - unittests/textfields_xpath_test.rb
+- unittests/textfield_for_ch_char_test.rb
 - unittests/window_tests.rb
 - unittests/xpath_tests.rb
 - unittests/html/blankpage.html
@@ -249,3 +250,12 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.1
     version:
+- !ruby/object:Gem::Dependency
+  name: windows-pr
+  version_requirement:
+  version_requirements: !ruby/object:Gem::Version::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.6.6
+    version: