druid-ts 1.2.4 → 1.2.5

data/lib/druid/elements/file_field.rb

@@ -2,12 +2,6 @@ module Druid
   module Elements
     class FileField < Element
 
-      #
-      # Set the value of the FileField
-      #
-      def value=(new_value)
-        element.set(new_value)
-      end
     end
 
     Druid::Elements.type_to_class[:file] = Druid::Elements::FileField

data/lib/druid/elements/hidden_field.rb

@@ -2,10 +2,6 @@ module Druid
   module Elements
     class HiddenField < Element
 
-      def click
-        raise "click is not available on hidden field element with watir"
-      end
-
     end
 
     Druid::Elements.type_to_class[:hidden] = Druid::Elements::HiddenField

data/lib/druid/elements/image.rb

@@ -2,13 +2,6 @@ module Druid
   module Elements
     class Image < Element
 
-      def width
-        element.width
-      end
-
-      def height
-        element.height
-      end
     end
 
     Druid::Elements.tag_to_class[:img] = Druid::Elements::Image

data/lib/druid/elements/media.rb

@@ -2,44 +2,10 @@ module Druid
   module Elements
     class Media < Element
 
-      def autoplay?
-        attribute(:autoplay)
-      end
-
       def has_controls?
         attribute(:controls)
       end
 
-      def paused?
-        attribute(:paused)
-      end
-
-      def duration
-        duration = attribute(:duration)
-        return duration.to_f if duration
-      end
-
-      def volume
-        volume = attribute(:volume)
-        return volume.to_i if volume
-      end
-
-      def ended?
-        attribute(:ended)
-      end
-
-      def seeking?
-        attribute(:seeking)
-      end
-
-      def loop?
-        attribute(:loop)
-      end
-
-      def muted?
-        attribute(:muted)
-      end
-
     end
   end
 end

data/lib/druid/elements/ordered_list.rb

@@ -4,35 +4,22 @@ module Druid
       attr_accessor :li_element
 
       def [](idx)
-        Druid::Elements::ListItem.new(children[idx])
+        list_items[idx]
       end
 
       def items
-        children.size
+        list_items.size
       end
 
-      def each
-        for index in 1..self.items do
-          yield self[index-1]
-        end
+      def each(&block)
+        list_items.each(&block)
       end
 
+      #
+      # Return Array of ListItem objects that are children of the OrderedList
+      #
       def list_items
-        children.collect do |obj|
-          Druid::Elements::ListItem.new(obj)
-        end
-      end
-
-      protected
-
-      def child_xpath
-        "./child::li"
-      end
-
-      private
-
-      def children
-        element.ols(:xpath => child_xpath)
+        @list_items ||= children(tag_name: 'li')
       end
 
     end

data/lib/druid/elements/radio_button.rb

@@ -2,19 +2,6 @@ module Druid
   module Elements
     class RadioButton < Element
 
-      #
-      # Select the RadioButton
-      #
-      def select
-        element.set
-      end
-
-      #
-      # Return if it is selected
-      #
-      def selected?
-        element.set?
-      end
     end
 
     Druid::Elements.type_to_class[:radio] = Druid::Elements::RadioButton

data/lib/druid/elements/select_list.rb

@@ -14,22 +14,13 @@ module Druid
       # @return [Array<String>] An array of strings representing the text of the currently selected options.
       #
       def selected_options
-        element.selected_options.map { |e| e.text }.compact
+        element.selected_options.map(&:text).compact
       end
 
       #
       # @return [Array<String>] An array of strings representing the value of the currently selected options.
       def selected_values
-        element.selected_options.map { |e| e.value }.compact
-      end
-
-      #
-      # Returns true if the select list has one or more options where text or label matches the given value.
-      #
-      # @param [String, Regexp] value A value
-      # @return [Boolean]
-      def include? value
-        element.include? value
+        element.selected_options.map(&:value).compact
       end
 
     end

data/lib/druid/elements/table.rb

@@ -7,24 +7,27 @@ module Druid
       # will be matched with the text from any column. The text can be
       # a substring of the full column text.
       #
-      # @return [Druid::Elements::Table]
+      # @return [Druid::Elements::TableRow]
       #
-      def [](idx)
-        idx = find_index_by_title(idx) if idx.kind_of?(String)
-        return nil unless idx
-        Druid::Elements::TableRow.new(element[idx])
+      def [](what)
+        idx = find_index(what)
+        idx && row_items[idx]
       end
+
       #
       # Returns the number of rows in the table.
       #
       def rows
-        element.rows.size
+        row_items.size
       end
 
-      def each
-        for index in 1..self.rows do
-          yield self[index-1]
-        end
+      #
+      # iterator that yields with a Druid::Elements::TableRow
+      #
+      # @return [Druid::Elements::TableRow]
+      #
+      def each(&block)
+        row_items.each(&block)
       end
 
       #
@@ -46,17 +49,39 @@ module Druid
       end
 
       #
-      # return the table as hashes
+      # Returns the Array of values(String) in a column for the index provided. Index
+      # is zero based. If the index provided is a String then it
+      # will be matched with the text from the header. The text can be a substring of the full header text
       #
