watir-webdriver 0.6.11 → 0.7.0

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

@@ -21,9 +21,8 @@ module Watir
     #
 
     def value=(path)
-      assert_exists
       path = path.gsub(File::SEPARATOR, File::ALT_SEPARATOR) if File::ALT_SEPARATOR
-      @element.send_keys path
+      send_keys path
     end
 
   end # FileField

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

@@ -10,7 +10,8 @@ module Watir
 
     def submit
       assert_exists
-      @element.submit
+      element_call { @element.submit }
+      run_checkers
     end
 
   end # Form

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

@@ -19,8 +19,6 @@ module Watir
     attribute(String, :access_key_label, :accessKeyLabel)
     attribute("Boolean", :draggable?, :draggable)
     attribute(String, :dropzone, :dropzone)
-    attribute(String, :content_editable, :contentEditable)
-    attribute("Boolean", :content_editable?, :isContentEditable)
     attribute(String, :context_menu, :contextMenu)
     attribute("Boolean", :spellcheck?, :spellcheck)
     attribute(String, :command_type, :commandType)
@@ -92,6 +90,8 @@ module Watir
     attribute(String, :ontoggle, :ontoggle)
     attribute(String, :onvolumechange, :onvolumechange)
     attribute(String, :onwaiting, :onwaiting)
+    attribute(String, :content_editable, :contentEditable)
+    attribute("Boolean", :content_editable?, :isContentEditable)
   end
   class HTMLElementCollection < ElementCollection
     def element_class
@@ -662,6 +662,7 @@ module Watir
   class Media < HTMLElement
     attribute(String, :error, :error)
     attribute(String, :src, :src)
+    attribute(String, :src_object, :srcObject)
     attribute(String, :current_src, :currentSrc)
     attribute(String, :cross_origin, :crossOrigin)
     attribute(Fixnum, :network_state, :networkState)
@@ -727,15 +728,6 @@ module Watir
       Track
     end
   end
-  class Source < HTMLElement
-    attribute(String, :src, :src)
-    attribute(String, :type, :type)
-  end
-  class SourceCollection < ElementCollection
-    def element_class
-      Source
-    end
-  end
   class Param < HTMLElement
     attribute(String, :name, :name)
     attribute(String, :value, :value)
@@ -817,6 +809,7 @@ module Watir
     attribute(String, :alt, :alt)
     attribute(String, :src, :src)
     attribute(String, :srcset, :srcset)
+    attribute(String, :sizes, :sizes)
     attribute(String, :cross_origin, :crossOrigin)
     attribute(String, :use_map, :useMap)
     attribute("Boolean", :map?, :isMap)
@@ -825,6 +818,7 @@ module Watir
     attribute(Fixnum, :natural_width, :naturalWidth)
     attribute(Fixnum, :natural_height, :naturalHeight)
     attribute("Boolean", :complete?, :complete)
+    attribute(String, :current_src, :currentSrc)
     attribute(String, :name, :name)
     attribute(String, :lowsrc, :lowsrc)
     attribute(String, :align, :align)
@@ -838,6 +832,25 @@ module Watir
       Image
     end
   end
+  class Source < HTMLElement
+    attribute(String, :srcset, :srcset)
+    attribute(String, :sizes, :sizes)
+    attribute(String, :media, :media)
+    attribute(String, :src, :src)
+    attribute(String, :type, :type)
+  end
+  class SourceCollection < ElementCollection
+    def element_class
+      Source
+    end
+  end
+  class Picture < HTMLElement
+  end
+  class PictureCollection < ElementCollection
+    def element_class
+      Picture
+    end
+  end
   class Mod < HTMLElement
     attribute(String, :cite, :cite)
     attribute(String, :date_time, :dateTime)

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

@@ -5,29 +5,22 @@ module Watir
     def locate
       @parent.assert_exists
 
-      locator = locator_class.new(@parent.wd, @selector.merge(:tag_name => tag_name), self.class.attribute_list)
+      locator = locator_class.new(@parent.wd, @selector.merge(:tag_name => frame_tag), self.class.attribute_list)
       element = locator.locate
       element or raise UnknownFrameException, "unable to locate #{@selector[:tag_name]} using #{selector_string}"
 
-      @parent.reset!
-
       FramedDriver.new(element, driver)
     end
 
+    def switch_to!
+      locate.send :switch!
+    end
+
     def assert_exists
       if @selector.has_key? :element
         raise UnknownFrameException, "wrapping a WebDriver element as a Frame is not currently supported"
       end
 
-      if @element && !Watir.always_locate?
-        begin
-          @element.tag_name # rpc
-          return @element
-        rescue Selenium::WebDriver::Error::ObsoleteElementError
-          @element = nil # re-locate
-        end
-      end
-
       super
     end
 
