watir-webdriver 0.6.4 → 0.6.5

data/LICENSE

@@ -1,4 +1,6 @@
-Copyright (c) 2009-2013 Jari Bakken
+(the MIT License)
+
+Copyright (c) 2009-2014 Jari Bakken
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -71,4 +71,4 @@ Note on Patches/Pull Requests
 Copyright
 ---------
 
-Copyright (c) 2009-2013 Jari Bakken. See LICENSE for details.
+Copyright (c) 2009-2014 Jari Bakken. See LICENSE for details.

data/Rakefile

@@ -61,7 +61,7 @@ namespace :html5 do
     end
   end
 
-  desc 'Re-enerate the base Watir element classes from the spec '
+  desc 'Re-generate the base Watir element classes from the spec'
   task :generate => :html_lib do
     old_file = "lib/watir-webdriver/elements/generated.rb"
     generator = Watir::HTML::Generator.new

data/lib/watir-webdriver.rb

@@ -13,6 +13,7 @@ require 'watir-webdriver/container'
 require 'watir-webdriver/cookies'
 require 'watir-webdriver/locators/element_locator'
 require 'watir-webdriver/locators/button_locator'
+require 'watir-webdriver/locators/text_area_locator'
 require 'watir-webdriver/locators/text_field_locator'
 require 'watir-webdriver/locators/child_row_locator'
 require 'watir-webdriver/locators/child_cell_locator'
@@ -35,6 +36,18 @@ module Watir
     def always_locate=(bool)
       @always_locate = bool
     end
+    
+    def default_timeout
+      @default_timeout ||= 30
+    end
+    
+    #
+    # Default wait time for wait methods.
+    #
+
+    def default_timeout=(value)
+      @default_timeout = value
+    end
 
     def prefer_css?
       @prefer_css
@@ -76,13 +89,14 @@ require 'watir-webdriver/element_collection'
 require 'watir-webdriver/elements/element'
 require 'watir-webdriver/elements/generated'
 
+require 'watir-webdriver/elements/area'
 require 'watir-webdriver/elements/button'
 require 'watir-webdriver/elements/checkbox'
 require 'watir-webdriver/elements/dlist'
 require 'watir-webdriver/elements/file_field'
 require 'watir-webdriver/elements/font'
 require 'watir-webdriver/elements/form'
-require 'watir-webdriver/elements/frame'
+require 'watir-webdriver/elements/iframe'
 require 'watir-webdriver/elements/hidden'
 require 'watir-webdriver/elements/image'
 require 'watir-webdriver/elements/input'

data/lib/watir-webdriver/browser.rb

@@ -108,6 +108,7 @@ module Watir
     #
 
     def url
+      assert_exists
       @driver.current_url
     end
 
@@ -155,7 +156,7 @@ module Watir
     #   browser.name
     #   #=> :chrome
     #
-    # @return [String]
+    # @return [Symbol]
     #
 
     def name

data/lib/watir-webdriver/cookies.rb

@@ -1,5 +1,8 @@
+require 'yaml'
+
 module Watir
   class Cookies
+
     def initialize(control)
       @control = control
     end
@@ -31,7 +34,7 @@ module Watir
     # @param [Hash] opts
     # @option opts [Boolean] :secure
     # @option opts [String] :path
-    # @option opts [] :expires  TODO what type
+    # @option opts [Time, DateTime, NilClass] :expires
     # @option opts [String] :domain
     #
 
@@ -42,12 +45,9 @@ module Watir
         :secure  => opts[:secure],
         :path    => opts[:path],
         :expires => opts[:expires],
+        :domain  => opts[:domain],
       }
 
-      if opts[:domain]
-        cookie[:domain] = opts[:domain]
-      end
-
       @control.add_cookie cookie
     end
 
@@ -75,6 +75,34 @@ module Watir
       @control.delete_all_cookies
     end
 