-      def hashes
-        element.hashes
+      def column_values(what)
+        idx = find_index_of_header(what)
+        idx && row_items.drop(1).collect{ |row| row.cell(index: idx).text }
       end
 
       private
 
-      def find_index_by_title(row_title)
-        element.rows.find_index do |row|
-          row.cells.any? { |col| col.text.include? row_title}
+      def row_items
+        meth = stragegy == :descendants ? :trs : :rows
+        @row_items ||= element.send(meth).map do |obj|
+          Druid::Elements::TableRow.new(obj)
+        end
+      end
+
+      def stragegy
+        :children
+      end
+
+      def find_index_of_header(what)
+        return what if what.is_a? Integer
+        row_items[0].cells.find_index do |cell|
+          cell.text.include? Regexp.escape(what)
+        end
+      end
+
+      def find_index(what)
+        return what if what.is_a? Integer
+        row_items.find_index do |row|
+          row.cell(text: /#{Regexp.escape(what)}/).exist?
         end
       end
 

data/lib/druid/elements/table_row.rb

@@ -8,34 +8,38 @@ module Druid
       # is zero based. If the index provided is a String then it
       # will be matched with the text from the columns in the first row.
       #
-      def [](idx)
-        idx = find_index_by_title(idx) if idx.kind_of?(String)
-        return nil unless idx && columns >= idx + 1
-        Druid::Elements::TableCell.new(element[idx])
+      def [](what)
+        idx = find_index(what)
+        idx && cell_items[idx]
       end
+
       #
-      # Returns the number of rows in the table.
+      # Returns the number of colums in the table
       #
       def columns
-        element.cells.size
+        cell_items.size
       end
 
-      def each
-        for index in 1..self.columns do
-          yield self[index-1]
-        end
+      #
+      # iterator that yields with a Druid::Elements::TableCell
+      #
+      def each(&block)
+        cell_items.each(&block)
       end
 
       private
 
-      def find_index_by_title(title)
-        table = element.parent
-        table = table.parent if table.tag_name == 'tbody'
-        if table.instance_of? Watir::HTMLElement
-          table = table.to_subtype
+      def cell_items
+        @cell_items ||= element.cells.map do |obj|
+          Druid::Elements::TableCell.new(obj)
+        end
+      end
+
+      def find_index(what)
+        return what if what.is_a? Integer
+        parent(tag_name: 'table').headers.find_index do |header|
+          header.text.include? what
         end
-        first_row = table[0]
-        first_row.cells.find_index { |column| column.text.include? title}
       end
 
     end

data/lib/druid/elements/text_area.rb

@@ -2,13 +2,6 @@ module Druid
   module Elements
     class TextArea < Element
 
-      #
-      # Set the value of the TextArea
-      #
-      def value=(new_value)
-        element.set(new_value)
-      end
-
     end
 
     Druid::Elements.tag_to_class[:textarea] = Druid::Elements::TextArea

data/lib/druid/elements/text_field.rb

@@ -2,13 +2,6 @@ module Druid
   module Elements
     class TextField < Element
 
-      #
-      # Set the value of the TextField
-      #
-      def value=(new_value)
-        element.set(new_value)
-      end
-
     end
 
     Druid::Elements.type_to_class[:text] = Druid::Elements::TextField

data/lib/druid/elements/unordered_list.rb

@@ -2,41 +2,28 @@ module Druid
   module Elements
     class UnOrderedList < Element
 
+      #
+      # @return [Druid::Elements::ListItem]
+      #
       def [](idx)
-        Druid::Elements::ListItem.new(children[idx])
+        list_items[idx]
       end
 
       def items
-        children.size
+        list_items.size
       end
 
-      def each
-        for index in 1..self.items do
-          yield self[index-1]
-        end
+      def each(&block)
+        list_items.each(&block)
       end
 
       #
-      # return the ListItem objects that are children of the
-      # UnOrderedList
+      # Return Array of ListItem objects that are children of the UnorderedList
       #
       def list_items
-        children.collect do |obj|
-          Druid::Elements::ListItem.new(obj)
-        end
+        @list_items ||= children(tag_name: 'li')
       end
 
-      protected
-
-      def child_xpath
-        "./child::li"
-      end
-
-      private
-
-      def children
-        element.uls(:xpath => child_xpath)
-      end
     end
 
     Druid::Elements.tag_to_class[:ul] = Druid::Elements::UnOrderedList

data/lib/druid/javascript_framework_facade.rb

@@ -65,7 +65,7 @@ module Druid
       end
 
       def unknown_framework(framework)
-        "You specified the Javascript framework #{framework} and it is unknow to the system"
+        "You specified the Javascript framework #{framework} and it is unknown to the system"
       end
 
       def invalid_framework

data/lib/druid/locator_generator.rb

@@ -1,154 +1,160 @@
 module Druid
   module LocatorGenerator
 
-    BASIC_ELEMENTS = [:abbr,
-                      :address,
-                      :animate,
-                      :animate_motion,
-                      :animate_transform,
-                      :article,
-                      :as,
-                      :aside,
-                      :base,
-                      :bdi,
-                      :bdo,
-                      :blockquote,
-                      :body,
-                      :br,
-                      :caption,
-                      :circle,
-                      :cite,
-                      :code,
-                      :col,
-                      :colgroup,
-                      :command,
-                      :cursor,
-                      :data,
-                      :datalist,
-                      :dd,
-                      :defs,
-                      :del,
-                      :desc,
-                      :details,
-                      :dfn,
-                      :dialog,
-                      :discard,
-                      :dl,
-                      :dt,
-                      :ellipse,
-                      :em,
-                      :embed,
-                      :fieldset,
-                      :figcaption,
-                      :figure,
-                      :foot,
-                      :footer,
-                      :foreign_object,
-                      :g,
-                      :head,
-                      :header,
-                      :hgroup,
-                      :hr,
-                      :html,
-                      :ins,
-                      :kbd,
-                      :keygen,
-                      :legend,
-                      :line,
-                      :linear_gradient,
-                      :main,
-                      :map,
-                      :mark,
-                      :marker,
-                      :menu,
-                      :menuitem,
-                      :mesh_gradient,
-                      :mesh_patch,
-                      :mesh_row,
-                      :meta,
-                      :metadata,
-                      :meter,
-                      :mpath,
-                      :nav,
-                      :noscript,
-                      :object,
-                      :optgroup,
-                      :output,
-                      :p,
-                      :param,
-                      :path,
-                      :pattern,
-                      :polygon,
-                      :polyline,
-                      :pre,
-                      :progress,
-                      :q,
-                      :radial_gradient,
-                      :rect,
-                      :rp,
-                      :rt,
-                      :ruby,
-                      :s,
-                      :samp,
-                      :script,
-                      :section,
-                      :small,
-                      :source,
-                      :stop,
-                      :strong,
-                      :style,
-                      :sub,
-                      :summary,
-                      :sup,
-                      :switch,
-                      :symbol,
-                      :template,
-                      :text_path,
-                      :thread,
-                      :time,
-                      :title,
-                      :track,
-                      :tspan,
-                      :u,
-                      :use,
-                      :var,
-                      :view,
-                      :wbr]
+    BASIC_ELEMENTS = %i(
+        abbr
+        address
+        animate
+        animate_motion
+        animate_transform
+        article
+        as
+        aside
+        base
+        bdi
+        bdo
+        blockquote
+        body
+        br
+        caption
+        circle
+        cite
+        code
+        col
+        colgroup
+        command
+        cursor
+        data
+        datalist
+        dd
+        defs
+        del
+        desc
+        details
+        dfn
+        dialog
+        discard
+        dl
+        dt
+        ellipse
+        em
+        embed
+        fieldset
+        figcaption
+        figure
+        font
+        footer
+        foreign_object
+        g
+        head
+        header
+        hgroup
+        hr
+        html
+        ins
+        kbd
+        keygen
+        legend
+        line
+        linear_gradient
+        main
+        map
+        mark
+        marker
+        menu
+        menuitem
+        mesh_gradient
+        mesh_patch
+        mesh_row
+        meta
+        metadata
+        meter
+        mpath
+        nav
+        noscript
+        object
+        optgroup
+        output
+        p
+        param
+        path
+        pattern
+        polygon
+        polyline
+        pre
+        progress
+        q
+        radial_gradient
+        rect
+        rp
+        rt
+        ruby
+        s
+        samp
+        script
+        section
+        set
+        small
+        source
+        stop
+        strong
+        style
+        sub
+        summary
+        sup
+        switch
+        symbol
+        template
+        text_path
+        thread
+        time
+        title
+        track
+        tspan
+        u
+        use
+        var
+        view
+        wbr
+    )
 
-    ADVANCED_ELEMENTS = [:text_field,
-                         :hidden_field,
-                         :text_area,
-                         :select_list,
-                         :link,
-                         :checkbox,
-                         :radio_button,
-                         :button,
-                         :div,
-                         :span,
-                         :table,
-                         :cell,
-                         :row,
-                         :image,
-                         :form,
-                         :list_item,
-                         :unordered_list,
-                         :ordered_list,
-                         :h1,
-                         :h2,
-                         :h3,
-                         :h4,
-                         :h5,
-                         :h6,
-                         :paragraph,
-                         :label,
-                         :file_field,
-                         :area,
-                         :canvas,
-                         :audio,
-                         :video,
-                         :b,
-                         :i,
-                         :svg]
+
+    ADVANCED_ELEMENTS = %i(
+        text_field
+        hidden_field
+        text_area
+        select_list
+        link
+        checkbox
+        radio_button
+        button
+        div
+        span
+        table
+        cell
+        row
+        image
+        form
+        list_item
+        ordered_list
+        unordered_list
+        h1
+        h2
+        h3
+        h4
+        h5
+        h6
+        paragraph
+        label
+        file_field
+        area
+        canvas
+        audio
+        video
+        b
+        i
+        svg
+    )
 
     def self.generate_locators(target)
        ADVANCED_ELEMENTS.each do |tag|