page-object 0.6.3 → 0.6.4

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

@@ -11,7 +11,7 @@ module PageObject
       protected
 
       def self.watir_finders
-        super + [:href, :text]
+        super + [:href, :text, :css]
       end
 
       def self.watir_mapping
@@ -19,7 +19,7 @@ module PageObject
       end
 
       def self.selenium_finders
-        super + [:link, :link_text]
+        super + [:link, :link_text, :css]
       end
 
       def self.selenium_mapping

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

@@ -9,7 +9,7 @@ module PageObject
       end
 
       def append(text)
-        @element.send_keys text
+        element.send_keys text
       end
 
       protected

data/lib/page-object/nested_elements.rb

@@ -193,6 +193,14 @@ module PageObject
       @platform.paragraphs_for(identifier)
     end
 
+    def label_element(identifier={:index => 0})
+      @platform.label_for(identifier)
+    end
+
+    def label_elements(identifier={:index => 0})
+      @platform.labels_for(identifier)
+    end
+
     def file_field_element(identifier={:index => 0})
       @platform.file_field_for(identifier)
     end

data/lib/page-object/page_factory.rb

@@ -43,6 +43,9 @@ module PageObject
       on_page page_class, true, &block
     end
 
+    # Support 'visit' for readability of usage
+    alias_method :visit, :visit_page
+
     #
     # Create a page object.
     #
@@ -57,6 +60,9 @@ module PageObject
       @current_page
     end
 
+    # Support 'on' for readability of usage
+    alias_method :on, :on_page
+
     #
     # Navigate to a specific page following a predefined path.
     #

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

@@ -13,14 +13,14 @@ module PageObject
         # return true if an element is visible
         #
         def visible?
-          @element.displayed?
+          element.displayed?
         end
 
         #
         # return true if an element exists
         #
         def exists?
-          not @element.nil?
+          not element.nil?
         end
 
         #
@@ -29,7 +29,7 @@ module PageObject
         # @return [String]
         #
         def text
-          @element.text
+          element.text
         end
 
         #
@@ -38,14 +38,14 @@ module PageObject
         # @return [String]
         #
         def value
-          @element.attribute('value')
+          element.attribute('value')
         end
 
         #
         # compare this element to another to determine if they are equal
         #
         def ==(other)
-          @element == other.element
+          element == other.element
         end
 
         #
@@ -54,7 +54,7 @@ module PageObject
         # @return [String]
         #
         def tag_name
-          @element.tag_name
+          element.tag_name
         end
 
         #
@@ -88,7 +88,7 @@ module PageObject
         #   attribute value
         #
         def attribute(attribute_name)
-          @element.attribute attribute_name
+          element.attribute attribute_name
         end
 
         #
@@ -97,8 +97,8 @@ module PageObject
         def fire_event(event_name)
           event_name = event_name.to_s.sub(/^on/, '').downcase
           script = "return (%s).apply(null, arguments)" % ATOMS.fetch(:fireEvent)
-          bridge = @element.instance_variable_get(:@bridge)
-          bridge.executeScript(script, @element, event_name)
+          bridge = element.instance_variable_get(:@bridge)
+          bridge.executeScript(script, element, event_name)
         end
 
         #
@@ -106,9 +106,9 @@ module PageObject
         #
         def parent
           script = "return (%s).apply(null, arguments)" % ATOMS.fetch(:getParentElement)
-          bridge = @element.instance_variable_get(:@bridge)
-          parent = bridge.executeScript(script, @element)
-          type = @element.type if parent.tag_name.to_sym == :input
+          bridge = element.instance_variable_get(:@bridge)
+          parent = bridge.executeScript(script, element)
+          type = element.attribute(:type).to_s.downcase if parent.tag_name.to_sym == :input
           cls = ::PageObject::Elements.element_class_for(parent.tag_name, type)
           cls.new(parent, :platform => :selenium_webdriver)
         end
@@ -117,15 +117,15 @@ module PageObject
         # Set the focus to the current element
         #
         def focus
-          bridge = @element.instance_variable_get(:@bridge)
-          bridge.executeScript("return arguments[0].focus()", @element)
+          bridge = element.instance_variable_get(:@bridge)
+          bridge.executeScript("return arguments[0].focus()", element)
         end
 
         #
         # Click this element
         #
         def right_click
-          @element.context_click
+          element.context_click
         end
 
         #
@@ -193,14 +193,14 @@ module PageObject
         # @see Selenium::WebDriver::Keys::KEYS
         #
         def send_keys(*args)
-          @element.send_keys(*args)
+          element.send_keys(*args)
         end
          
         #
         # clear the contents of the element
         #
         def clear
-          @element.clear
+          element.clear
         end
       end
     end

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

@@ -7,10 +7,10 @@ module PageObject
         # Submit the form.
         #
         def submit
-          @element.submit
+          element.submit
         end
 
       end
     end
   end
-end
+end

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

@@ -20,9 +20,9 @@ module PageObject
         private
 
         def dimension
-          @element.size
+          element.size
         end
       end
     end
   end
-end
+end

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

@@ -121,6 +121,16 @@ module PageObject
           end
         end
 
+        #
+        # find the element that has focus
+        #
+        def element_with_focus
+          element = @browser.execute_script("return document.activeElement")
+          type = element.attribute(:type).to_s.downcase if element.tag_name.to_sym == :input
+          cls = ::PageObject::Elements.element_class_for(element.tag_name, type)
+          cls.new(element, :platform => :selenium_webdriver)
+        end
+
         #
         # platform method to switch to a frame and execute a block
         # See PageObject#in_frame
