page-object 0.0.1 → 0.0.2

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

@@ -2,13 +2,10 @@ module PageObject
   module Elements
     class Button < Element
 
-      def self.watir_identifier_for identifier
-        identifier_for identifier, watir_finders, watir_mapping
-      end
-
-      def self.selenium_identifier_for identifier
-        identifier_for identifier, selenium_finders, selenium_mapping
-        return identifier.keys.first, identifier.values.first
+      protected
+      
+      def self.watir_finders
+        super + [:text]
       end
     end
   end

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

@@ -2,14 +2,6 @@ module PageObject
   module Elements
     class CheckBox < Element
 
-      def self.watir_identifier_for identifier
-        identifier_for identifier, watir_finders, watir_mapping
-      end
-
-      def self.selenium_identifier_for identifier
-        identifier = identifier_for identifier, selenium_finders, selenium_mapping
-        return identifier.keys.first, identifier.values.first
-      end
     end
   end
 end

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

@@ -0,0 +1,12 @@
+module PageObject
+  module Elements
+    class Div < Element
+  
+      protected
+      
+      def self.watir_finders
+        [:class, :id, :index, :xpath]
+      end
+    end
+  end
+end

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

@@ -1,3 +1,4 @@
+
 module PageObject
   module Elements
 
@@ -11,6 +12,17 @@ module PageObject
         include_platform_for platform
       end
       
+      def self.watir_identifier_for identifier
+        identifier_for identifier, watir_finders, watir_mapping
+      end
+
+      def self.selenium_identifier_for identifier
+        identifier = identifier_for identifier, selenium_finders, selenium_mapping
+        return identifier.keys.first, identifier.values.first
+      end
+      
+      protected
+
       def self.identifier_for identifier, find_by, find_by_mapping
         how, what = identifier.keys.first, identifier.values.first
         return how => what if find_by.include? how
@@ -18,33 +30,31 @@ module PageObject
         return nil => what
       end
       
-      protected
-
       def self.watir_finders
         [:class, :id, :index, :name, :xpath]
       end
       
-      def self.watir_mapping
-        {}
+      def self.watir_mapping 
+        {} 
       end
       
       def self.selenium_finders
         [:class, :id, :name, :xpath]
       end
       
-      def self.selenium_mapping
-        {}
+      def self.selenium_mapping 
+        {} 
       end
       
-      private
-      
       def include_platform_for platform
         if platform[:platform] == :watir
-          require 'page-object/watir_element'
-          self.class.send :include, PageObject::WatirElement
+          require 'page-object/platforms/watir_element'
+          self.class.send :include, PageObject::Platforms::WatirElement
+        elsif platform[:platform] == :selenium
+          require 'page-object/platforms/selenium_element'
+          self.class.send :include, PageObject::Platforms::SeleniumElement
         else
-          require 'page-object/selenium_element'
-          self.class.send :include, PageObject::SeleniumElement
+          raise ArgumentError, "expect platform to be :watir or :selenium"          
         end
       end
     end

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

@@ -2,14 +2,6 @@ module PageObject
   module Elements
     class Link < Element
       
-      def self.watir_identifier_for identifier
-        identifier_for identifier, watir_finders, watir_mapping
-      end
-
-      def self.selenium_identifier_for identifier
-        identifier = identifier_for identifier, selenium_finders, selenium_mapping
-        return identifier.keys.first, identifier.values.first
-      end    
       
       protected
       

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

@@ -2,14 +2,6 @@ module PageObject
   module Elements
     class RadioButton < Element
 
-      def self.watir_identifier_for identifier
-        identifier_for identifier, watir_finders, watir_mapping
-      end
-
-      def self.selenium_identifier_for identifier
-        identifier = identifier_for identifier, selenium_finders, selenium_mapping
-        return identifier.keys.first, identifier.values.first
-      end
     end
   end
 end

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

@@ -2,15 +2,6 @@ module PageObject
   module Elements
     class SelectList < Element
 
