watir-webdriver 0.6.1 → 0.6.2

data/lib/watir-webdriver/extensions/select_text.rb

@@ -6,5 +6,5 @@ module Watir
       assert_exists
       execute_atom :selectText, @element, str
     end
-  end
-end
+  end # Element
+end # Watir

data/lib/watir-webdriver/has_window.rb

@@ -1,5 +1,16 @@
 module Watir
   module HasWindow
+
+    #
+    # Returns browser windows array.
+    #
+    # @example
+    #   browser.a(:id => "open_new_window").click
+    #   browser.windows(:title => "new")
+    #
+    # @return [Array<Window>]
+    #
+
     def windows(*args)
       all = @driver.window_handles.map { |handle| Window.new(@driver, :handle => handle) }
 
@@ -10,6 +21,16 @@ module Watir
       end
     end
 
+    #
+    # Returns browser window.
+    #
+    # @example
+    #   browser.a(:id => "open_new_window").click
+    #   browser.window(:title => "new")
+    #
+    # @return [Window]
+    #
+
     def window(*args, &blk)
       win = Window.new @driver, extract_selector(args)
 
@@ -29,5 +50,6 @@ module Watir
         selector.all? { |key, value| value === win.send(key) }
       end
     end
-  end # WindowSwitching
+
+  end # HasWindow
 end # Watir

data/lib/watir-webdriver/html.rb

@@ -12,6 +12,8 @@ ActiveSupport::Inflector.inflections do |inflect|
   inflect.plural /^s$/, 'ss'
   inflect.plural 'meta', 'metas'
   inflect.plural 'details', 'detailses'
+  inflect.plural 'data', 'datas'
+  inflect.plural 'datalist', 'datalists'
 end
 
 require "watir-webdriver/html/util"

data/lib/watir-webdriver/html/visitor.rb

@@ -146,9 +146,9 @@ module Watir
           :string
         when 'UnsignedLong', 'Long', 'Integer', 'Short', 'UnsignedShort'
           :int
-        when 'Float', 'Double'
+        when 'Float', /.*Double$/
           :float
-        when 'Function'
+        when 'Function', /.*EventHandler$/
           :function
         when 'Boolean'
           :bool

data/lib/watir-webdriver/locators/element_locator.rb

@@ -329,6 +329,10 @@ module Watir
         return false
       end
 
+      if selectors[:tag_name] == 'input' && selectors.has_key?(:type)
+        return false
+      end
+
       if selectors.has_key?(:class) && selectors[:class] !~ /^[\w-]+$/ui
         return false
       end
@@ -369,6 +373,10 @@ module Watir
       when :href
         # TODO: change this behaviour?
         'normalize-space(@href)'
+      when :type
+        # type attributes can be upper case - downcase them
+        # https://github.com/watir/watir-webdriver/issues/72
+        XpathSupport.downcase('@type')
       else
         "@#{key.to_s.gsub("_", "-")}"
       end

data/lib/watir-webdriver/locators/text_field_locator.rb

@@ -3,7 +3,7 @@ module Watir
 
     NON_TEXT_TYPES     = %w[file radio checkbox submit reset image button hidden datetime date month week time datetime-local range color]
     # TODO: better way of finding input text fields?
-    NEGATIVE_TYPE_EXPR = NON_TEXT_TYPES.map { |t| "@type!=#{t.inspect}" }.join(" and ")
+    NEGATIVE_TYPE_EXPR = NON_TEXT_TYPES.map { |type| "%s!=%s" % [XpathSupport.downcase('@type'), type.inspect] }.join(' and ')
 
     def locate_all
       find_all_by_multiple

data/lib/watir-webdriver/row_container.rb

@@ -1,6 +1,10 @@
 module Watir
   module RowContainer
 
+    #
+    # Returns table row.
+    #
+
     def row(*args)
       row = tr(*args)
       row.locator_class = ChildRowLocator
@@ -8,13 +12,17 @@ module Watir
       row
     end
 
+    #
+    # Returns table rows collection.
+    #
+
     def rows(*args)
       rows = trs(*args)
       rows.locator_class = ChildRowLocator
 
       rows
     end
-    
+
     #
     # The table as a 2D Array of strings with the text of each cell.
     #
@@ -30,5 +38,5 @@ module Watir
     end
     alias_method :to_a, :strings
 
