page-object 1.1.0 → 1.1.1

data/lib/page-object/elements.rb

@@ -20,7 +20,7 @@ module PageObject
         return type_to_class[type.to_sym] if type
         tag_to_class[tag_name.to_sym] || ::PageObject::Elements::Element
       end
-      
+
     end
   end
 end
@@ -56,5 +56,6 @@ require 'page-object/elements/media'
 require 'page-object/elements/audio'
 require 'page-object/elements/video'
 require 'page-object/elements/bold'
+require 'page-object/elements/italic'
 
 

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

@@ -10,7 +10,7 @@ module PageObject
     #
     class Element
       include ::PageObject::NestedElements
-      
+
       attr_reader :element
 
       def initialize(element, platform)
@@ -40,14 +40,14 @@ module PageObject
       def disabled?
         not enabled?
       end
-      
+
       #
       # get the value of the given CSS property
       #
       def style(property)
         element.style property
       end
-      
+
       def inspect
         element.inspect
       end
@@ -97,7 +97,7 @@ module PageObject
           return how, what
         end
       end
-      
+
       # @private
       # delegate calls to driver element
       def method_missing(*args, &block)
@@ -118,7 +118,7 @@ module PageObject
       protected
 
       def self.should_build_watir_xpath identifier
-        ['table', 'span', 'div', 'td', 'li', 'ul', 'ol', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'label', 'area', 'canvas', 'audio', 'video', 'b'].include? identifier[:tag_name] and identifier[:name]
+        ['table', 'span', 'div', 'td', 'li', 'ul', 'ol', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'label', 'area', 'canvas', 'audio', 'video', 'b', 'i'].include? identifier[:tag_name] and identifier[:name]
       end
 
       def self.build_xpath_for identifier

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

@@ -0,0 +1,11 @@
+module PageObject
+  module Elements
+    class Italic < Element
+
+    end
+
+    ::PageObject::Elements.tag_to_class[:i] = ::PageObject::Elements::Italic
+
+
+  end
+end

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

@@ -23,7 +23,7 @@ module PageObject
       protected
 
       def child_xpath
-        ".//child::li"
+        "./child::li"
       end
 
       def self.watir_finders

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

@@ -24,7 +24,7 @@ module PageObject
       protected
 
       def child_xpath
-        ".//child::li"
+        "./child::li"
       end
 
       def self.watir_finders

data/lib/page-object/locator_generator.rb

@@ -83,6 +83,7 @@ module PageObject
                          :span,
                          :table,
                          :cell,
+                         :row,
                          :image,
                          :form,
                          :list_item,
@@ -102,6 +103,7 @@ module PageObject
                          :audio,
                          :video,
                          :b,
+                         :i,
                          :svg]
 
     def self.generate_locators(target)

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

@@ -280,6 +280,43 @@ module PageObject
           element.location_once_scrolled_into_view
         end
 
+        #
+        # location of element (x, y)
+        #
+        def location
+          element.location
+        end
+
+        #
+        # size of element (width, height)
+        #
+        def size
+          element.size
+        end
+
+        #
+        # Get height of element
+        #
+        def height
+          element.size['height']
+        end
+
+        #
+        # Get width of element
+        #
+        def width
+          element.size['width']
+        end
+
+        #
+        # Get centre coordinates of element
+        #
+        def centre
+          location = element.location
+          size = element.size
+          {'y' => (location['y'] + (size['height']/2)), 'x' => (location['x'] + (size['width']/2))}
+        end
+
         private
 
         def bridge

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

@@ -10,7 +10,7 @@ module PageObject
         # @return [PageObject::Elements::ListItem]
         #
         def [](idx)
-          children[idx]
+          Object::PageObject::Elements::ListItem.new(children[idx], :platform => :selenium_webdriver)
         end
 
         #
@@ -20,16 +20,18 @@ module PageObject
           children.size
         end
 
