druid-ts 1.2.2 → 1.2.3

data/lib/druid/assist.rb

@@ -188,7 +188,7 @@ module Druid
     # method to retrieve load status of an image element
     #
     def image_loaded_for(identifier)
-      process_call("image(identifier).loaded?", Elements::Image, identifier) 
+      process_call("image(identifier).loaded?", Elements::Image, identifier)
     end
 
     def form_for identifier
@@ -619,16 +619,8 @@ module Druid
       value
     end
 
-    def add_tagname_if_needed identifier, tag
-      return identifier if identifier.length < 2 and not identifier[:name]
-      identifier[:tag_name] = tag if identifier[:name]
-      identifier
-    end
-
     def parse_identifiers(identifier, element, tag_name=nil)
       frame_identifiers = identifier.delete(:frame)
-      identifier = add_tagname_if_needed identifier, tag_name if tag_name
-      identifier = element.identifier_for identifier
       return identifier, frame_identifiers
     end
 

data/lib/druid/elements/button.rb

@@ -2,10 +2,6 @@ module Druid
   module Elements
     class Button < Element
 
-      def self.finders
-        super + [:value, :text, :src, :alt, :css]
-      end
-
     end
 
     Druid::Elements.type_to_class[:submit] = Druid::Elements::Button

data/lib/druid/elements/check_box.rb

@@ -2,10 +2,6 @@ module Druid
   module Elements
     class CheckBox < Element
 
-      def self.finders
-        super + [:value, :label]
-      end
-
       #
       # Check the checkbox
       #

data/lib/druid/elements/div.rb

@@ -2,9 +2,6 @@ module Druid
   module Elements
     class Div < Element
 
-      def self.finders
-        super + [:text, :title]
-      end
     end
 
     Druid::Elements.tag_to_class[:div] = Druid::Elements::Div

data/lib/druid/elements/element.rb

@@ -18,72 +18,12 @@ module Druid
         @driver = @element
       end
 
-      #
-      # Get the text for the element
-      #
-      # @return [String]
-      #
-      def text
-        element.text
-      end
-
-      def exist?
-        element.exist?
-      end
-
-      def enabled?
-        element.enabled?
-      end
-
       #
       # return true if the element is not enabled
       def disabled?
         not enabled?
       end
 
-      def visible?
-        element.visible?
-      end
-
-      #
-      # return true if the element is stale(no longer attached to the DOM)
-      #
-      def stale?
-        element.stale?
-      end
-
-      #
-      # Returns the html for the element
-      #
-      # @return [String]
-      #
-      def html
-        element.html
-      end
-
-      #
-      # Returns the inner html for the element
-      #
-      def outer_html
-        element.outer_html
-      end
-
-      #
-      # Returns the inner html for the element
-      #
-      def inner_html
-        element.inner_html
-      end
-
-      #
-      # Get the value of this element
-      #
-      # @return [String]
-      #
-      def value
-        element.value
-      end
-
       #
       # compare this element to another to determine if they are equal
       # @return [Boolean]
@@ -92,15 +32,6 @@ module Druid
         other.is_a? self.class and element == other.element
       end
 
-      #
-      # Get the tag name of this element
-      #
-      # @return [String]
-      #
-      def tag_name
-        element.tag_name
-      end
-
       #
       # Get the value of the given attribute of the element
       # @param [String]
@@ -117,92 +48,10 @@ module Druid
         element.class_name
       end
 
-      #
-      # Click this element
-      #
-      def click
-        element.click
-      end
-
-      #
-      # get the value of the given CSS property
-      #
-      def style(property = nil)
-        element.style property
-      end
-
       def inspect
         element.inspect
       end
 
-      #
-      # Send keystrokes to this element
-      #
-      # @param [String, Symbol, Array]
-      #
-      # Examples:
-      #
-      #  element.send_keys "foo"                    #=> value: 'foo'
-      #  element.send_keys "tet", :arrow_left, "s"  #=> value: 'test'
-      #  element.send_keys [:control, 'a'], :space  #=> value: ' '
-      #
-      def send_keys(*args)
-        element.send_keys(*args)
-      end
-
-      #
-      # clear the contents of the element
-      #
-      def clear
-        element.clear
-      end
-
-      #
-      # double click this element
-      #
-      def double_click
-        element.double_click
-      end
-
-      #
-      # right click this element
-      #
-      def right_click
-        element.right_click
-      end
-
-      #
-      # Fire the provided event on the current element
-      #
-      def fire_event(event_name)
-        element.fire_event(event_name)
-      end
-
-      def focus
-        element.focus
-      end
-
-      #
-      # return true if an element is focused
-      #
-      def focused?
-        element.focused?
-      end
-
-      #
-      # Select the provided text
-      #
-      def select_text text
-        element.select_text text
-      end
-
-      #
-      # get the id of element
-      #
-      def id
-        attribute(:id)
-      end
-
       #
       # Scroll until the element is viewable
       #
@@ -244,19 +93,6 @@ module Druid
       def centre
         { 'y' => (location['y'] + (size['height']/2)), 'x' => (location['x'] + (size['width']/2)) }
       end
-      #
-      # Flash the element by temporarily changing the background color
-      #
-      def flash
-        element.flash
-      end
-
-      #
-      # hover over the element
-      #
-      def hover
-        element.hover
-      end
 
       def check_visible(timeout=Druid.default_element_wait)
         timed_loop(timeout) do |element|
@@ -306,6 +142,7 @@ module Druid
       # @param [Interger] (default to:5) seconds to wait before timing out
       #
       def when_visible(timeout=Druid.default_element_wait)