-  end
-end
+  end # RowContainer
+end # Watir

data/lib/watir-webdriver/screenshot.rb

@@ -9,6 +9,9 @@ module Watir
     #
     # Saves screenshot to given path.
     #
+    # @example
+    #   browser.screenshot.save "screenshot.png"
+    #
     # @param [String] path
     #
 
@@ -19,6 +22,10 @@ module Watir
     #
     # Represents screenshot as PNG image string.
     #
+    # @example
+    #   browser.screenshot.png
+    #   #=> '\x95\xC7\x8C@1\xC07\x1C(Edb\x15\xB2\vL'
+    #
     # @return [String]
     #
 
@@ -29,6 +36,10 @@ module Watir
     #
     # Represents screenshot as Base64 encoded string.
     #
+    # @example
+    #   browser.screenshot.base64
+    #   #=> '7HWJ43tZDscPleeUuPW6HhN3x+z7vU/lufmH0qNTtTum94IBWMT46evImci1vnFGT'
+    #
     # @return [String]
     #
 

data/lib/watir-webdriver/user_editable.rb

@@ -1,8 +1,11 @@
 module Watir
   module UserEditable
+
     #
     # Clear the element, the type in the given value.
     #
+    # @param [String, Symbol] *args
+    #
 
     def set(*args)
       assert_exists
@@ -14,7 +17,9 @@ module Watir
     alias_method :value=, :set
 
     #
-    # Append the given value to the text in the text field.
+    # Appends the given value to the text in the text field.
+    #
+    # @param [String, Symbol] *args
     #
 
     def append(*args)
@@ -26,12 +31,13 @@ module Watir
     alias_method :<<, :append
 
     #
-    # Clear the text field.
+    # Clears the text field.
     #
 
     def clear
       assert_exists
       @element.clear
     end
-  end
-end
+
+  end # UserEditable
+end # Watir

data/lib/watir-webdriver/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = "0.6.1"
-end
+  VERSION = "0.6.2"
+end # Watir

data/lib/watir-webdriver/wait.rb

@@ -2,14 +2,20 @@
 module Watir
   module Wait
 
-    class TimeoutError < StandardError
-    end
+    class TimeoutError < StandardError ; end
 
     INTERVAL = 0.1
 
     class << self
       #
-      # Wait until the block evaluates to true or times out.
+      # Waits until the block evaluates to true or times out.
+      #
+      # @example
+      #   Watir::Wait.until { browser.a(:id => "ajaxed").visible? }
+      #
+      # @param [Fixnum] timeout How long to wait in seconds
+      # @param [String] message Message to raise if timeout is exceeded
+      # @raise [TimeoutError] if timeout is exceeded
       #
 
       def until(timeout = 30, message = nil, &block)
@@ -27,6 +33,13 @@ module Watir
       #
       # Wait while the block evaluates to true or times out.
       #
+      # @example
+      #   Watir::Wait.while { browser.a(:id => "ajaxed").visible? }
+      #
+      # @param [Fixnum] timeout How long to wait in seconds
+      # @param [String] message Message to raise if timeout is exceeded
+      # @raise [TimeoutError] if timeout is exceeded
+      #
 
       def while(timeout = 30, message = nil, &block)
         end_time = ::Time.now + timeout
@@ -47,7 +60,8 @@ module Watir
 
         err
       end
-    end # class << self
+
+    end # self
   end # Wait
 
   module Waitable
@@ -97,14 +111,15 @@ module Watir
     #
     # Waits until the element is present.
     #
-    # @see Watir::Wait
+    # @example
+    #   browser.button(:id => 'foo').when_present.click
+    #   browser.div(:id => 'bar').when_present { |div| ... }
+    #   browser.p(:id => 'baz').when_present(60).text
     #
-    # Example:
-    #   browser.button(:id, 'foo').when_present.click
-    #   browser.div(:id, 'bar').when_present { |div| ... }
-    #   browser.p(:id, 'baz').when_present(60).text
+    # @param [Fixnum] timeout seconds to wait before timing out
     #
-    # @param [Integer] timeout seconds to wait before timing out
+    # @see Watir::Wait
+    # @see Watir::Element#present?
     #
 
     def when_present(timeout = 30)
@@ -121,7 +136,10 @@ module Watir
     #
     # Waits until the element is present.
     #