-        private
-
-        def children
-          items = list_items.map do |item|
-            ::PageObject::Elements::ListItem.new(item, :platform => :selenium_webdriver)
+        #
+        # Return the ListItem objects that are children of the OrderedList
+        #
+        def list_items
+          children.collect do |obj|
+            Object::PageObject::Elements::ListItem.new(obj, :platform => :selenium_webdriver)
           end
-          items.find_all { |item| item.parent.element == element }
         end
 
-        def list_items
+        private
+
+        def children
           element.find_elements(:xpath, child_xpath)
         end
 

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

@@ -575,6 +575,31 @@ module PageObject
           find_selenium_elements(identifier, Elements::TableCell, 'td')
         end
 
+        #
+        # platform method to retrieve the text from a table row
+        # See PageObject::Accessors#row
+        #
+        def row_text_for(identifier)
+          process_selenium_call(identifier, Elements::TableRow, 'tr') do |how, what|
+            @browser.find_element(how, what).text
+          end
+        end
+
+        #
+        # platform method to retrieve a table row element
+        # See PageObject::Accessors#row
+        #
+        def row_for(identifier)
+          find_selenium_element(identifier, Elements::TableRow, 'tr')
+        end
+
+        #
+        # platform method to retrieve all table row elements
+        #
+        def rows_for(identifier)
+          find_selenium_elements(identifier, Elements::TableRow, 'tr')
+        end
+
         #
         # platform method to retrieve an image element
         # See PageObject::Accessors#image
@@ -1030,7 +1055,7 @@ module PageObject
         end
 
         #
-        # platform method to retrieve the h1 element
+        # platform method to retrieve the b element
         # See PageObject::Accessors#b
         #
         def b_for(identifier)
@@ -1044,6 +1069,31 @@ module PageObject
           find_selenium_elements(identifier, Elements::Bold, 'b')
         end
 
+        #
+        # platform method to retrieve the text from a i
+        # See PageObject::Accessors#i
+        #
+        def i_text_for(identifier)
+          process_selenium_call(identifier, Elements::Italic, 'i') do |how, what|
+            @browser.find_element(how, what).text
+          end
+        end
+
+        #
+        # platform method to retrieve the i element
+        # See PageObject::Accessors#i
+        #
+        def i_for(identifier)
+          find_selenium_element(identifier, Elements::Italic, 'i')
+        end
+
+        #
+        # platform method to retrieve all i elements
+        #
+        def is_for(identifier)
+          find_selenium_elements(identifier, Elements::Italic, 'i')
+        end
+
         private
 
         def process_selenium_call(identifier, type, tag, other=nil)

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

@@ -10,7 +10,7 @@ module PageObject
         # @return [PageObject::Elements::ListItem]
         #
         def [](idx)
-          children[idx]
+          Object::PageObject::Elements::ListItem.new(children[idx], :platform => :selenium_webdriver)
         end
 
         #
@@ -20,19 +20,17 @@ module PageObject
           children.size
         end
 
-        private
-
-        def children
-          items = list_items.map do |item|
-            ::PageObject::Elements::ListItem.new(item, :platform => :selenium_webdriver)
+        def list_items
+          children.collect do |obj|
+            Object::PageObject::Elements::ListItem.new(obj, :platform => :selenium_webdriver)
           end
-          items.find_all { |item| item.parent.element == element }
         end
 
-        def list_items
+        private
+
+        def children
           element.find_elements(:xpath, child_xpath)
         end
-
       end
     end
   end

data/lib/page-object/platforms/watir_webdriver/element.rb

@@ -150,7 +150,14 @@ module PageObject
         def select_text(text)
           element.select_text text
         end
-        
+
+        #
+        # Right click on an element
+        #
+        def right_click
+          element.right_click
+        end
+
         #
         # Waits until the element is present
         #
@@ -243,6 +250,43 @@ module PageObject
         def scroll_into_view
           element.wd.location_once_scrolled_into_view
         end
