page-object 0.2.5 → 0.3.0

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

@@ -19,9 +19,9 @@ module PageObject
 
       def include_platform_for platform
         super
-        if platform[:platform] == :selenium
-          require 'page-object/platforms/selenium/button'
-          self.class.send :include, PageObject::Platforms::Selenium::Button
+        if platform[:platform] == :selenium_webdriver
+          require 'page-object/platforms/selenium_webdriver/button'
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::Button
         end
       end
     end

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

@@ -11,14 +11,14 @@ module PageObject
       
       def include_platform_for platform
         super
-        if platform[:platform] == :watir
-          require 'page-object/platforms/watir/check_box'
-          self.class.send :include, PageObject::Platforms::Watir::CheckBox
-        elsif platform[:platform] == :selenium
-          require 'page-object/platforms/selenium/check_box'
-          self.class.send :include, PageObject::Platforms::Selenium::CheckBox
+        if platform[:platform] == :watir_webdriver
+          require 'page-object/platforms/watir_webdriver/check_box'
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::CheckBox
+        elsif platform[:platform] == :selenium_webdriver
+          require 'page-object/platforms/selenium_webdriver/check_box'
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::CheckBox
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"
+          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
     end

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

@@ -3,10 +3,12 @@ module PageObject
     #
     # Contains functionality that is common across all elements.
     #
-    # @see PageObject::Platforms::WatirElement for the Watir version of all common methods
-    # @see PageObject::Platforms::SeleniumElement for the Selenium version of all common methods
+    # @see PageObject::Platforms::WatirWebDriver::Element for the Watir version of all common methods
+    # @see PageObject::Platforms::SeleniumWebDriver::Element for the Selenium version of all common methods
     #
     class Element
+      include Object::PageObject::NestedElements
+      
       attr_reader :element
 
       def initialize(element, platform)
@@ -124,7 +126,7 @@ module PageObject
       end
 
       def self.selenium_finders
-        [:class, :id, :name, :xpath, :index]
+        [:class, :id, :index, :name, :xpath]
       end
 
       def self.selenium_mapping
@@ -132,14 +134,18 @@ module PageObject
       end
 
       def include_platform_for platform
-        if platform[:platform] == :watir
-          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::Selenium::Element
+        if platform[:platform] == :watir_webdriver
+          require 'page-object/platforms/watir_webdriver/element'
+          require 'page-object/platforms/watir_webdriver/page_object'
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::Element
+          @platform = PageObject::Platforms::WatirWebDriver::PageObject.new(@element)
+        elsif platform[:platform] == :selenium_webdriver
+          require 'page-object/platforms/selenium_webdriver/element'
+          require 'page-object/platforms/selenium_webdriver/page_object'
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::Element
+          @platform = PageObject::Platforms::SeleniumWebDriver::PageObject.new(@element)
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"
+          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
     end

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

@@ -10,14 +10,14 @@ module PageObject
 
       def include_platform_for platform
         super
-        if platform[:platform] == :watir
-          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::Selenium::Form
+        if platform[:platform] == :watir_webdriver
+          require 'page-object/platforms/watir_webdriver/form'
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::Form
+        elsif platform[:platform] == :selenium_webdriver
+          require 'page-object/platforms/selenium_webdriver/form'
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::Form
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"
+          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
     end

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

@@ -10,14 +10,14 @@ module PageObject
 
       def include_platform_for platform
         super
-        if platform[:platform] == :watir
-          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::Selenium::Image
+        if platform[:platform] == :watir_webdriver
+          require 'page-object/platforms/watir_webdriver/image'
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::Image
+        elsif platform[:platform] == :selenium_webdriver
+          require 'page-object/platforms/selenium_webdriver/image'
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::Image
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"
+          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
 

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

@@ -27,9 +27,9 @@ module PageObject
 
       def include_platform_for platform
         super
-        if platform[:platform] == :selenium
-          require 'page-object/platforms/selenium/link'
-          self.class.send :include, PageObject::Platforms::Selenium::Link
+        if platform[:platform] == :selenium_webdriver
+          require 'page-object/platforms/selenium_webdriver/link'
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::Link
         end
       end
     end

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

@@ -31,14 +31,14 @@ module PageObject
 
       def include_platform_for platform
         super