@@ -36,7 +29,7 @@ module Watir
 
       # this will actually give us the innerHTML instead of the outerHTML of the <frame>,
       # but given the choice this seems more useful
-      execute_atom(:getOuterHtml, @element.find_element(:tag_name => "html")).strip
+      element_call { execute_atom(:getOuterHtml, @element.find_element(:tag_name => "html")).strip }
     end
 
     def execute_script(*args)
@@ -45,7 +38,7 @@ module Watir
 
     private
 
-    def tag_name
+    def frame_tag
       'iframe'
     end
 
@@ -55,13 +48,28 @@ module Watir
   class IFrameCollection < ElementCollection
 
     def to_a
-      (0...elements.size).map { |idx| element_class.new @parent, :index => idx }
+      # In case `#all_elements` returns empty array, but `#elements`
+      # returns non-empty array (i.e. any frame has loaded between these two calls),
+      # index will return nil. That's why `#all_elements` should always
+      # be called after `#elements.`
+      element_indexes = elements.map { |el| all_elements.index(el) }
+      element_indexes.map { |idx| element_class.new(@parent, tag_name: @selector[:tag_name], :index => idx) }
     end
 
     def element_class
       IFrame
     end
 
+    private
+
+    def all_elements
+      locator_class.new(
+        @parent.wd,
+        { tag_name: @selector[:tag_name] },
+        element_class.attribute_list
+      ).locate_all
+    end
+
   end # IFrameCollection
 
 
@@ -69,7 +77,7 @@ module Watir
 
     private
 
-    def tag_name
+    def frame_tag
       'frame'
     end
 
@@ -110,7 +118,7 @@ module Watir
     end
 
     def ==(other)
-      @element == other.wd
+      wd == other.wd
     end
     alias_method :eql?, :==
 

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

@@ -14,10 +14,7 @@ module Watir
     #   browser.select(:id => "foo").options.first.select
     #
 
-    def select
-      assert_exists
-      @element.click
-    end
+    alias_method :select, :click
 
     #
     # Toggles the selected state of this option.
@@ -26,10 +23,7 @@ module Watir
     #   browser.select(:id => "foo").options.first.toggle
     #
 
-    def toggle
-      assert_exists
-      @element.click
-    end
+    alias_method :toggle, :click
 
     #
     # Clears (i.e. toggles selected state) option.
@@ -39,7 +33,7 @@ module Watir
     #
 
     def clear
-      @element.click if selected?
+      click if selected?
     end
 
     #
@@ -50,7 +44,7 @@ module Watir
 
     def selected?
       assert_exists
-      @element.selected?
+      element_call { @element.selected? }
     end
 
     #
@@ -65,17 +59,15 @@ module Watir
     #
 
     def text
-      assert_exists
-
       # A little unintuitive - we'll return the 'label' or 'text' attribute if
       # they exist, otherwise the inner text of the element
 
       attribute = [:label, :text].find { |a| attribute? a }
 
       if attribute
-        @element.attribute(attribute)
+        attribute_value(attribute)
       else
-        @element.text
+        super
       end
     end
 

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

@@ -7,10 +7,7 @@ module Watir
     #
 
     def set
-      assert_exists
-      assert_enabled
-
-      @element.click unless set?
+      click unless set?
     end
 
     #
@@ -21,7 +18,7 @@ module Watir
 
     def set?
       assert_exists
-      @element.selected?
+      element_call { @element.selected? }
     end
 
   end # Radio

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

@@ -46,7 +46,6 @@ module Watir
     #
 
     def include?(str_or_rx)
-      assert_exists
       # TODO: optimize similar to selected?
       options.any? { |e| str_or_rx === e.text }
     end
@@ -88,7 +87,11 @@ module Watir
 
     def selected?(str_or_rx)
       assert_exists
-      matches = @element.find_elements(:tag_name, 'option').select { |e| str_or_rx === e.text || str_or_rx === e.attribute(:label) }
+      matches = element_call do
+        @element.find_elements(:tag_name, 'option').select do |e|
+          str_or_rx === e.text || str_or_rx === e.attribute(:label)
+        end
+      end
 
       if matches.empty?
         raise UnknownObjectException, "Unable to locate option matching #{str_or_rx.inspect}"
@@ -117,7 +120,6 @@ module Watir
     #
 
     def selected_options
-      assert_exists
       options.select { |e| e.selected? }
     end
 
@@ -140,14 +142,18 @@ module Watir
       xpath = option_xpath_for(how, string)
 
       if multiple?
-        elements = @element.find_elements(:xpath, xpath)
+        elements = element_call do
+          @element.find_elements(:xpath, xpath)
+        end
         no_value_found(string) if elements.empty?
 
         elements.each { |e| e.click unless e.selected? }
         elements.first.text
       else
         begin
-          e = @element.find_element(:xpath, xpath)
+          e = element_call do
+            @element.find_element(:xpath, xpath)
+          end
         rescue Selenium::WebDriver::Error::NoSuchElementError
           no_value_found(string)
         end
