page-object 0.0.2 → 0.0.3

data/lib/page-object/elements.rb

@@ -10,3 +10,5 @@ require 'page-object/elements/div'
 require 'page-object/elements/table'
 require 'page-object/elements/table_cell'
 require 'page-object/elements/table_row'
+require 'page-object/elements/span'
+require 'page-object/elements/image'

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

@@ -2,11 +2,24 @@ 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
 end

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

@@ -6,6 +6,7 @@ module PageObject
     # Contains functionality that is common across all elements.
     #
     class Element
+      attr_reader :element
       
       def initialize(element, platform)
         @element = element

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

@@ -0,0 +1,26 @@
+module PageObject
+  module Elements
+    class Image < Element
+      def initialize(element, platform)
+        @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
+        elsif platform[:platform] == :selenium
+          require 'page-object/platforms/selenium_image'
+          self.class.send :include, PageObject::Platforms::SeleniumImage
+        else
+          raise ArgumentError, "expect platform to be :watir or :selenium"          
+        end
+      end
+  
+    end
+  end
+end

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

@@ -2,6 +2,10 @@ module PageObject
   module Elements
     class Link < Element
       
+      def initialize(element, platform)
+        @element = element
+        include_platform_for platform
+      end
       
       protected
       
@@ -21,6 +25,13 @@ module PageObject
         super.merge(:text => :link_text)
       end
 
+      def include_platform_for platform
+        super
+        if platform[:platform] == :selenium
+          require 'page-object/platforms/selenium_link'
+          self.class.send :include, PageObject::Platforms::SeleniumLink
+        end
+      end
     end
   end
 end

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

@@ -0,0 +1,12 @@
+module PageObject
+  module Elements
+    class Span < Element
+  
+      protected
+      
+      def self.watir_finders
+        [:class, :id, :index, :xpath]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module PageObject
+  module Platforms
+    module SeleniumButton
+      #
+      # Override PageObject::PLatforms::SeleniumElement#text because
+      # #text does not reliabably return a value in Selenium
+      #
+      def text
+        raise "value not available on link element with Selenium"
+      end
+    end
+  end
+end

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

@@ -18,12 +18,74 @@ module PageObject
       end
 
       #
-      # return the text for the element
+      # Get the text for the element
+      #
+      # @return [String]
       #
       def text
         @element.text
       end
+
+      #
+      # Get the value of this element
+      #
+      # @return [String]
+      #
+      def value
+        @element.attribute('value')
+      end
+      
+      #
+      # compare this element to another to determine if they are equal
+      #
+      def ==(other)
+        @element == other.element
+      end
+
+      #
+      # Get the tag name of this element
+      #
+      # @return [String]
+      #
+      def tag_name
+        @element.tag_name
+      end
       
+      #
+      # Get the value of a the given attribute of the element. Will return the current value, even if
+      # this has been modified after the page has been loaded. More exactly, this method will return
+      # the value of the given attribute, unless that attribute is not present, in which case the
+      # value of the property with the same name is returned. If neither value is set, nil is
+      # returned. The "style" attribute is converted as best can be to a text representation with a
+      # trailing semi-colon. The following are deemed to be "boolean" attributes, and will
+      # return either "true" or "false":
+      #
+      # async, autofocus, autoplay, checked, compact, complete, controls, declare, defaultchecked,
+      # defaultselected, defer, disabled, draggable, ended, formnovalidate, hidden, indeterminate,
+      # iscontenteditable, ismap, itemscope, loop, multiple, muted, nohref, noresize, noshade, novalidate,
+      # nowrap, open, paused, pubdate, readonly, required, reversed, scoped, seamless, seeking,
+      # selected, spellcheck, truespeed, willvalidate
+      #
+      # Finally, the following commonly mis-capitalized attribute/property names are evaluated as
+      # expected:
+      #
+      # class, readonly
+      #
+      # @param [String]
+      #   attribute name
+      # @return [String,nil]
+      #   attribute value
+      #
+      def attribute(attribute_name)
+        @element.attribute attribute_name
+      end
+      
+      #
+      # Click this element
+      #
+      def click
+        @element.click
+      end
     end
   end
 end

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

@@ -0,0 +1,22 @@
+module PageObject
+  module Platforms
+    module SeleniumImage
+      
+      #
+      # Return the width of the image.
+      #
+      def width
+        dimension = @element.size
+        dimension.width
+      end
+      
+      #
+      # Return the height of the image
+      #
+      def height
+        dimension = @element.size
+        dimension.height
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module PageObject
+  module Platforms
+    module SeleniumLink
+      #
+      # Override PageObject::PLatforms::SeleniumElement#value because
+      # #value is not available on links in Selenium.
+      #
+      def value
+        raise "value not available on link element with Selenium"
+      end
+    end
+  end
+end

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

@@ -16,7 +16,7 @@ module PageObject
       # available on a table element in Selenium.
       #
       def exists?
-        nil
+        raise "exists? not available on table element"
       end
       
     end

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

@@ -18,12 +18,74 @@ module PageObject
       end
       
       #
-      # return the text for the element
+      # Get the text for the element
+      #
+      # @return [String]
       #
       def text
         @element.text
       end
       