-        if platform[:platform] == :watir
-          require 'page-object/platforms/watir/ordered_list'
-          self.class.send :include, PageObject::Platforms::Watir::OrderedList
-        elsif platform[:platform] == :selenium
-          require 'page-object/platforms/selenium/ordered_list'
-          self.class.send :include, PageObject::Platforms::Selenium::OrderedList
+        if platform[:platform] == :watir_webdriver
+          require 'page-object/platforms/watir_webdriver/ordered_list'
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::OrderedList
+        elsif platform[:platform] == :selenium_webdriver
+          require 'page-object/platforms/selenium_webdriver/ordered_list'
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::OrderedList
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"
+          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
 

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

@@ -11,14 +11,14 @@ module PageObject
       
       def include_platform_for platform
         super
-        if platform[:platform] == :watir
-          require 'page-object/platforms/watir/radio_button'
-          self.class.send :include, PageObject::Platforms::Watir::RadioButton
-        elsif platform[:platform] == :selenium
-          require 'page-object/platforms/selenium/radio_button'
-          self.class.send :include, PageObject::Platforms::Selenium::RadioButton
+        if platform[:platform] == :watir_webdriver
+          require 'page-object/platforms/watir_webdriver/radio_button'
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::RadioButton
+        elsif platform[:platform] == :selenium_webdriver
+          require 'page-object/platforms/selenium_webdriver/radio_button'
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::RadioButton
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"
+          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
     end

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

@@ -19,14 +19,14 @@ module PageObject
 
       def include_platform_for platform
         super
-        if platform[:platform] == :watir
-          require 'page-object/platforms/watir/select_list'
-          self.class.send :include, PageObject::Platforms::Watir::SelectList
-        elsif platform[:platform] == :selenium
-          require 'page-object/platforms/selenium/select_list'
-          self.class.send :include, PageObject::Platforms::Selenium::SelectList
+        if platform[:platform] == :watir_webdriver
+          require 'page-object/platforms/watir_webdriver/select_list'
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::SelectList
+        elsif platform[:platform] == :selenium_webdriver
+          require 'page-object/platforms/selenium_webdriver/select_list'
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::SelectList
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"
+          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
 

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

@@ -27,14 +27,14 @@ module PageObject
 
       def include_platform_for platform
         super
-        if platform[:platform] == :watir
-          require 'page-object/platforms/watir/table'
-          self.class.send :include, PageObject::Platforms::Watir::Table
-        elsif platform[:platform] == :selenium
-          require 'page-object/platforms/selenium/table'
-          self.class.send :include, PageObject::Platforms::Selenium::Table
+        if platform[:platform] == :watir_webdriver
+          require 'page-object/platforms/watir_webdriver/table'
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::Table
+        elsif platform[:platform] == :selenium_webdriver
+          require 'page-object/platforms/selenium_webdriver/table'
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::Table
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"
+          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
     end

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

@@ -27,14 +27,14 @@ module PageObject
 
       def include_platform_for platform
         super
-        if platform[:platform] == :watir
-          require 'page-object/platforms/watir/table_row'
-          self.class.send :include, PageObject::Platforms::Watir::TableRow
-        elsif platform[:platform] == :selenium
-          require 'page-object/platforms/selenium/table_row'
-          self.class.send :include, PageObject::Platforms::Selenium::TableRow
+        if platform[:platform] == :watir_webdriver
+          require 'page-object/platforms/watir_webdriver/table_row'
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::TableRow
+        elsif platform[:platform] == :selenium_webdriver
+          require 'page-object/platforms/selenium_webdriver/table_row'
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::TableRow
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"
+          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
     end

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

@@ -27,14 +27,14 @@ module PageObject
 
       def include_platform_for platform
         super
-        if platform[:platform] == :watir
-          require 'page-object/platforms/watir/text_area'
-          self.class.send :include, PageObject::Platforms::Watir::TextArea
-        elsif platform[:platform] == :selenium
-          require 'page-object/platforms/selenium/text_area'
-          self.class.send :include, PageObject::Platforms::Selenium::TextArea
+        if platform[:platform] == :watir_webdriver
+          require 'page-object/platforms/watir_webdriver/text_area'
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::TextArea
+        elsif platform[:platform] == :selenium_webdriver
+          require 'page-object/platforms/selenium_webdriver/text_area'
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::TextArea
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"
+          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
     end

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

@@ -27,14 +27,14 @@ module PageObject
 
       def include_platform_for platform
         super
-        if platform[:platform] == :watir
-          require 'page-object/platforms/watir/text_field'
-          self.class.send :include, PageObject::Platforms::Watir::TextField
-        elsif platform[:platform] == :selenium
-          require 'page-object/platforms/selenium/text_field'
-          self.class.send :include, PageObject::Platforms::Selenium::TextField
+        if platform[:platform] == :watir_webdriver
+          require 'page-object/platforms/watir_webdriver/text_field'
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::TextField
+        elsif platform[:platform] == :selenium_webdriver
+          require 'page-object/platforms/selenium_webdriver/text_field'
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::TextField
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"
+          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
     end

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