@@ -795,6 +805,33 @@ module PageObject
           find_selenium_elements(identifier, Elements::Paragraph, 'p')
         end
 
+        #
+        # platform method to return the text for a label
+        # See PageObject::Accessors#label
+        #
+        def label_text_for(identifier)
+          process_selenium_call(identifier, Elements::Label, 'label') do |how, what|
+            @browser.find_element(how, what).text
+          end
+        end
+
+
+        #
+        # platform method to return a PageObject::Elements::Label element
+        # See PageObject::Accessors#label
+        #
+        def label_for(identifier)
+          find_selenium_element(identifier, Elements::Label, 'label')
+        end
+
+
+        #
+        # platform method to retrieve all label elements
+        #
+        def labels_for(identifier)
+          find_selenium_elements(identifier, Elements::Label, 'label')
+        end
+
         #
         # platform method to set the file on a file_field element
         # See PageObject::Accessors#file_field
@@ -813,6 +850,22 @@ module PageObject
           find_selenium_element(identifier, Elements::FileField, 'input', :type => 'file')
         end
 
+        #
+        # platform method to retrieve a generic element
+        # See PageObject::Accessors#element
+        #
+        def element_for(tag, identifier)
+          find_selenium_element(identifier, Elements::FileField, tag.to_s)
+        end
+
+        #
+        # platform method to retrieve a collection of generic elements
+        # See PageObject::Accessors#elements
+        #
+        def elements_for(tag, identifier)
+          find_selenium_elements(identifier, Elements::FileField, tag.to_s)
+        end
+
         private
         
         def process_selenium_call(identifier, type, tag, other=nil)
@@ -868,7 +921,7 @@ module PageObject
             ['submit', 'image', 'button', 'reset'].include? additional[:type]
           return false if identifier[:src] and tag == 'img'
           return false if identifier[:text] and tag == 'input' and additional[:type] == 'hidden'
-          return false if identifier[:text] and ['div', 'span', 'td'].include? tag
+          return false if identifier[:text] and ['div', 'span', 'td', 'label'].include? tag
           return false if identifier[:title] and tag == 'input' and additional[:type] == 'text'
           return false if identifier[:title] and tag == 'input' and additional[:type] == 'file'
           return false if identifier[:value] and tag == 'input' and

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

@@ -17,7 +17,7 @@ module PageObject
         # Select a value from the list
         #
         def select(value)
-          @element.send_keys(value)
+          element.send_keys(value)
         end
 
         #
@@ -57,7 +57,7 @@ module PageObject
         private
 
         def find_options
-          @element.find_elements(:xpath, child_xpath)
+          element.find_elements(:xpath, child_xpath)
         end
       end
     end

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

@@ -32,9 +32,9 @@ module PageObject
         private
 
         def table_rows
-          @element.find_elements(:xpath, child_xpath)
+          element.find_elements(:xpath, child_xpath)
         end
       end
     end
   end
-end
+end

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

@@ -10,14 +10,14 @@ module PageObject
         # return true if an element is visible
         #
         def visible?
-          @element.present?
+          element.present?
         end
 
         #
         # return true if an element exists
         #
         def exists?
-          @element.exists?
+          element.exists?
         end
 
         #
@@ -26,7 +26,7 @@ module PageObject
         # @return [String]
         #
         def text
-          @element.text
+          element.text
         end
 
         #
@@ -35,14 +35,14 @@ module PageObject
         # @return [String]
         #
         def value
-          @element.value
+          element.value
         end
 
         #
         # compare this element to another to determine if they are equal
         #
         def ==(other)
-          @element == other.element
+          element == other.element
         end
 
         #
@@ -51,7 +51,7 @@ module PageObject
         # @return [String]
         #
         def tag_name
-          @element.tag_name
+          element.tag_name
         end
 
         #
@@ -85,22 +85,22 @@ module PageObject
         #   attribute value
         #
         def attribute(attribute_name)
-          @element.attribute_value attribute_name
+          element.attribute_value attribute_name
         end
 
         #
         # Fire the provided event on the current element
         #
         def fire_event(event_name)
-          @element.fire_event(event_name)
+          element.fire_event(event_name)
         end
 
         #
         # find the parent element
         #
         def parent
-          parent = @element.parent
-          type = @element.type if parent.tag_name.to_sym == :input
+          parent = element.parent
+          type = element.type if parent.tag_name.to_sym == :input
           cls = ::PageObject::Elements.element_class_for(parent.tag_name, type)
           cls.new(parent, :platform => :watir_webdriver)
         end
@@ -109,7 +109,7 @@ module PageObject
         # Set the focus to the current element
         #
         def focus
-          @element.focus
+          element.focus
         end
         
         #
@@ -118,7 +118,7 @@ module PageObject
         # @param [Integer] (defaults to: 5) seconds to wait before timing out
         #
         def when_present(timeout=5)
-          @element.wait_until_present(timeout)
+          element.wait_until_present(timeout)
           self
         end
 
@@ -171,14 +171,14 @@ module PageObject
         # @see Selenium::WebDriver::Keys::KEYS
         #
         def send_keys(*args)
-          @element.send_keys(*args)
+          element.send_keys(*args)
         end
 
         #
         # clear the contents of the element
         #
         def clear
-          @element.clear
+          element.clear
         end
       end
     end

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

@@ -7,10 +7,10 @@ module PageObject
         # Submit the form.
         #
         def submit
-          @element.submit
+          element.submit
         end
 
       end
     end
   end
-end
+end