+    #
+    # Save cookies to file
+    #
+    # @example
+    #   browser.cookies.save '.cookies'
+    #
+    # @param [String] file
+    #
+
+    def save(file = '.cookies')
+      IO.write(file, to_a.to_yaml)
+    end
+
+    #
+    # Load cookies from file
+    #
+    # @example
+    #   browser.cookies.load '.cookies'
+    #
+    # @param [String] file
+    #
+
+    def load(file = '.cookies')
+      YAML.load(IO.read(file)).each do |c|
+        add(c.delete(:name), c.delete(:value), c)
+      end
+    end
+
     private
 
     def to_time(t)
@@ -84,6 +112,6 @@ module Watir
         ::Time.local t.year, t.month, t.day, t.hour, t.min, t.sec
       end
     end
-  end
-end
 
+  end # Cookies
+end # Watir

data/lib/watir-webdriver/elements/area.rb

@@ -0,0 +1,13 @@
+# encoding: utf-8
+module Watir
+  class Area < HTMLElement
+
+    #
+    # @todo temporarily add href attribute
+    #
+    # @see https://www.w3.org/Bugs/Public/show_bug.cgi?id=23192
+    #
+    attributes :string => [:href]
+
+  end # Area
+end # Watir

data/lib/watir-webdriver/elements/element.rb

@@ -275,11 +275,11 @@ module Watir
     end
 
     #
-    # Returns inner HTML code of element.
+    # Returns outer (inner + element itself) HTML code of element.
     #
     # @example
     #   browser.div(:id => "foo").html
-    #   #=> "<a>Click</a>"
+    #   #=> "<div id=\"foo\"><a>Click</a></div>"
     #
     # @return [String]
     #
@@ -547,7 +547,7 @@ module Watir
 
     def method_missing(meth, *args, &blk)
       method = meth.to_s
-      if method =~ /^data_(.+)$/
+      if method =~ ElementLocator::WILDCARD_ATTRIBUTE
         attribute_value(method.gsub(/_/, '-'), *args)
       else
         super

data/lib/watir-webdriver/elements/generated.rb

@@ -61,6 +61,15 @@ module Watir
 
 
 
+
+
+
+
+
+
+
+
+
 
 
 
@@ -72,7 +81,7 @@ module Watir
 
 
  class HTMLElement < Element
-   attributes(:string => [:access_key, :access_key_label, :command_icon, :command_label, :command_type, :content_editable, :dir, :item_id, :item_value, :lang, :title], :bool => [:command_checked, :command_disabled, :command_hidden, :draggable, :hidden, :content_editable, :item_scope, :spellcheck, :translate], :html_element => [:context_menu], :string_map => [:dataset], :token_list => [:dropzone, :item_prop, :item_ref, :item_type], :function => [:onabort, :onblur, :oncancel, :oncanplay, :oncanplaythrough, :onchange, :onclick, :onclose, :oncontextmenu, :oncuechange, :ondblclick, :ondrag, :ondragend, :ondragenter, :ondragleave, :ondragover, :ondragstart, :ondrop, :ondurationchange, :onemptied, :onended, :onerror, :onfocus, :oninput, :oninvalid, :onkeydown, :onkeypress, :onkeyup, :onload, :onloadeddata, :onloadedmetadata, :onloadstart, :onmousedown, :onmousemove, :onmouseout, :onmouseover, :onmouseup, :onmousewheel, :onpause, :onplay, :onplaying, :onprogress, :onratechange, :onreset, :onscroll, :onseeked, :onseeking, :onselect, :onshow, :onstalled, :onsubmit, :onsuspend, :ontimeupdate, :onvolumechange, :onwaiting], :properties_collection => [:properties], :style => [:style], :int => [:tab_index])
+   attributes(:string => [:access_key, :access_key_label, :command_icon, :command_label, :command_type, :content_editable, :dir, :item_id, :item_value, :lang, :title], :bool => [:command_checked, :command_disabled, :command_hidden, :draggable, :hidden, :inert, :content_editable, :item_scope, :spellcheck, :translate], :html_element => [:context_menu], :string_map => [:dataset], :token_list => [:dropzone, :item_prop, :item_ref, :item_type], :function => [:onabort, :onblur, :oncancel, :oncanplay, :oncanplaythrough, :onchange, :onclick, :onclose, :oncontextmenu, :oncuechange, :ondblclick, :ondrag, :ondragend, :ondragenter, :ondragexit, :ondragleave, :ondragover, :ondragstart, :ondrop, :ondurationchange, :onemptied, :onended, :onerror, :onfocus, :oninput, :oninvalid, :onkeydown, :onkeypress, :onkeyup, :onload, :onloadeddata, :onloadedmetadata, :onloadstart, :onmousedown, :onmouseenter, :onmouseleave, :onmousemove, :onmouseout, :onmouseover, :onmouseup, :onmousewheel, :onpause, :onplay, :onplaying, :onprogress, :onratechange, :onreset, :onscroll, :onseeked, :onseeking, :onselect, :onshow, :onsort, :onstalled, :onsubmit, :onsuspend, :ontimeupdate, :onvolumechange, :onwaiting], :properties_collection => [:properties], :int => [:tab_index])
  end
  class HTMLElementCollection < ElementCollection
    def element_class
