lib/page-object/elements/element.rb in page-object-2.2.2 vs lib/page-object/elements/element.rb in page-object-2.2.3

@@ -1,7 +1,6 @@
 require 'page-object/nested_elements'
-require 'watir/extensions/select_text'
 
 module PageObject
   module Elements
     #
     # Contains functionality that is common across all elements.
@@ -68,16 +67,66 @@
       #
       # find the parent element
       #
       def parent(opt = {})
         parent = element.parent(opt)
-        type = element.type if parent.tag_name.to_sym == :input
-        cls = ::PageObject::Elements.element_class_for(parent.tag_name, type)
-        cls.new(parent.to_subtype)
+        pageobject_wrapper(parent)
       end
 
       #
+      # Return the element that exists at the same level of the DOM
+      # immediately prior to this element
+      #
+      def preceding_sibling(opt = {})
+        sibling = element.preceding_sibling(opt)
+        pageobject_wrapper(sibling)
+      end
+
+      #
+      # Return the element that exists at the same level of the DOM
+      # immediately after this element
+      #
+      def following_sibling(opt={})
+        sibling = element.following_sibling(opt)
+        pageobject_wrapper(sibling)
+      end
+
+      #
+      # Return all elements that are direct children of this element's parent
+      #
+      def siblings(opt={})
+        siblings = element.siblings(opt)
+        siblings.collect {|sibling| pageobject_wrapper(sibling)}
+      end
+
+      #
+      # Return all elements that are children of this element
+      #
+      def children(opt={})
+        children = element.children(opt)
+        children.collect {|child| pageobject_wrapper(child)}
+      end
+
+      #
+      # Return all elements that exist at the same level of the DOM
+      # immediately prior to this element
+      #
+      def preceding_siblings(opt={})
+        siblings = element.preceding_siblings(opt)
+        siblings.collect {|sibling| pageobject_wrapper(sibling)}
+      end
+
+      #
+      # Return all elements that exist at the same level of the DOM
+      # immediately after this element
+      #
+      def following_siblings(opt={})
+        siblings = element.following_siblings(opt)
+        siblings.collect {|sibling| pageobject_wrapper(sibling)}
+      end
+
+      #
       # Waits until the element is present
       #
       # @param [Integer] (defaults to: 5) seconds to wait before timing out
       #
       def when_present(timeout=::PageObject.default_element_wait)
@@ -138,9 +187,17 @@
         element.send m, *args, &block
       end
 
       def respond_to_missing?(m,*args)
         element.respond_to?(m) || super
+      end
+
+      protected
+
+      def pageobject_wrapper(watir_object)
+        type = element.type if watir_object.tag_name.to_sym == :input
+        cls = ::PageObject::Elements.element_class_for(watir_object.tag_name, type)
+        cls.new(watir_object.to_subtype)
       end
 
       private
 
       def timed_loop(timeout)