+        when_present(timeout)
         element.wait_until(timeout: timeout, message: "Element not visible in #{timeout} seconds", &:visible?)
         self
       end
@@ -316,6 +153,7 @@ module Druid
       # @param [Integer] (default to:5) seconds to wait before timing out
       #
       def when_not_visible(timeout=Druid.default_element_wait)
+        when_present(timeout)
         element.wait_while(timeout: timeout, message: "Element still visible after #{timeout} seconds", &:visible?)
         self
       end
@@ -326,25 +164,7 @@ module Druid
       # @param [Integer] (default to:5) seconds to wait before timing out
       #
       def wait_until(timeout=Druid.default_element_wait, message=nil, &block)
-        Watir::Wait.until(timeout: timeout, message: message, &block)
-      end
-
-
-      # @private
-      def self.identifier_for identifier
-        if have_to_build_xpath(identifier)
-          how = :xpath
-          what = build_xpath_for(identifier)
-          return how => what
-        end
-        all_identities = {}
-        identifier.each do |key, value|
-          each = {key => value}
-          ident = identifier_for_element each, finders, mapping
-          all_identities[ident.keys.first] = ident.values.first
-        end
-        all_identities
-        # end
+        element.wait_until(timeout: timeout, message: message, &block)
       end
 
       # @private
@@ -354,89 +174,6 @@ module Druid
         element.send m, *args, &block
       end
 
-      protected
-
-      def self.have_to_build_xpath(identifier)
-        ['table', 'span', 'div', 'td', 'li', 'ol', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'label', 'area', 'canvas', 'audio', 'video', 'b', 'i'].include? identifier[:tag_name] and identifier[:name]
-      end
-
-      def self.build_xpath_for identifier
-        tag_locator = identifier.delete(:tag_name)
-        idx = identifier.delete(:index)
-        if tag_locator == 'input' and identifier[:type] == 'submit'
-          identifier.delete(:type)
-          btn_ident = identifier.clone
-          if btn_ident[:value]
-            btn_ident[:text] = btn_ident[:value]
-            btn_ident.delete(:value)
-          end
-          xpath = ".//button"
-          xpath << "[#{attribute_expression(btn_ident)}]" unless btn_ident.empty?
-          xpath = "(#{xpath})[#{idx+1}]" if idx
-          identifier[:type] = %w[button reset submit image]
-          xpath << " | .//input"
-        else
-          xpath = ".//#{tag_locator}"
-        end
-        xpath << "[#{attribute_expression(identifier)}]" unless identifier.empty?
-        xpath = "(#{xpath})[#{idx+1}]" if idx
-        xpath
-      end
-
-      def self.attribute_expression(identifier)
-        identifier.map do |key, value|
-          if value.kind_of?(Array)
-            "(" + value.map { |v| equal_pair(key, v) }.join(" or ") + ")"
-          else
-            equal_pair(key, value)
-          end
-        end.join(" and ")
-      end
-
-      def self.equal_pair(key, value)
-        if key == :label
-          "@id=//label[normalize-space()=#{xpath_string(value)}]/@for"
-        else
-          "#{lhs_for(key)}=#{xpath_string(value)}"
-        end
-      end
-
-      def self.lhs_for(key)
-        case key
-        when :text, 'text'
-          'normalize-space()'
-        when :href
-          'normalize-space(@href)'
-        else
-          "@#{key.to_s.gsub("_", "-")}"
-        end
-      end
-
-      def self.xpath_string(value)
-        if value.include? "'"
-          parts = value.split("'", -1).map { |part| "'#{part}'" }
-          string = parts.join(%{,"'",})
-          "concat(#{string})"
-        else
-          "'#{value}'"
-        end
-      end
-
-      def self.identifier_for_element identifier, find_by, find_by_mapping
-        how, what = identifier.keys.first, identifier.values.first
-        return how => what if find_by.include? how
-        return find_by_mapping[how] => what if find_by_mapping[how]
-        identifier
-      end
-
-      def self.finders
-        [:class, :id, :index, :name, :xpath]
-      end
-
-      def self.mapping
-        {}
-      end
-
       private
 
       def timed_loop(timeout)

data/lib/druid/elements/file_field.rb

@@ -1,9 +1,6 @@
 module Druid
   module Elements
     class FileField < Element
-      def self.finders
-        super + [:title, :label]
-      end
 
       #
       # Set the value of the FileField

data/lib/druid/elements/form.rb

@@ -2,15 +2,6 @@ module Druid
   module Elements
     class Form < Element
 
-      def self.finders
-        super + [:action]
-      end
-      #
-      # Submit the form
-      #
-      def submit
-        element.submit
-      end
     end
 
     Druid::Elements.tag_to_class[:form] = Druid::Elements::Form

data/lib/druid/elements/hidden_field.rb

@@ -6,10 +6,6 @@ module Druid
         raise "click is not available on hidden field element with watir"
       end
 
-      def self.finders
-        super + [:text, :value]
-      end
-
     end
 
     Druid::Elements.type_to_class[:hidden] = Druid::Elements::HiddenField

data/lib/druid/elements/image.rb

@@ -2,10 +2,6 @@ module Druid
   module Elements
     class Image < Element
 
-      def self.finders
-        super + [:alt, :src]
-      end
-
       def width
         element.width
       end

data/lib/druid/elements/label.rb

@@ -1,9 +1,6 @@
 module Druid
   module Elements
     class Label < Element
-      def self.finders
-        super + [:text]
-      end
 
       Druid::Elements.tag_to_class[:label] = Druid::Elements::Label
     end