@@ -95,24 +104,8 @@ module Watir
      Directory
    end
  end
- class BaseFont < HTMLElement
-   attributes(:string => [:color, :face], :int => [:size])
- end
- class BaseFontCollection < ElementCollection
-   def element_class
-     BaseFont
-   end
- end
- class Frame < HTMLElement
-   attributes(:document => [:content_document], :string => [:content_window, :frame_border, :long_desc, :margin_height, :margin_width, :name, :scrolling, :src], :bool => [:no_resize])
- end
- class FrameCollection < ElementCollection
-   def element_class
-     Frame
-   end
- end
  class FrameSet < HTMLElement
-   attributes(:string => [:cols, :rows], :function => [:onafterprint, :onbeforeprint, :onbeforeunload, :onblur, :onerror, :onfocus, :onhashchange, :onload, :onmessage, :onoffline, :ononline, :onpagehide, :onpageshow, :onpopstate, :onresize, :onscroll, :onstorage, :onunload])
+   attributes(:string => [:cols, :rows], :function => [:onafterprint, :onbeforeprint, :onbeforeunload, :onhashchange, :onmessage, :onoffline, :ononline, :onpagehide, :onpageshow, :onpopstate, :onresize, :onstorage, :onunload])
  end
  class FrameSetCollection < ElementCollection
    def element_class
@@ -143,6 +136,14 @@ module Watir
      Dialog
    end
  end
+ class MenuItem < HTMLElement
+   attributes(:bool => [:checked, :default, :disabled], :html_element => [:command], :string => [:icon, :label, :radiogroup, :type])
+ end
+ class MenuItemCollection < ElementCollection
+   def element_class
+     MenuItem
+   end
+ end
  class Menu < HTMLElement
    attributes(:string => [:label, :type])
  end
@@ -155,14 +156,6 @@ module Watir
    attributes(:bool => [:compact])
  end
  # do nothing
- class Command < HTMLElement
-   attributes(:bool => [:checked, :disabled], :html_element => [:command], :string => [:icon, :label, :radiogroup, :type])
- end
- class CommandCollection < ElementCollection
-   def element_class
-     Command
-   end
- end
  class Details < HTMLElement
    attributes(:bool => [:open])
  end
@@ -244,7 +237,7 @@ module Watir
    end
  end
  class Button < HTMLElement
-   attributes(:bool => [:autofocus, :disabled, :form_no_validate, :will_validate], :html_element => [:form], :string => [:form_action, :form_enctype, :form_method, :form_target, :name, :type, :validation_message, :validity, :value], :list => [:labels])
+   attributes(:bool => [:autofocus, :disabled, :form_no_validate, :will_validate], :html_element => [:form, :menu], :string => [:form_action, :form_enctype, :form_method, :form_target, :name, :type, :validation_message, :validity, :value], :list => [:labels])
  end
  class ButtonCollection < ElementCollection
    def element_class
@@ -308,11 +301,11 @@ module Watir
    end
  end
  class TableCell < HTMLElement
