page-object 0.2 → 0.2.1

data/lib/page-object/accessors.rb

@@ -1,4 +1,3 @@
-
 module PageObject
   #
   # Contains the class level methods that are inserted into your page objects
@@ -9,7 +8,7 @@ module PageObject
   # @see PageObject::SeleniumPageObject for the selenium implementation of the platform delegate
   #
   module Accessors
-    
+
     #
     # Specify the url for the page.  A call to this method will generate a
     # 'goto' method to take you to the page.
@@ -21,7 +20,7 @@ module PageObject
         platform.navigate_to url
       end
     end
-    
+
     #
     # adds three methods to the page object - one to set text in a text field,
     # another to retrieve text from a text field and another to return the text
@@ -56,7 +55,7 @@ module PageObject
         block ? block.call(browser) : platform.text_field_for(identifier.clone)
       end
     end
-    
+
     #
     # adds two methods to the page object - one to get the text from a hidden field
     # and another to retrieve the hidden field element.
@@ -86,7 +85,7 @@ module PageObject
         block ? block.call(browser) : platform.hidden_field_for(identifier.clone)
       end
     end
-    
+
     #
     # adds three methods to the page object - one to set text in a text area,
     # another to retrieve text from a text area and another to return the text
@@ -184,7 +183,7 @@ module PageObject
         block ? block.call(browser) : platform.link_for(identifier.clone)
       end
     end
-    
+
     #
     # adds four methods - one to check, another to uncheck, another
     # to return the state of a checkbox, and a final method to return
@@ -218,7 +217,7 @@ module PageObject
         block ? block.call(browser) : platform.checkbox_for(identifier.clone)
       end
     end
-    
+
     #
     # adds four methods - one to select, another to clear,
     # another to return if a radio button is selected, and
@@ -246,7 +245,7 @@ module PageObject
       define_method("clear_#{name}") do
         platform.clear_radio(identifier.clone)
       end
-      define_method("#{name}_selected?")  do
+      define_method("#{name}_selected?") do
         platform.radio_selected?(identifier.clone)
       end
       define_method("#{name}_radio_button") do
@@ -281,7 +280,7 @@ module PageObject
         block ? block.call(browser) : platform.button_for(identifier.clone)
       end
     end
-    
+
     #
     # adds two methods - one to retrieve the text from a div
     # and another to return the div element
@@ -297,6 +296,7 @@ module PageObject
     #   * :id => Watir and Selenium
     #   * :index => Watir and Selenium
     #   * :name => Watir and Selenium
+    #   * :text => Watir and Selenium
     #   * :xpath => Watir and Selenium
     # @param optional block to be invoked when element method is called
     #
@@ -358,7 +358,7 @@ module PageObject
         block ? block.call(browser) : platform.table_for(identifier.clone)
       end
     end
-    
+
     #
     # adds two methods  one to retrieve the text from a table cell
     # and another to return the table cell element
@@ -385,7 +385,7 @@ module PageObject
         block ? block.call(browser) : platform.cell_for(identifier.clone)
       end
     end
-    
+
     #
     # adds a method to retrieve the image element
     #
@@ -408,7 +408,7 @@ module PageObject
         block ? block.call(browser) : platform.image_for(identifier.clone)
       end
     end
-    
+
     #
     # adds a method to retrieve the form element
     #
@@ -430,7 +430,7 @@ module PageObject
         block ? block.call(browser) : platform.form_for(identifier.clone)
       end
     end
-    
+
     #
     # adds two methods - one to retrieve the text from a list item
     # and another to return the list item element
@@ -457,7 +457,7 @@ module PageObject
         block ? block.call(browser) : platform.list_item_for(identifier.clone)
       end
     end
-    
+
     #
     # adds a method to retrieve the unordered list element
     #
@@ -480,7 +480,7 @@ module PageObject
         block ? block.call(browser) : platform.unordered_list_for(identifier.clone)
       end
     end
-    
+
     #
     # adds a method to retrieve the ordered list element
     #

data/lib/page-object/elements.rb

@@ -1,4 +1,3 @@
-
 require 'page-object/elements/element'
 require 'page-object/elements/link'
 require 'page-object/elements/text_field'

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

@@ -1,25 +1,25 @@
-module PageObject
-  module Elements
-    class Button < Element
-
-      def initialize(element, platform)
-        @element = element
-        include_platform_for platform
-      end
-
-      protected
-      
-      def self.watir_finders
-        super + [:text]
-      end
-
-      def include_platform_for platform
-        super
-        if platform[:platform] == :selenium
-          require 'page-object/platforms/selenium_button'
-          self.class.send :include, PageObject::Platforms::SeleniumButton
-        end
-      end
-    end
-  end
+module PageObject
+  module Elements
+    class Button < Element
+
+      def initialize(element, platform)
+        @element = element
+        include_platform_for platform
+      end
+
+      protected
+
+      def self.watir_finders
+        super + [:text]
+      end
+
+      def include_platform_for platform
+        super
+        if platform[:platform] == :selenium
+          require 'page-object/platforms/selenium/button'
+          self.class.send :include, PageObject::Platforms::Selenium::Button
+        end
+      end
+    end
+  end
 end

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

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

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

@@ -1,4 +1,3 @@
-
 module PageObject
   module Elements
     #
@@ -9,12 +8,12 @@ module PageObject
     #
     class Element
       attr_reader :element
-      
+
       def initialize(element, platform)
         @element = element
         include_platform_for platform
       end