@@ -159,7 +165,9 @@ module Watir
     end
 
     def select_by_regexp(how, exp)
-      elements = @element.find_elements(:tag_name, 'option')
+      elements = element_call do
+        @element.find_elements(:tag_name, 'option')
+      end
       no_value_found(nil, "no options in select list") if elements.empty?
 
       if multiple?
@@ -208,7 +216,7 @@ module Watir
 
     def safe_text(element)
       element.text
-    rescue Selenium::WebDriver::Error::ObsoleteElementError, Selenium::WebDriver::Error::UnhandledAlertError
+    rescue Selenium::WebDriver::Error::StaleElementReferenceError, Selenium::WebDriver::Error::UnhandledAlertError
       # guard for scenario where selecting the element changes the page, making our element obsolete
 
       ''

data/lib/watir-webdriver/exception.rb

@@ -12,8 +12,6 @@ module Watir
     class MissingWayOfFindingObjectException < Error; end
     class UnknownCellException < Error; end
     class NoMatchingWindowFoundException < Error; end
-    class NoStatusBarException < Error; end
-    class NavigationException < Error; end
     class UnknownFrameException < Error; end
     class UnknownRowException < Error; end
 

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

@@ -15,11 +15,6 @@ module Watir
     #
     # This method is provided by an optional require - API is subject to change.
     #
-    # @example
-    #   browser.alert do
-    #     browser.button(:value => "Alert").click
-    #   end #=> "the alert message"
-    #
 
     def alert(&blk)
       warn 'AlertHelper is deprecated. Use the new Alert API instead (e.g. browser.alert.ok)'
@@ -33,10 +28,6 @@ module Watir
     #
     # This method is provided by an optional require - API is subject to change.
     #
-    # @example
-    #   browser.confirm(true) do
-    #     browser.button(:value => "Confirm").click
-    #   end #=> "the confirm message"
 
     def confirm(bool, &blk)
       warn 'AlertHelper is deprecated. Use the new Alert API instead (e.g. browser.alert.ok)'
@@ -50,11 +41,6 @@ module Watir
     #
     # This method is provided by an optional require - API is subject to change.
     #
-    # @example
-    #   browser.prompt("hello") do
-    #     browser.button(:value => "Prompt").click
-    #   end #=> { :message => "foo", :default_value => "bar" }
-    #
 
     def prompt(answer, &blk)
       warn 'AlertHelper is deprecated. Use the new Alert API instead (e.g. browser.alert.ok)'

data/lib/watir-webdriver/has_window.rb

@@ -5,8 +5,7 @@ module Watir
     # Returns browser windows array.
     #
     # @example
-    #   browser.a(:id => "open_new_window").click
-    #   browser.windows(:title => "new")
+    #   browser.windows(:title => 'closeable window')
     #
     # @return [Array<Window>]
     #
@@ -25,8 +24,7 @@ module Watir
     # Returns browser window.
     #
     # @example
-    #   browser.a(:id => "open_new_window").click
-    #   browser.window(:title => "new")
+    #   browser.window(:title => 'closeable window')
     #
     # @return [Window]
     #

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

@@ -74,8 +74,8 @@ module Watir
 
       def extract_interface_map
         # http://www.whatwg.org/specs/web-apps/current-work/#elements-1
-        table = @doc.search("//h3[@id='elements-1']/following-sibling::table[1]").first
-        table or raise "could not find elements-1 table"
+        table = @doc.search("//h3[@id='elements-3']/following-sibling::table[1]").first
+        table or raise "could not find elements-3 table"
 
         @interface_map = {}
 
@@ -143,6 +143,7 @@ module Watir
 
         duplicates.each do |intf|
           final = non_duplicates.find { |i| i.name == intf.name }
+          final.inherits += intf.inherits
           final.members += intf.members
           final.extended_attributes += intf.extended_attributes
         end

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

@@ -148,9 +148,9 @@ module Watir
           Float
         when 'Boolean'
           'Boolean'
-        when 'WindowProxy', 'ValidityState', 'MediaError', 'TimeRanges', 'Location',
+        when 'WindowProxy', 'ValidityState', 'TimeRanges', 'Location',
              'Any', 'TimedTrackArray', 'TimedTrack', 'TextTrackArray', 'TextTrack',
-             'MediaController', 'TextTrackKind', 'Function', /.*EventHandler$/,
+             /Media.+/, 'TextTrackKind', 'Function', /.*EventHandler$/,
              'Document', 'DocumentFragment', 'DOMTokenList', 'DOMSettableTokenList',
              'DOMStringMap', 'HTMLPropertiesCollection', /HTML(.*)Element/, /HTML(.*)Collection/,
              'CSSStyleDeclaration',  /.+List$/, 'Date', 'Element'