-      def self.watir_identifier_for identifier
-        identifier_for identifier, watir_finders, watir_mapping
-      end
-
-      def self.selenium_identifier_for identifier
-        identifier = identifier_for identifier, selenium_finders, selenium_mapping
-        return identifier.keys.first, identifier.values.first
-      end
-      
       protected
       
       def self.watir_finders

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

@@ -0,0 +1,26 @@
+module PageObject
+  module Elements
+    class Table < Element
+      
+      def initialize(element, platform)
+        @element = element
+        include_platform_for platform
+      end
+      
+      protected
+      
+      def include_platform_for platform
+        super
+        if platform[:platform] == :watir
+          require 'page-object/platforms/watir_table'
+          self.class.send :include, PageObject::Platforms::WatirTable
+        elsif platform[:platform] == :selenium
+          require 'page-object/platforms/selenium_table'
+          self.class.send :include, PageObject::Platforms::SeleniumTable
+        else
+          raise ArgumentError, "expect platform to be :watir or :selenium"          
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,7 @@
+module PageObject
+  module Elements
+    class TableCell < Element
+
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+module PageObject
+  module Elements
+    class TableRow < Element
+
+      def initialize(element, platform)
+        @element = element
+        include_platform_for platform
+      end
+      
+      protected
+      
+      def include_platform_for platform
+        super
+        if platform[:platform] == :watir
+          require 'page-object/platforms/watir_table_row'
+          self.class.send :include, PageObject::Platforms::WatirTableRow
+        elsif platform[:platform] == :selenium
+          require 'page-object/platforms/selenium_table_row'
+          self.class.send :include, PageObject::Platforms::SeleniumTableRow
+        else
+          raise ArgumentError, "expect platform to be :watir or :selenium"          
+        end
+      end
+    end
+  end
+end

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

@@ -2,15 +2,6 @@ module PageObject
   module Elements
     class TextField < Element
 
-      def self.watir_identifier_for identifier
-        identifier_for identifier, watir_finders, watir_mapping
-      end
-
-      def self.selenium_identifier_for identifier
-        identifier = identifier_for identifier, selenium_finders, selenium_mapping
-        return identifier.keys.first, identifier.values.first
-      end
-      
       protected
       
       def self.watir_finders

data/lib/page-object/elements.rb

@@ -6,3 +6,7 @@ require 'page-object/elements/select_list'
 require 'page-object/elements/check_box'
 require 'page-object/elements/button'
 require 'page-object/elements/radio_button'
+require 'page-object/elements/div'
+require 'page-object/elements/table'
+require 'page-object/elements/table_cell'
+require 'page-object/elements/table_row'

data/lib/page-object/platforms/selenium_element.rb

@@ -0,0 +1,29 @@
+
+module PageObject
+  module Platforms
+    module SeleniumElement
+      
+      #
+      # return true if an element is visible
+      #
+      def visible?
+        @element.displayed?
+      end
+    
+      #
+      # return true if an element exists
+      #
+      def exists?
+        nil != @element
+      end
+
+      #
+      # return the text for the element
+      #
+      def text
+        @element.text
+      end
+      
+    end
+  end
+end

data/lib/page-object/platforms/selenium_table.rb

@@ -0,0 +1,24 @@
+module PageObject
+  module Platforms
+    module SeleniumTable      
+      
+      #
+      # Return the PageObject::Elements::TableRow for the index provided.  Index
+      # is zero based.
+      #
+      def [](idx)
+        element = @element.find_element(:xpath, ".//tr[#{idx+1}]")
+        PageObject::Elements::TableRow.new(element, :platform => :selenium)
+      end
+
+      #
+      # override PageObject::Platforms::SeleniumElement because exists? is not
+      # available on a table element in Selenium.
+      #
+      def exists?
+        nil
+      end
+      
+    end
+  end
+end

data/lib/page-object/platforms/selenium_table_row.rb

@@ -0,0 +1,16 @@
+module PageObject
+  module Platforms
+    module SeleniumTableRow
+      
+      #
+      # Return the PageObject::Elements::TableCell for the index provided.  Index
+      # is zero based.
+      #
+      def [](idx)
+        element = @element.find_element(:xpath, "./th|td[#{idx+1}]")
+        PageObject::Elements::TableCell.new(element, :platform => :selenium)
+      end
+      
+    end
+  end
+end