-      
+
       # @private
       def self.watir_identifier_for identifier
         if should_build_watir_xpath(identifier)
@@ -30,7 +29,7 @@ module PageObject
         end
         all_identities
       end
-      
+
       # @private
       def self.selenium_identifier_for identifier
         if identifier.length == 1
@@ -44,7 +43,7 @@ module PageObject
       end
 
       protected
-      
+
       def self.should_build_watir_xpath identifier
         ['table', 'span', 'div', 'td', 'li', 'ul', 'ol'].include? identifier[:tag_name] and identifier[:name]
       end
@@ -58,7 +57,7 @@ module PageObject
         xpath << "[#{idx+1}]" if idx
         xpath
       end
-      
+
       def self.attribute_expression(identifier)
         identifier.map do |key, value|
           if value.kind_of?(Array)
@@ -68,7 +67,7 @@ module PageObject
           end
         end.join(" and ")
       end
-      
+
       def self.equal_pair(key, value)
         if key == :label
           "@id=//label[normalize-space()=#{xpath_string(value)}]/@for"
@@ -76,15 +75,15 @@ module PageObject
           "#{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("_", "-")}"
+          when :text, 'text'
+            'normalize-space()'
+          when :href
+            'normalize-space(@href)'
+          else
+            "@#{key.to_s.gsub("_", "-")}"
         end
       end
 
@@ -104,32 +103,32 @@ module PageObject
         return find_by_mapping[how] => what if find_by_mapping[how]
         return nil => what
       end
-      
+
       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, :index]
       end
-      
-      def self.selenium_mapping 
-        {} 
+
+      def self.selenium_mapping
+        {}
       end
-      
+
       def include_platform_for platform
         if platform[:platform] == :watir
-          require 'page-object/platforms/watir_element'
-          self.class.send :include, PageObject::Platforms::WatirElement
+          require 'page-object/platforms/watir/element'
+          self.class.send :include, PageObject::Platforms::Watir::Element
         elsif platform[:platform] == :selenium
-          require 'page-object/platforms/selenium_element'
-          self.class.send :include, PageObject::Platforms::SeleniumElement
+          require 'page-object/platforms/selenium/element'
+          self.class.send :include, PageObject::Platforms::Selenium::Element
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"          
+          raise ArgumentError, "expect platform to be :watir or :selenium"
         end
       end
     end

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

@@ -5,19 +5,19 @@ module PageObject
         @element = element
         include_platform_for platform
       end
-      
+
       protected
-      
+
       def include_platform_for platform
         super
         if platform[:platform] == :watir
-          require 'page-object/platforms/watir_form'
-          self.class.send :include, PageObject::Platforms::WatirForm
+          require 'page-object/platforms/watir/form'
+          self.class.send :include, PageObject::Platforms::Watir::Form
         elsif platform[:platform] == :selenium
-          require 'page-object/platforms/selenium_form'
-          self.class.send :include, PageObject::Platforms::SeleniumForm
+          require 'page-object/platforms/selenium/form'
+          self.class.send :include, PageObject::Platforms::Selenium::Form
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"          
+          raise ArgumentError, "expect platform to be :watir or :selenium"
         end
       end
     end

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

@@ -1,25 +1,25 @@
 module PageObject
   module Elements
     class HiddenField < Element
-      
+
       def click
         raise "click is not available on hidden field element with Selenium or Watir"
       end
 
       protected
-      
+
       def self.watir_finders
         super + [:tag_name, :text]
       end
-      
+
       def self.watir_mapping
         super.merge({:css => :tag_name})
       end
-      
+
       def self.selenium_finders
         super + [:css]
       end
-      
+
       def self.selenium_mapping
         super.merge({:tag_name => :css})
       end

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

@@ -5,22 +5,22 @@ module PageObject
         @element = element
         include_platform_for platform
       end
-      
+
       protected
-      
+
       def include_platform_for platform
         super
         if platform[:platform] == :watir
-          require 'page-object/platforms/watir_image'
-          self.class.send :include, PageObject::Platforms::WatirImage
+          require 'page-object/platforms/watir/image'
+          self.class.send :include, PageObject::Platforms::Watir::Image
         elsif platform[:platform] == :selenium
-          require 'page-object/platforms/selenium_image'
-          self.class.send :include, PageObject::Platforms::SeleniumImage
+          require 'page-object/platforms/selenium/image'
+          self.class.send :include, PageObject::Platforms::Selenium::Image
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"          
+          raise ArgumentError, "expect platform to be :watir or :selenium"
         end
       end
-  
+
     end
   end
 end

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

@@ -1,26 +1,26 @@
 module PageObject
   module Elements
     class Link < Element
-      
+
       def initialize(element, platform)
         @element = element
         include_platform_for platform
       end
-      
+
       protected
-      
+
       def self.watir_finders
         super + [:href, :text]
       end
-      
+
       def self.watir_mapping
-        super.merge({ :link => :text, :link_text => :text })
+        super.merge({:link => :text, :link_text => :text})
       end
-      
+
       def self.selenium_finders
         super + [:link, :link_text]
       end
-      
+
       def self.selenium_mapping
         super.merge(:text => :link_text)
       end
@@ -28,8 +28,8 @@ module PageObject
       def include_platform_for platform
         super
         if platform[:platform] == :selenium
-          require 'page-object/platforms/selenium_link'
-          self.class.send :include, PageObject::Platforms::SeleniumLink
+          require 'page-object/platforms/selenium/link'
+          self.class.send :include, PageObject::Platforms::Selenium::Link
         end
       end
     end