+
+        #
+        # location of element (x, y)
+        #
+        def location
+          element.wd.location
+        end
+
+        #
+        # size of element (width, height)
+        #
+        def size
+          element.wd.size
+        end
+
+        #
+        # Get height of element
+        #
+        def height
+          element.wd.size['height']
+        end
+
+        #
+        # Get width of element
+        #
+        def width
+          element.wd.size['width']
+        end
+
+        #
+        # Get centre coordinates of element
+        #
+        def centre
+          location = element.wd.location
+          size = element.wd.size
+          {'y' => (location['y'] + (size['height']/2)), 'x' => (location['x'] + (size['width']/2))}
+        end
       end
     end
   end

data/lib/page-object/platforms/watir_webdriver/ordered_list.rb

@@ -20,13 +20,18 @@ module PageObject
           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_webdriver)
+          end
+        end
+
         private
 
         def children
-          list_items.find_all { |item| item.parent == element }
-        end
-
-        def list_items
           element.ols(:xpath => child_xpath)
         end
       end

data/lib/page-object/platforms/watir_webdriver/page_object.rb

@@ -25,7 +25,7 @@ module PageObject
         def navigate_to(url)
           @browser.goto url
         end
-        
+
         #
         # platform method to get the current url
         # See PageObject#current_url
@@ -118,7 +118,7 @@ module PageObject
         def execute_script(script, *args)
           @browser.execute_script(script, *args)
         end
-    
+
         #
         # platform method to handle attaching to a running window
         # See PageObject#attach_to_window
@@ -132,7 +132,7 @@ module PageObject
           element = browser.execute_script("return document.activeElement")
           type = element.type.to_sym if element.tag_name.to_sym == :input
           cls = ::PageObject::Elements.element_class_for(element.tag_name, type)
-          cls.new(element, :platform => :watir_webdriver)    
+          cls.new(element, :platform => :watir_webdriver)
         end
 
         #
@@ -144,7 +144,7 @@ module PageObject
           frame << {frame: identifier}
           block.call(frame)
         end
-    
+
         #
         # platform method to switch to an iframe and execute a block
         # See PageObject#in_frame
@@ -154,7 +154,7 @@ module PageObject
           frame << {iframe: identifier}
           block.call(frame)
         end
-    
+
         #
         # platform method to refresh the page
         # See PageObject#refresh
@@ -162,7 +162,7 @@ module PageObject
         def refresh
           @browser.refresh
         end
-    
+
         #
         # platform method to go back to the previous page
         # See PageObject#back
@@ -170,7 +170,7 @@ module PageObject
         def back
           @browser.back
         end
-    
+
         #
         # platform method to go forward to the next page
         # See PageObject#forward
@@ -178,7 +178,7 @@ module PageObject
         def forward
           @browser.forward
         end
-        
+
         #
         # platform method to clear the cookies from the browser
         # See PageObject#clear_cookies
@@ -210,7 +210,7 @@ module PageObject
         def text_field_value_set(identifier, value)
           process_watir_call("text_field(identifier).set(value)", Elements::TextField, identifier, value)
         end
-    
+
         #
         # platform method to retrieve a text field element
         # See PageObject::Accessors#text_field
@@ -320,7 +320,7 @@ module PageObject
         # See PageObject::Accessors#link
         #
         def click_link_for(identifier)
-          call = call_for_watir_element(identifier, "link(identifier)")
+          call = "link(identifier)"
           process_watir_call("#{call}.click if identifier", Elements::Link, identifier)
         end
 
@@ -329,7 +329,7 @@ module PageObject
         # see PageObject::Accessors#link
         #
         def link_for(identifier)
-          call = call_for_watir_element(identifier, "link(identifier)")
+          call = "link(identifier)"
           find_watir_element(call, Elements::Link, identifier)
         end
 
@@ -337,7 +337,7 @@ module PageObject
         # platform method to retrieve an array of link elements
         #
         def links_for(identifier)
-          call = call_for_watir_elements(identifier, "links(identifier)")
+          call = "links(identifier)"
           find_watir_elements(call, Elements::Link, identifier)
         end
 
