page-object 2.0.0 → 2.1

data/lib/page-object/elements/image.rb

@@ -1,9 +1,19 @@
 module PageObject
   module Elements
     class Image < Element
-      def initialize(element, platform)
-        @element = element
-        include_platform_for platform
+
+      #
+      # Return the width of the image.
+      #
+      def width
+        element.width
+      end
+
+      #
+      # Return the height of the image
+      #
+      def height
+        element.height
       end
 
       protected
@@ -12,10 +22,6 @@ module PageObject
         super + [:alt, :src]
       end
 
-      def self.selenium_finders
-        super + [:alt, :src, :css]
-      end
-
     end
 
     ::PageObject::Elements.tag_to_class[:img] = ::PageObject::Elements::Image

data/lib/page-object/elements/label.rb

@@ -8,10 +8,6 @@ module PageObject
         super + [:text]
       end
 
-      def self.selenium_finders
-        super + [:text]
-      end
-
     end
 
     ::PageObject::Elements.tag_to_class[:label] = ::PageObject::Elements::Label

data/lib/page-object/elements/link.rb

@@ -3,11 +3,6 @@ module PageObject
   module Elements
     class Link < Element
 
-      def initialize(element, platform)
-        @element = element
-        include_platform_for platform
-      end
-
       protected
 
       def self.watir_finders
@@ -18,14 +13,6 @@ module PageObject
         super.merge({:link => :text, :link_text => :text})
       end
 
-      def self.selenium_finders
-        super + [:link, :link_text, :title]
-      end
-
-      def self.selenium_mapping
-        super.merge(:text => :link_text)
-      end
-
     end
     
     ::PageObject::Elements.tag_to_class[:a] = ::PageObject::Elements::Link

data/lib/page-object/elements/list_item.rb

@@ -8,9 +8,6 @@ module PageObject
         super + [:text]
       end
 
-      def self.selenium_finders
-        super + [:text]
-      end
     end
 
     ::PageObject::Elements.tag_to_class[:li] = ::PageObject::Elements::ListItem

data/lib/page-object/elements/ordered_list.rb

@@ -4,11 +4,6 @@ module PageObject
     class OrderedList < Element
       include Enumerable
 
-      def initialize(element, platform)
-        @element = element
-        include_platform_for platform
-      end
-
       #
       # iterator that yields with a PageObject::Elements::ListItem
       #
@@ -20,8 +15,38 @@ module PageObject
         end
       end
 
+      #
+      # Return the PageObject::Elements::ListItem for the index provided.  Index
+      # is zero based.
+      #
+      # @return [PageObject::Elements::ListItem]
+      #
+      def [](idx)
+        Object::PageObject::Elements::ListItem.new(children[idx], :platform => :watir)
+      end
+
+      #
+      # Return the number of items contained in the ordered list
+      #
+      def items
+        children.size
+      end
+
+      #
+      # Return the ListItem objects that are children of the OrderedList
+      #
+      def list_items
+        children.collect do |obj|
+          Object::PageObject::Elements::ListItem.new(obj, :platform => :watir)
+        end
+      end
+
       protected
 
+      def children
+        element.ols(:xpath => child_xpath)
+      end
+
       def child_xpath
         "./child::li"
       end

data/lib/page-object/elements/radio_button.rb

@@ -3,9 +3,18 @@ module PageObject
   module Elements
     class RadioButton < Element
 
-      def initialize(element, platform)
-        @element = element
-        include_platform_for platform
+      #
+      # select the radiobutton
+      #
+      def select
+        element.set
+      end
+
+      #
+      # return if it is selected
+      #
+      def selected?
+        element.set?
       end
 
       protected
@@ -14,10 +23,6 @@ module PageObject
         super + [:value, :label]
       end
 
-      def self.selenium_finders
-        super + [:value, :label]
-      end
-
     end
 
     ::PageObject::Elements.type_to_class[:radio] = ::PageObject::Elements::RadioButton

data/lib/page-object/elements/select_list.rb

@@ -1,11 +1,47 @@
-
 module PageObject
   module Elements
     class SelectList < Element
 
-      def initialize(element, platform)
-        @element = element
-        include_platform_for platform
+      #
+      # Return the PageObject::Elements::Option for the index provided.  Index
+      # is zero based.
+      #
+      # @return [PageObject::Elements::Option]
+      #
+      def [](idx)
+        options[idx]
+      end
+
+      #
+      # Return an array of Options contained in the select list.
+      #
+      # @return [array of PageObject::Elements::Option]
+      #
+      def options
+        element.options.map { |e| ::PageObject::Elements::Option.new(e, :platform => :watir) }
+      end
+
+      #
+      # @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
+      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
       end
 
       protected
@@ -18,10 +54,6 @@ module PageObject
         super + [:text, :value, :label]
       end
 
-      def self.selenium_finders
-        super + [:label]
-      end
-
     end
 
     ::PageObject::Elements.tag_to_class[:select] = ::PageObject::Elements::SelectList

data/lib/page-object/elements/span.rb

@@ -8,9 +8,6 @@ module PageObject
         [:class, :id, :index, :text, :title, :xpath]
       end
       
-      def self.selenium_finders
-        [:class, :css, :id, :name, :text, :title, :xpath, :index]
-      end
     end
 
     ::PageObject::Elements.tag_to_class[:span] = ::PageObject::Elements::Span

data/lib/page-object/elements/table.rb

@@ -3,11 +3,6 @@ module PageObject
     class Table < Element
       include Enumerable
 