@@ -32,14 +32,14 @@ module PageObject
 
       def include_platform_for platform
         super
-        if platform[:platform] == :watir
-          require 'page-object/platforms/watir/unordered_list'
-          self.class.send :include, PageObject::Platforms::Watir::UnorderedList
-        elsif platform[:platform] == :selenium
-          require 'page-object/platforms/selenium/unordered_list'
-          self.class.send :include, PageObject::Platforms::Selenium::UnorderedList
+        if platform[:platform] == :watir_webdriver
+          require 'page-object/platforms/watir_webdriver/unordered_list'
+          self.class.send :include, PageObject::Platforms::WatirWebDriver::UnorderedList
+        elsif platform[:platform] == :selenium_webdriver
+          require 'page-object/platforms/selenium_webdriver/unordered_list'
+          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::UnorderedList
         else
-          raise ArgumentError, "expect platform to be :watir or :selenium"
+          raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end
       end
 

data/lib/page-object/nested_elements.rb

@@ -0,0 +1,72 @@
+module PageObject
+  module NestedElements
+
+    def link_element(identifier={:index => 0})
+      @platform.link_for(identifier)
+    end
+
+    def button_element(identifier={:index => 0})
+      @platform.button_for(identifier)
+    end
+
+    def text_field_element(identifier={:index => 0})
+      @platform.text_field_for(identifier)
+    end
+
+    def hidden_field_element(identifier={:index => 0})
+      @platform.hidden_field_for(identifier)
+    end
+
+    def text_area_element(identifier={:index => 0})
+      @platform.text_area_for(identifier)
+    end
+
+    def select_list_element(identifier={:index => 0})
+      @platform.select_list_for(identifier)
+    end
+
+    def checkbox_element(identifier={:index => 0})
+      @platform.checkbox_for(identifier)
+    end
+
+    def radio_button_element(identifier={:index => 0})
+      @platform.radio_button_for(identifier)
+    end
+
+    def div_element(identifier={:index => 0})
+      @platform.div_for(identifier)
+    end
+
+    def span_element(identifier={:index => 0})
+      @platform.span_for(identifier)
+    end
+
+    def table_element(identifier={:index => 0})
+      @platform.table_for(identifier)
+    end
+    
+    def cell_element(identifier={:index => 0})
+      @platform.cell_for(identifier)
+    end
+    
+    def image_element(identifier={:index => 0})
+      @platform.image_for(identifier)
+    end
+    
+    def form_element(identifier={:index => 0})
+      @platform.form_for(identifier)
+    end
+    
+    def ordered_list_element(identifier={:index => 0})
+      @platform.ordered_list_for(identifier)
+    end
+    
+    def unordered_list_element(identifier={:index => 0})
+      @platform.unordered_list_for(identifier)
+    end
+    
+    def list_item_element(identifier={:index => 0})
+      @platform.list_item_for(identifier)
+    end
+  end
+end

data/lib/page-object/platforms.rb

@@ -13,6 +13,6 @@ module PageObject
     end
   end
 end
-require 'page-object/platforms/watir'
-require 'page-object/platforms/selenium'
+require 'page-object/platforms/watir_webdriver'
+require 'page-object/platforms/selenium_webdriver'
 

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

@@ -0,0 +1,17 @@
+module PageObject
+  module Platforms
+    module SeleniumWebDriver
+
+      def self.create_page_object(browser)
+        require 'page-object/platforms/selenium_webdriver/page_object'
+        SeleniumWebDriver::PageObject.new(browser)
+      end
+
+      def self.is_for?(browser)
+        browser.is_a? Object::Selenium::WebDriver::Driver
+      end
+    end
+  end
+end
+
+PageObject::Platforms.register(:selenium_webdriver, PageObject::Platforms::SeleniumWebDriver)

data/lib/page-object/platforms/{selenium → selenium_webdriver}/button.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Selenium
+    module SeleniumWebDriver
       module Button
         #
         # Override PageObject::PLatforms::SeleniumElement#text because

data/lib/page-object/platforms/{selenium → selenium_webdriver}/check_box.rb

@@ -1,6 +1,6 @@
 module PageObject
   module Platforms
-    module Selenium
+    module SeleniumWebDriver
       module CheckBox
 
         #