@@ -462,7 +462,7 @@ module PageObject
         # See PageObject::Accessors#button
         #
         def click_button_for(identifier)
-          call = call_for_watir_element(identifier, "button(identifier)")
+          call = "button(identifier)"
           process_watir_call("#{call}.click", Elements::Button, identifier)
         end
 
@@ -471,7 +471,7 @@ module PageObject
         # See PageObject::Accessors#button
         #
         def button_for(identifier)
-          call = call_for_watir_element(identifier, "button(identifier)")
+          call = "button(identifier)"
           find_watir_element(call, Elements::Button, identifier)
         end
 
@@ -479,7 +479,7 @@ module PageObject
         # platform method to retrieve an array of button elements
         #
         def buttons_for(identifier)
-          call = call_for_watir_elements(identifier, "buttons(identifier)")
+          call = "buttons(identifier)"
           find_watir_elements(call, Elements::Button, identifier)
         end
 
@@ -530,6 +530,30 @@ module PageObject
           find_watir_elements("tds(identifier)", Elements::TableCell, identifier, 'td')
         end
 
+        #
+        # platform method to retrieve the text from a table row
+        # See PageObject::Accessors#row
+        #
+        def row_text_for(identifier)
+          process_watir_call("tr(identifier).text", Elements::TableRow, identifier,
+                             nil, 'tr')
+        end
+
+        #
+        # platform method to retrieve a table row element
+        # See PageObject::Accessors#row
+        #
+        def row_for(identifier)
+          find_watir_element("tr(identifier)", Elements::TableRow, identifier, 'tr')
+        end
+
+        #
+        # platform method to retrieve an array of table row elements
+        #
+        def rows_for(identifier)
+          find_watir_elements("trs(identifier)", Elements::TableRow, identifier, 'tr')
+        end
+
         #
         # platform method to retrieve an image element
         # See PageObject::Accessors#image
@@ -621,7 +645,7 @@ module PageObject
         def ordered_list_for(identifier)
           find_watir_element("ol(identifier)", Elements::OrderedList, identifier, 'ol')
         end
-        
+
         #
         # platform method to retrieve an array of ordered lists
         #
@@ -636,14 +660,14 @@ module PageObject
         def h1_text_for(identifier)
           process_watir_call("h1(identifier).text", Elements::Heading, identifier, nil, 'h1')
         end
-        
+
         #
         # platform method to retrieve the h1 element
         # See PageObject::Accessors#h1
         #
         def h1_for(identifier)
           find_watir_element("h1(identifier)", Elements::Heading, identifier, 'h1')
-        end  
+        end
 
         #
         # platform method to retrieve an array of h1s
@@ -659,14 +683,14 @@ module PageObject
         def h2_text_for(identifier)
           process_watir_call("h2(identifier).text", Elements::Heading, identifier, nil, 'h2')
         end
-        
+
         #
         # platform method to retrieve the h2 element
         # See PageObject::Accessors#h2
         #
         def h2_for(identifier)
           find_watir_element("h2(identifier)", Elements::Heading, identifier, 'h2')
-        end  
+        end
 
         #
         # platform method to retrieve an array of h2s
@@ -682,14 +706,14 @@ module PageObject
         def h3_text_for(identifier)
           process_watir_call("h3(identifier).text", Elements::Heading, identifier, nil, 'h3')
         end
-        
+
         #
         # platform method to retrieve the h3 element
         # See PageObject::Accessors#h3
         #
         def h3_for(identifier)
           find_watir_element("h3(identifier)", Elements::Heading, identifier, 'h3')
-        end  
+        end
 
         #
         # platform method to retrieve an array of h3s
@@ -705,14 +729,14 @@ module PageObject
         def h4_text_for(identifier)
           process_watir_call("h4(identifier).text", Elements::Heading, identifier, nil, 'h4')
         end