-      def initialize(element, platform)
-        @element = element
-        include_platform_for platform
-      end
-
       #
       # iterator that yields with a PageObject::Elements::TableRow
       #
@@ -49,6 +44,26 @@ module PageObject
         end
       end
 
+      #
+      # Return the PageObject::Elements::TableRow for the index provided.  Index
+      # is zero based.  If the index provided is a String then it
+      # will be matched with the text from any column. The text can be a substring of the full column text.
+      #
+      # @return [PageObject::Elements::TableRow]
+      #
+      def [](idx)
+        idx = find_index_by_title(idx) if idx.kind_of?(String)
+        return nil unless idx
+        initialize_row(element[idx], :platform => :watir)
+      end
+
+      #
+      # Returns the number of rows in the table.
+      #
+      def rows
+        element.wd.find_elements(:xpath, child_xpath).size
+      end
+
       protected
 
       def child_xpath
@@ -59,6 +74,12 @@ module PageObject
         ::PageObject::Elements::TableRow.new(row_element, platform)
       end
 
+      def find_index_by_title(row_title)
+        element.rows.find_index do |row|
+          row.cells.any? { |col| col.text.include? row_title }
+        end
+      end
+
     end
 
     ::PageObject::Elements.tag_to_class[:table] = ::PageObject::Elements::Table

data/lib/page-object/elements/table_cell.rb

@@ -15,10 +15,6 @@ module PageObject
         super + [:text]
       end
 
-      def self.selenium_finders
-        super + [:text]
-      end
-
     end
 
     ::PageObject::Elements.tag_to_class[:td] = ::PageObject::Elements::TableCell

data/lib/page-object/elements/table_row.rb

@@ -1,14 +1,10 @@
+require 'watir/elements/html_elements'
 
 module PageObject
   module Elements
     class TableRow < Element
       include Enumerable
 
-      def initialize(element, platform)
-        @element = element
-        include_platform_for platform
-      end
-
       #
       # iterator that yields with a PageObject::Elements::TableCell
       #
@@ -20,6 +16,25 @@ module PageObject
         end
       end
 
+      #
+      # Return the PageObject::Elements::TableCell 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 columns in the first row.
+      # The text can be a substring of the full column text.
+      #
+      def [](idx)
+        idx = find_index_by_title(idx) if idx.kind_of?(String)
+        return nil unless idx && columns >= idx + 1
+        initialize_cell(element[idx], :platform => :watir)
+      end
+
+      #
+      # Returns the number of columns in the table.
+      #
+      def columns
+        element.wd.find_elements(:xpath, child_xpath).size
+      end
+
       protected
 
       def child_xpath
@@ -30,6 +45,16 @@ module PageObject
         ::PageObject::Elements::TableCell.new(row_element, platform)
       end
 
+      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
+        end
+        first_row = table[0]
+        first_row.cells.find_index {|column| column.text.include? title }
+      end
+
     end
 
     ::PageObject::Elements.tag_to_class[:tr] = ::PageObject::Elements::TableRow

data/lib/page-object/elements/text_area.rb

@@ -3,16 +3,16 @@ module PageObject
   module Elements
     class TextArea < Element
 
-      def initialize(element, platform)
-        @element = element
-        include_platform_for platform
+      #
+      # Set the value of the TextArea
+      #
+      def value=(new_value)
+        element.set(new_value)
       end
 
-      def self.watir_finders
-        super + [:label]
-      end
+      protected
 
-      def self.selenium_finders
+      def self.watir_finders
         super + [:label]
       end
 

data/lib/page-object/elements/text_field.rb

@@ -3,13 +3,11 @@ module PageObject
   module Elements
     class TextField < Element
 
-      def initialize(element, platform)
-        @element = element
-        include_platform_for platform
-      end
-
-      def append(text)
-        element.send_keys text
+      #
+      # Set the value of the TextField
+      #
+      def value=(new_value)
+        element.set(new_value)
       end
 
       protected
@@ -18,10 +16,6 @@ module PageObject
         super + [:title, :value, :text, :label]
       end
 
-      def self.selenium_finders
-        super + [:title, :value, :text, :label]
-      end
-
     end
 
     ::PageObject::Elements.type_to_class[:text] = ::PageObject::Elements::TextField

data/lib/page-object/elements/unordered_list.rb

@@ -4,11 +4,6 @@ module PageObject
     class UnorderedList < Element
       include Enumerable
 
-      def initialize(element, platform)
-        @element = element
-        include_platform_for platform
-      end
-
       #
       # iterator that yields with a PageObject::Elements::ListItem
       #
@@ -20,6 +15,32 @@ module PageObject
         end
       end
 
+      #
+      # Return the PageObject::Elements::ListItem for the index provided.  Index
+      # is zero based.
+      #
+      # @return [PageObject::Elements::ListItem]
+      #
+      def [](idx)
+        Object::PageObject::Elements::ListItem.new(children[idx], :platform => :watir)
+      end
+
+      #
+      # Return the number of items contained in the unordered list
+      #
+      def items
+        children.size
+      end
+
+      #
+      # Return the ListItem objects that are children of the
+      # UnorderedList
+      #
+      def list_items
+        children.collect do |obj|
+          Object::PageObject::Elements::ListItem.new(obj, :platform => :watir)
+        end
+      end
 
       protected
 
@@ -31,6 +52,10 @@ module PageObject
         [:class, :id, :index, :xpath]
       end
 
+      def children
+        element.uls(:xpath => child_xpath)
+      end
+
     end
 
     ::PageObject::Elements.tag_to_class[:ul] = ::PageObject::Elements::UnorderedList