+      #
+      # Get the value of this element
+      #
+      # @return [String]
+      #
+      def value
+        @element.value
+      end
+      
+      #
+      # compare this element to another to determine if they are equal
+      #
+      def ==(other)
+        @element == other.element
+      end
+      
+      #
+      # Get the tag name of this element
+      #
+      # @return [String]
+      #
+      def tag_name
+        @element.tag_name
+      end
+      
+      #
+      # Get the value of a the given attribute of the element. Will return the current value, even if
+      # this has been modified after the page has been loaded. More exactly, this method will return
+      # the value of the given attribute, unless that attribute is not present, in which case the
+      # value of the property with the same name is returned. If neither value is set, nil is
+      # returned. The "style" attribute is converted as best can be to a text representation with a
+      # trailing semi-colon. The following are deemed to be "boolean" attributes, and will
+      # return either "true" or "false":
+      #
+      # async, autofocus, autoplay, checked, compact, complete, controls, declare, defaultchecked,
+      # defaultselected, defer, disabled, draggable, ended, formnovalidate, hidden, indeterminate,
+      # iscontenteditable, ismap, itemscope, loop, multiple, muted, nohref, noresize, noshade, novalidate,
+      # nowrap, open, paused, pubdate, readonly, required, reversed, scoped, seamless, seeking,
+      # selected, spellcheck, truespeed, willvalidate
+      #
+      # Finally, the following commonly mis-capitalized attribute/property names are evaluated as
+      # expected:
+      #
+      # class, readonly
+      #
+      # @param [String]
+      #   attribute name
+      # @return [String,nil]
+      #   attribute value
+      #
+      def attribute(attribute_name)
+        @element.attribute_value attribute_name
+      end
+      
+      #
+      # Click this element
+      #
+      def click
+        @element.click
+      end
     end
   end
 end

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

@@ -0,0 +1,20 @@
+module PageObject
+  module Platforms
+    module WatirImage
+      
+      #
+      # Return the width of the image.
+      #
+      def width
+        @element.width
+      end
+
+      #
+      # Return the height of the image
+      #
+      def height
+        @element.height
+      end
+    end
+  end
+end

data/lib/page-object/selenium_page_object.rb

@@ -206,6 +206,25 @@ module PageObject
       PageObject::Elements::Div.new(element, :platform => :selenium)
     end
     
+    #
+    # platform method to return the text for a span
+    # See PageObject::Accessors#span
+    #
+    def span_text_for(identifier)
+      how, what = Elements::Span.selenium_identifier_for identifier
+      @browser.find_element(how, what).text
+    end
+    
+    #
+    # platform method to return a PageObject::Elements::Span element
+    # See PageObject::Accessors#span
+    #
+    def span_for(identifier)
+      how, what = Elements::Span.selenium_identifier_for identifier
+      element = @browser.find_element(how, what)
+      PageObject::Elements::Span.new(element, :platform => :selenium)
+    end
+    
     #
     # platform method to click a button
     # See PageObject::Accessors#button
@@ -253,5 +272,15 @@ module PageObject
       element = @browser.find_element(how, what)
       PageObject::Elements::TableCell.new(element, :platform => :selenium)
     end
+
+    #
+    # platform method to retrieve an image element
+    # See PageObject::Accessors#image
+    #
+    def image_for(identifier)
+      how, what = Elements::Image.selenium_identifier_for identifier
+      element = @browser.find_element(how, what)
+      PageObject::Elements::Image.new(element, :platform => :selenium)
+    end
   end
 end

data/lib/page-object/version.rb

@@ -1,3 +1,3 @@
 module PageObject
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/lib/page-object/watir_page_object.rb

@@ -206,6 +206,25 @@ module PageObject
       PageObject::Elements::Div.new(element, :platform => :watir)
     end
     
+    #
+    # platform method to return the text for a span
+    # See PageObject::Accessors#span
+    #
+    def span_text_for(identifier)
+      identifier = Elements::Span.watir_identifier_for identifier
+      @browser.span(identifier).text
+    end
+    
+    #
+    # platform method to return a PageObject::Elements::Span element
+    # See PageObject::Accessors#span
+    #
+    def span_for(identifier)
+      identifier = Elements::Span.watir_identifier_for identifier
+      element = @browser.span(identifier)
+      PageObject::Elements::Span.new(element, :platform => :watir)
+    end
+    
     #
     # platform method to click a button
     # See PageObject::Accessors#button
@@ -253,5 +272,15 @@ module PageObject
       element = @browser.td(identifier)
       PageObject::Elements::TableCell.new(element, :platform => :watir)
     end
+    
+    #
+    # platform method to retrieve an image element
+    # See PageObject::Accessors#image
+    #
+    def image_for(identifier)
+      identifier = Elements::Image.watir_identifier_for identifier
+      element = @browser.image(identifier)
+      PageObject::Elements::Image.new(element, :platform => :watir)
+    end
   end
 end

data/page-object.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency 'watir-webdriver', '>= 0.2.3'
-  s.add_dependency 'selenium-webdriver', '>= 0.2.0' 
+  s.add_dependency 'watir-webdriver', '>= 0.2.4'
+  s.add_dependency 'selenium-webdriver', '>= 0.2.1' 
   
   s.add_development_dependency 'rspec', '>= 2.5.0'
   s.add_development_dependency 'cucumber', '>= 0.10.2'