-        
+
         #
         # platform method to retrieve the h4 element
         # See PageObject::Accessors#h4
         #
         def h4_for(identifier)
           find_watir_element("h4(identifier)", Elements::Heading, identifier, 'h4')
-        end  
+        end
 
         #
         # platform method to retrieve an array of h4s
@@ -728,14 +752,14 @@ module PageObject
         def h5_text_for(identifier)
           process_watir_call("h5(identifier).text", Elements::Heading, identifier, nil, 'h5')
         end
-        
+
         #
         # platform method to retrieve the h5 element
         # See PageObject::Accessors#h5
         #
         def h5_for(identifier)
           find_watir_element("h5(identifier)", Elements::Heading, identifier, 'h5')
-        end  
+        end
 
         #
         # platform method to retrieve an array of h5s
@@ -751,14 +775,14 @@ module PageObject
         def h6_text_for(identifier)
           process_watir_call("h6(identifier).text", Elements::Heading, identifier, nil, 'h6')
         end
-        
+
         #
         # platform method to retrieve the h6 element
         # See PageObject::Accessors#h6
         #
         def h6_for(identifier)
           find_watir_element("h6(identifier)", Elements::Heading, identifier, 'h6')
-        end  
+        end
 
         #
         # platform method to retrieve an array of h6s
@@ -774,7 +798,7 @@ module PageObject
         def paragraph_text_for(identifier)
           process_watir_call("p(identifier).text", Elements::Paragraph, identifier, nil, 'p')
         end
-        
+
         #
         # platform method to retrieve the paragraph element
         # See PageObject::Accessors#paragraph
@@ -939,7 +963,7 @@ module PageObject
         def svg_for(identifier)
           find_watir_element("element(identifier)", Elements::Element, identifier)
         end
- 
+
         #
         # platform method to return an array of svg elements
         #
@@ -957,7 +981,7 @@ module PageObject
 
         #
         # platform method to retrieve the b element
-        # See PageObject::Accessors#h1
+        # See PageObject::Accessors#b
         #
         def b_for(identifier)
           find_watir_element("b(identifier)", Elements::Bold, identifier, 'b')
@@ -969,7 +993,30 @@ module PageObject
         def bs_for(identifier)
           find_watir_elements("bs(identifier)", Elements::Bold, identifier, 'b')
         end
- 
+
+        #
+        # platform method to retrieve the text for a i
+        # See PageObject::Accessors#i
+        #
+        def i_text_for(identifier)
+          process_watir_call("i(identifier).text", Elements::Italic, identifier, nil, 'i')
+        end
+
+        #
+        # platform method to retrieve the i element
+        # See PageObject::Accessors#i
+        #
+        def i_for(identifier)
+          find_watir_element("i(identifier)", Elements::Italic, identifier, 'i')
+        end
+
+        #
+        # platform method to retrieve an array of is
+        #
+        def is_for(identifier)
+          find_watir_elements("is(identifier)", Elements::Italic, identifier, 'i')
+        end
+
         private
 
         def find_watir_elements(the_call, type, identifier, tag_name=nil)
@@ -1040,23 +1087,7 @@ module PageObject
         end
 
         def switch_to_default_content(frame_identifiers)
-          @browser.wd.switch_to.default_content unless frame_identifiers.nil?          
-        end
-
-        def css_element
-          "element(identifier)"
-        end
-
-        def css_elements
-          "elements(identifier)"
-        end
-
-        def call_for_watir_element(identifier, call)
-          identifier[:css] ? "#{css_element}" : call
-        end
-
-        def call_for_watir_elements(identifier, call)
-          identifier[:css] ? "#{css_elements}" : call          
+          @browser.wd.switch_to.default_content unless frame_identifiers.nil?
         end
 
         def switch_to_frame(frame_identifiers)
@@ -1066,7 +1097,7 @@ module PageObject
               value = frame_id.values.first
               @browser.wd.switch_to.frame(value)
             end
-          end          
+          end
         end
       end
     end