-   attributes(:string => [:abbr, :align, :axis, :bg_color, :ch, :ch_off, :height, :v_align, :width], :bool => [:no_wrap])
+   attributes(:string => [:align, :axis, :bg_color, :ch, :ch_off, :height, :v_align, :width], :bool => [:no_wrap])
  end
  # do nothing
  class TableHeaderCell < TableCell
-   attributes(:string => [:abbr, :scope])
+   attributes(:string => [:abbr, :scope, :sorted])
  end
  class TableHeaderCellCollection < ElementCollection
    def element_class
@@ -327,6 +320,10 @@ module Watir
      TableDataCell
    end
  end
+ class TableDataCell < TableCell
+   attributes(:string => [:abbr])
+ end
+ # do nothing
  class TableRow < HTMLElement
    attributes(:html_collection => [:cells], :int => [:row_index, :section_row_index])
  end
@@ -376,7 +373,7 @@ module Watir
  end
  # do nothing
  class Table < HTMLElement
-   attributes(:html_element => [:caption, :t_foot, :t_head], :html_collection => [:rows, :t_bodies])
+   attributes(:html_element => [:caption, :t_foot, :t_head], :html_collection => [:rows, :t_bodies], :bool => [:sortable])
  end
  class TableCollection < ElementCollection
    def element_class
@@ -388,7 +385,7 @@ module Watir
  end
  # do nothing
  class Area < HTMLElement
-   attributes(:string => [:alt, :coords, :download, :hash, :host, :hostname, :href, :hreflang, :media, :pathname, :ping, :port, :protocol, :rel, :search, :shape, :target, :type], :token_list => [:rel_list])
+   attributes(:string => [:alt, :coords, :download, :hreflang, :ping, :rel, :shape, :target, :type], :token_list => [:rel_list])
  end
  class AreaCollection < ElementCollection
    def element_class
@@ -416,7 +413,7 @@ module Watir
    end
  end
  class Media < HTMLElement
-   attributes(:list => [:audio_tracks, :text_tracks, :video_tracks], :bool => [:autoplay, :controls, :default_muted, :ended, :loop, :muted, :paused, :seeking], :string => [:buffered, :controller, :cross_origin, :current_src, :error, :media_group, :played, :preload, :seekable, :src], :float => [:current_time, :default_playback_rate, :duration, :playback_rate, :volume], :int => [:network_state, :ready_state], :date => [:start_date])
+   attributes(:list => [:audio_tracks, :text_tracks, :video_tracks], :bool => [:autoplay, :controls, :default_muted, :ended, :loop, :muted, :paused, :seeking], :string => [:buffered, :controller, :cross_origin, :current_src, :error, :media_group, :played, :preload, :seekable, :src], :float => [:current_time, :default_playback_rate, :duration, :playback_rate, :volume], :int => [:network_state, :ready_state])
  end
  class MediaCollection < ElementCollection
    def element_class
@@ -492,7 +489,7 @@ module Watir
  end
  # do nothing
  class IFrame < HTMLElement
-   attributes(:document => [:content_document], :string => [:content_window, :height, :name, :src, :srcdoc, :width], :token_list => [:sandbox], :bool => [:seamless])
+   attributes(:bool => [:allow_fullscreen, :seamless], :document => [:content_document], :string => [:content_window, :height, :name, :src, :srcdoc, :width], :token_list => [:sandbox])
  end
  class IFrameCollection < ElementCollection
    def element_class
@@ -512,7 +509,7 @@ module Watir
    end
  end
  class Image < HTMLElement
-   attributes(:string => [:align, :border, :long_desc, :name], :int => [:hspace, :vspace])
+   attributes(:string => [:align, :border, :long_desc, :lowsrc, :name], :int => [:hspace, :vspace])
  end
  # do nothing
  class Mod < HTMLElement
@@ -544,7 +541,7 @@ module Watir
    end
  end
  class Time < HTMLElement
-   attributes(:string => [:datetime])
+   attributes(:string => [:date_time])
  end
  class TimeCollection < ElementCollection
    def element_class
@@ -560,7 +557,7 @@ module Watir
    end
  end
  class Anchor < HTMLElement