-    # @param [Integer] timeout seconds to wait before timing out
+    # @example
+    #   browser.button(:id => 'foo').wait_until_present
+    #
+    # @param [Fixnum] timeout seconds to wait before timing out
     #
     # @see Watir::Wait
     # @see Watir::Element#present?
@@ -135,6 +153,9 @@ module Watir
     #
     # Waits while the element is present.
     #
+    # @example
+    #   browser.button(:id => 'foo').wait_while_present
+    #
     # @param [Integer] timeout seconds to wait before timing out
     #
     # @see Watir::Wait

data/lib/watir-webdriver/window.rb

@@ -21,6 +21,15 @@ module Watir
       '#<%s:0x%x located=%s>' % [self.class, hash*2, !!@handle]
     end
 
+    #
+    # Returns window size.
+    #
+    # @example
+    #   size = browser.window.size
+    #   "%sx%s" % [size.width, size.height]
+    #   #=> "1600x1200"
+    #
+
     def size
       size = nil
       use { size = @driver.manage.window.size }
@@ -28,6 +37,15 @@ module Watir
       size
     end
 
+    #
+    # Returns window position.
+    #
+    # @example
+    #   position = browser.window.position
+    #   "%sx%s" % [position.x, position.y]
+    #   #=> "92x76"
+    #
+
     def position
       pos = nil
       use { pos = @driver.manage.window.position }
@@ -35,6 +53,16 @@ module Watir
       pos
     end
 
+    #
+    # Resizes window to given width and height.
+    #
+    # @example
+    #   browser.window.resize_to 1600, 1200
+    #
+    # @param [Fixnum] width
+    # @param [Fixnum] height
+    #
+
     def resize_to(width, height)
       dimension = Selenium::WebDriver::Dimension.new(width, height)
       use { @driver.manage.window.size = dimension }
@@ -42,6 +70,16 @@ module Watir
       dimension
     end
 
+    #
+    # Moves window to given x and y coordinates.
+    #
+    # @example
+    #   browser.window.move_to 300, 200
+    #
+    # @param [Fixnum] x
+    # @param [Fixnum] y
+    #
+
     def move_to(x, y)
       point = Selenium::WebDriver::Point.new(x, y)
       use { @driver.manage.window.position = point }
@@ -49,6 +87,23 @@ module Watir
       point
     end
 
+    #
+    # Maximizes window.
+    #
+    # @example
+    #   browser.window.maximize
+    #
+
+    def maximize
+      use { @driver.manage.window.maximize }
+    end
+
+    #
+    # Returns true if window exists.
+    #
+    # @return [Boolean]
+    #
+
     def exists?
       handle
       true
@@ -56,12 +111,27 @@ module Watir
       false
     end
 
+    #
+    # Returns true if window is present.
+    #
+    # @return [Boolean]
+    #
+
     def present?
       @handle = nil # relocate
 
       exists?
     end
 
+    #
+    # Returns true if two windows are equal.
+    #
+    # @example
+    #   browser.window(:index => 1) == browser.window(:index => 2)
+    #
+    # @param [Window] other
+    #
+
     def ==(other)
       return false unless other.kind_of?(self.class)
 
@@ -73,14 +143,32 @@ module Watir
       handle.hash ^ self.class.hash
     end
 
+    #
+    # Returns true if window is current.
+    #
+    # @example
+    #   browser.window.current?
+    #   #=> true
+    #
+
     def current?
       @driver.window_handle == handle
     end
 
+    #
+    # CLoses window.
+    #
+
     def close
       use { @driver.close }
     end
 
+    #
+    # Returns window title.
+    #
+    # @return [String]
+    #
+
     def title
       title = nil
       use { title = @driver.title }
@@ -88,6 +176,12 @@ module Watir
       title
     end
 
+    #
+    # Returns window URL.
+    #
+    # @return [String]
+    #
+
     def url
       url = nil
       use { url = @driver.current_url }
@@ -95,6 +189,15 @@ module Watir
       url
     end
 
+    #
+    # Switches to given window and executes block, then switches back.
+    #
+    # @example
+    #   browser.window(:title => "2nd window").use do
+    #     browser.button(:id => "close").click
+    #   end
+    #
+
     def use(&blk)
       @driver.switch_to.window(handle, &blk)
       self
@@ -135,4 +238,4 @@ module Watir
     end
 
   end # Window
-end # Watir
+end # Watir