data/lib/page-object/platforms/watir_element.rb

@@ -0,0 +1,29 @@
+
+module PageObject
+  module Platforms
+    module WatirElement
+      
+      #
+      # return true if an element is visible
+      #
+      def visible?
+        @element.present?
+      end
+
+      #
+      # return true if an element exists
+      #
+      def exists?
+        @element.exists?
+      end
+      
+      #
+      # return the text for the element
+      #
+      def text
+        @element.text
+      end
+      
+    end
+  end
+end

data/lib/page-object/platforms/watir_table.rb

@@ -0,0 +1,15 @@
+module PageObject
+  module Platforms
+    module WatirTable
+      
+      #
+      # Return the PageObject::Elements::TableRow for the index provided.  Index
+      # is zero based.
+      #
+      def [](idx)
+        PageObject::Elements::TableRow.new(@element[idx], :platform => :watir)
+      end
+      
+    end
+  end
+end

data/lib/page-object/platforms/watir_table_row.rb

@@ -0,0 +1,15 @@
+module PageObject
+  module Platforms
+    module WatirTableRow
+      
+      #
+      # Return the PageObject::Elements::TableCell for the index provided.  Index
+      # is zero based.
+      #
+      def [](idx)
+        PageObject::Elements::TableCell.new(@element[idx], :platform => :watir)
+      end
+      
+    end
+  end
+end

data/lib/page-object/selenium_page_object.rb

@@ -44,7 +44,7 @@ module PageObject
     #
     def text_field_value_for(identifier)
       how, what = Elements::TextField.selenium_identifier_for identifier
-      @browser.find_element(how, what).value
+      @browser.find_element(how, what).attribute('value')
     end
     
     #
@@ -186,5 +186,72 @@ module PageObject
       element = @browser.find_element(how, what)
       PageObject::Elements::RadioButton.new(element, :platform => :selenium)
     end
+    
+    #
+    # platform method to return the text for a div
+    # See PageObject::Accessors#div
+    #    
+    def div_text_for(identifier)
+      how, what = Elements::Div.selenium_identifier_for identifier
+      @browser.find_element(how, what).text
+    end
+    
+    #
+    # platform method to return a PageObject::Elements::Div element
+    # See PageObject::Accessors#div
+    #
+    def div_for(identifier)
+      how, what = Elements::Div.selenium_identifier_for identifier
+      element = @browser.find_element(how, what)
+      PageObject::Elements::Div.new(element, :platform => :selenium)
+    end
+    
+    #
+    # platform method to click a button
+    # See PageObject::Accessors#button
+    #
+    def click_button_for(identifier)
+      how, what = Elements::Button.selenium_identifier_for identifier
+      @browser.find_element(how, what).click
+    end
+    
+    #
+    # platform method to retrieve a button element
+    # See PageObject::Accessors#button
+    #
+    def button_for(identifier)
+      how, what = Elements::Button.selenium_identifier_for identifier
+      element = @browser.find_element(how, what)
+      PageObject::Elements::Button.new(element, :platform => :selenium)
+    end
+
+    #
+    # platform method to retrieve a table element
+    # See PageObject::Accessors#table
+    #
+    def table_for(identifier)
+      how, what = Elements::Table.selenium_identifier_for identifier
+      element = @browser.find_element(how, what)
+      PageObject::Elements::Table.new(element, :platform => :selenium)
+    end
+    
+    #
+    # platform method to retrieve the text from a table cell
+    # See PageObject::Accessors#cell
+    #
+    def cell_text_for(identifier)
+      how, what = Elements::TableCell.selenium_identifier_for identifier
+      @browser.find_element(how, what).text
+    end
+    
+    #
+    # platform method to retrieve a table cell element
+    # See PageObject::Accessors#cell
+    #
+    def cell_for(identifier)
+      how, what = Elements::TableCell.selenium_identifier_for identifier
+      element = @browser.find_element(how, what)
+      PageObject::Elements::TableCell.new(element, :platform => :selenium)
+    end
   end
 end