-   attributes(:string => [:download, :hash, :host, :hostname, :href, :hreflang, :media, :pathname, :ping, :port, :protocol, :rel, :search, :target, :text, :type], :token_list => [:rel_list])
+   attributes(:string => [:download, :hreflang, :ping, :rel, :target, :text, :type], :token_list => [:rel_list])
  end
  class AnchorCollection < ElementCollection
    def element_class
@@ -688,7 +685,7 @@ module Watir
  end
  # do nothing
  class Body < HTMLElement
-   attributes(:function => [:onafterprint, :onbeforeprint, :onbeforeunload, :onblur, :onerror, :onfocus, :onhashchange, :onload, :onmessage, :onoffline, :ononline, :onpagehide, :onpageshow, :onpopstate, :onresize, :onscroll, :onstorage, :onunload])
+   attributes(:function => [:onafterprint, :onbeforeprint, :onbeforeunload, :onhashchange, :onmessage, :onoffline, :ononline, :onpagehide, :onpageshow, :onpopstate, :onresize, :onstorage, :onunload])
  end
  class BodyCollection < ElementCollection
    def element_class
@@ -699,8 +696,16 @@ module Watir
    attributes(:string => [:a_link, :background, :bg_color, :link, :text, :v_link])
  end
  # do nothing
+ class Template < HTMLElement
+   attributes(:document => [:content])
+ end
+ class TemplateCollection < ElementCollection
+   def element_class
+     Template
+   end
+ end
  class Script < HTMLElement
-   attributes(:bool => [:async, :defer], :string => [:charset, :src, :text, :type])
+   attributes(:bool => [:async, :defer], :string => [:charset, :cross_origin, :src, :text, :type])
  end
  class ScriptCollection < ElementCollection
    def element_class
@@ -1146,23 +1151,6 @@ module Watir
 
    Watir.tag_to_class[:colgroup] = TableCol
    #
-   # @return [Command]
-   #
-
-   def command(*args)
-     Command.new(self, extract_selector(args).merge(:tag_name => "command"))
-   end
-
-   #
-   # @return [CommandCollection]
-   #
-
-   def commands(*args)
-     CommandCollection.new(self, extract_selector(args).merge(:tag_name => "command"))
-   end
-
-   Watir.tag_to_class[:command] = Command
-   #
    # @return [Data]
    #
 
@@ -1826,6 +1814,23 @@ module Watir
 
    Watir.tag_to_class[:li] = LI
    #
+   # @return [HTMLElement]
+   #
+
+   def main(*args)
+     HTMLElement.new(self, extract_selector(args).merge(:tag_name => "main"))
+   end
+
+   #
+   # @return [HTMLElementCollection]
+   #
+
+   def mains(*args)
+     HTMLElementCollection.new(self, extract_selector(args).merge(:tag_name => "main"))
+   end
+
+   Watir.tag_to_class[:main] = HTMLElement
+   #
    # @return [Map]
    #
 
@@ -1877,6 +1882,23 @@ module Watir
 
    Watir.tag_to_class[:menu] = Menu
    #
+   # @return [MenuItem]
+   #
+
+   def menuitem(*args)
+     MenuItem.new(self, extract_selector(args).merge(:tag_name => "menuitem"))
+   end
+
+   #
+   # @return [MenuItemCollection]
+   #
+
+   def menuitems(*args)
+     MenuItemCollection.new(self, extract_selector(args).merge(:tag_name => "menuitem"))
+   end
+
+   Watir.tag_to_class[:menuitem] = MenuItem
+   #
    # @return [Meta]
    #
 
@@ -2438,6 +2460,23 @@ module Watir
 
    Watir.tag_to_class[:td] = TableDataCell
    #
+   # @return [Template]
+   #
+
+   def template(*args)
+     Template.new(self, extract_selector(args).merge(:tag_name => "template"))
+   end
+
+   #
+   # @return [TemplateCollection]
+   #
+
+   def templates(*args)
+     TemplateCollection.new(self, extract_selector(args).merge(:tag_name => "template"))
+   end
+
+   Watir.tag_to_class[:template] = Template
+   #
    # @return [TextArea]
    #