page-object 0.3.2 → 0.4.0

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

@@ -1,3 +1,5 @@
+require 'mixology'
+
 module PageObject
   module Elements
     class SelectList < Element
@@ -21,10 +23,10 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/select_list'
-          self.class.send :include, PageObject::Platforms::WatirWebDriver::SelectList
+          self.mixin 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
+          self.mixin PageObject::Platforms::SeleniumWebDriver::SelectList
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end

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

@@ -1,3 +1,5 @@
+require 'mixology'
+
 module PageObject
   module Elements
     class Table < Element
@@ -29,10 +31,10 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/table'
-          self.class.send :include, PageObject::Platforms::WatirWebDriver::Table
+          self.mixin PageObject::Platforms::WatirWebDriver::Table
         elsif platform[:platform] == :selenium_webdriver
           require 'page-object/platforms/selenium_webdriver/table'
-          self.class.send :include, PageObject::Platforms::SeleniumWebDriver::Table
+          self.mixin PageObject::Platforms::SeleniumWebDriver::Table
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end

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

@@ -1,3 +1,5 @@
+require 'mixology'
+
 module PageObject
   module Elements
     class TableRow < Element
@@ -29,10 +31,10 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/table_row'
-          self.class.send :include, PageObject::Platforms::WatirWebDriver::TableRow
+          self.mixin 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
+          self.mixin PageObject::Platforms::SeleniumWebDriver::TableRow
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end

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

@@ -1,3 +1,5 @@
+require 'mixology'
+
 module PageObject
   module Elements
     class TextArea < Element
@@ -29,10 +31,10 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/text_area'
-          self.class.send :include, PageObject::Platforms::WatirWebDriver::TextArea
+          self.mixin 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
+          self.mixin PageObject::Platforms::SeleniumWebDriver::TextArea
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end

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

@@ -1,3 +1,5 @@
+require 'mixology'
+
 module PageObject
   module Elements
     class TextField < Element
@@ -29,10 +31,10 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/text_field'
-          self.class.send :include, PageObject::Platforms::WatirWebDriver::TextField
+          self.mixin 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
+          self.mixin PageObject::Platforms::SeleniumWebDriver::TextField
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end

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

@@ -1,3 +1,5 @@
+require 'mixology'
+
 module PageObject
   module Elements
     class UnorderedList < Element
@@ -34,10 +36,10 @@ module PageObject
         super
         if platform[:platform] == :watir_webdriver
           require 'page-object/platforms/watir_webdriver/unordered_list'
-          self.class.send :include, PageObject::Platforms::WatirWebDriver::UnorderedList
+          self.mixin 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
+          self.mixin PageObject::Platforms::SeleniumWebDriver::UnorderedList
         else
           raise ArgumentError, "expect platform to be :watir_webdriver or :selenium_webdriver"
         end

data/lib/page-object/elements.rb

@@ -19,3 +19,4 @@ require 'page-object/elements/unordered_list'
 require 'page-object/elements/ordered_list'
 require 'page-object/elements/option'
 require 'page-object/elements/heading'
+require 'page-object/elements/paragraph'

data/lib/page-object/nested_elements.rb

@@ -80,5 +80,21 @@ module PageObject
     def h3_element(identifier={:index => 0})
       @platform.h3_for(identifier)
     end
+    
+    def h4_element(identifier={:index => 0})
+      @platform.h4_for(identifier)
+    end
+
+    def h5_element(identifier={:index => 0})
+      @platform.h5_for(identifier)
+    end
+
+    def h6_element(identifier={:index => 0})
+      @platform.h6_for(identifier)
+    end
+
+    def paragraph_element(identifier={:index => 0})
+      @platform.paragraph_for(identifier)
+    end
   end
 end

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

@@ -23,6 +23,14 @@ module PageObject
           @browser.navigate.to url
         end
 
+        #
+        # platform method to get the current url
+        # See PageObject#current_url
+        #
+        def current_url
+          @browser.current_url
+        end
+
         #
         # platform method to retrieve the text from the current page
         # See PageObject#text
@@ -129,6 +137,22 @@ module PageObject
         def forward
           @browser.navigate.forward
         end
+        
+        #
+        # platform method to clear the cookies from the browser
+        # See PageObject#clear_cookies
+        #
+        def clear_cookies
+          @browser.manage.delete_all_cookies
+        end
+        
+        #
+        # platform method to save the current screenshot to a file
+        # See PageObject#save_screenshot
+        #
+        def save_screenshot(file_name)
+          @browser.save_screenshot(file_name)
+        end
 
         #
         # platform method to get the value stored in a text field
@@ -626,6 +650,102 @@ module PageObject
           ::PageObject::Elements::Heading.new(element, :platform => :selenium_webdriver)
         end
 
+        #
+        # platform method to retrieve the text from a h4
+        # See PageObject::Accessors#h4
+        #
+        def h4_text_for(identifier)
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h4')
+          switch_to_frame(frame_identifiers)
+          value = @browser.find_element(how, what).text
+          @browser.switch_to.default_content
+          value          
+        end
+        
+        #
+        # platform method to retrieve the h4 element
+        # See PageObject::Accessors#h4
+        #
+        def h4_for(identifier)
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h4')
+          switch_to_frame(frame_identifiers)
+          element = @browser.find_element(how, what)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::Heading.new(element, :platform => :selenium_webdriver)
+        end
+
+        #
+        # platform method to retrieve the text from a h5
+        # See PageObject::Accessors#h5
+        #
+        def h5_text_for(identifier)
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h5')
+          switch_to_frame(frame_identifiers)
+          value = @browser.find_element(how, what).text
+          @browser.switch_to.default_content
+          value          
+        end
+        
+        #
+        # platform method to retrieve the h5 element
+        # See PageObject::Accessors#h5
+        #
+        def h5_for(identifier)
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h5')
+          switch_to_frame(frame_identifiers)
+          element = @browser.find_element(how, what)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::Heading.new(element, :platform => :selenium_webdriver)
+        end
+
+        #
+        # platform method to retrieve the text from a h6
+        # See PageObject::Accessors#h6
+        #
+        def h6_text_for(identifier)
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h6')
+          switch_to_frame(frame_identifiers)
+          value = @browser.find_element(how, what).text
+          @browser.switch_to.default_content
+          value          
+        end
+        
+        #
+        # platform method to retrieve the h6 element
+        # See PageObject::Accessors#h6
+        #
+        def h6_for(identifier)
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h6')
+          switch_to_frame(frame_identifiers)
+          element = @browser.find_element(how, what)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::Heading.new(element, :platform => :selenium_webdriver)
+        end
+
+        #
+        # platform method to retrieve the text for a paragraph
+        # See PageObject::Accessors#paragraph
+        #
+        def paragraph_text_for(identifier)
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Paragraph, 'p')
+          switch_to_frame(frame_identifiers)
+          value = @browser.find_element(how, what).text
+          @browser.switch_to.default_content
+          value          
+        end
+        
+        #
+        # platform method to retrieve the paragraph element
+        # See PageObject::Accessors#paragraph
+        #
+        def paragraph_for(identifier)
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'p')
+          switch_to_frame(frame_identifiers)
+          element = @browser.find_element(how, what)
+          @browser.switch_to.default_content unless frame_identifiers.nil?
+          ::PageObject::Elements::Paragraph.new(element, :platform => :selenium_webdriver)
+        end  
+
         private
         
         def parse_identifiers(identifier, element, tag_name=nil, additional=nil)

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

@@ -25,6 +25,14 @@ module PageObject
         def navigate_to(url)
           @browser.goto url
         end
+        
+        #
+        # platform method to get the current url
+        # See PageObject#current_url
+        #
+        def current_url
+          @browser.url
+        end
 
         #
         # platform method to retrieve the text from the current page
@@ -113,6 +121,22 @@ module PageObject
         def forward
           @browser.forward
         end
+        
+        #
+        # platform method to clear the cookies from the browser
+        # See PageObject#clear_cookies
+        #
+        def clear_cookies
+          @browser.clear_cookies
+        end
+
+        #
+        # platform method to save the current screenshot to a file
+        # See PageObject#save_screenshot
+        #
+        def save_screenshot(file_name)
+          @browser.wd.save_screenshot(file_name)
+        end
 
         #
         # platform method to get the value stored in a text field
@@ -512,6 +536,82 @@ module PageObject
           Object::PageObject::Elements::Heading.new(element, :platform => :watir_webdriver)
         end  
 
+        #
+        # platform method to retrieve the text for a h4
+        # See PageObject::Accessors#h4
+        #
+        def h4_text_for(identifier)
+          identifier, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h4')
+          @browser.instance_eval "#{nested_frames(frame_identifiers)}h4(identifier).text"          
+        end
+        
+        #
+        # platform method to retrieve the h4 element
+        # See PageObject::Accessors#h4
+        #
+        def h4_for(identifier)
+          identifier, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h4')
+          element = @browser.instance_eval "#{nested_frames(frame_identifiers)}h4(identifier)"
+          Object::PageObject::Elements::Heading.new(element, :platform => :watir_webdriver)
+        end  
+
+        #
+        # platform method to retrieve the text for a h5
+        # See PageObject::Accessors#h5
+        #
+        def h5_text_for(identifier)
+          identifier, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h5')
+          @browser.instance_eval "#{nested_frames(frame_identifiers)}h5(identifier).text"          
+        end
+        
+        #
+        # platform method to retrieve the h5 element
+        # See PageObject::Accessors#h5
+        #
+        def h5_for(identifier)
+          identifier, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h5')
+          element = @browser.instance_eval "#{nested_frames(frame_identifiers)}h5(identifier)"
+          Object::PageObject::Elements::Heading.new(element, :platform => :watir_webdriver)
+        end  
+
+        #
+        # platform method to retrieve the text for a h6
+        # See PageObject::Accessors#h6
+        #
+        def h6_text_for(identifier)
+          identifier, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h6')
+          @browser.instance_eval "#{nested_frames(frame_identifiers)}h6(identifier).text"          
+        end
+        
+        #
+        # platform method to retrieve the h6 element
+        # See PageObject::Accessors#h6
+        #
+        def h6_for(identifier)
+          identifier, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h6')
+          element = @browser.instance_eval "#{nested_frames(frame_identifiers)}h6(identifier)"
+          Object::PageObject::Elements::Heading.new(element, :platform => :watir_webdriver)
+        end  
+
+        #
+        # platform method to retrieve the text for a paragraph
+        # See PageObject::Accessors#paragraph
+        #
+        def paragraph_text_for(identifier)
+          identifier, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'p')
+          @browser.instance_eval "#{nested_frames(frame_identifiers)}p(identifier).text"          
+        end
+        
+        #
+        # platform method to retrieve the paragraph element
+        # See PageObject::Accessors#paragraph
+        #
+        def paragraph_for(identifier)
+          identifier, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'p')
+          element = @browser.instance_eval "#{nested_frames(frame_identifiers)}p(identifier)"
+          Object::PageObject::Elements::Paragraph.new(element, :platform => :watir_webdriver)
+        end  
+
         private
     
         def parse_identifiers(identifier, element, tag_name=nil)

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.3.2"
+  VERSION = "0.4.0"
 end

data/lib/page-object.rb

@@ -60,6 +60,13 @@ module PageObject
     cls.extend PageObject::Accessors
   end
 
+  #
+  # get the current page url
+  #
+  def current_url
+    platform.current_url
+  end
+
   #
   # navigate to the provided url
   #
@@ -221,6 +228,21 @@ module PageObject
   def forward
     platform.forward
   end
+  
+  #
+  # Clear the cookies from the browser
+  #
+  def clear_cookies
+    platform.clear_cookies
+  end
+  
+  #
+  # Save the current screenshot to the provided url.  File
+  # is saved as a png file.
+  #
+  def save_screenshot(file_name)
+    platform.save_screenshot file_name
+  end
 
   private
 

data/page-object.gemspec

@@ -19,8 +19,9 @@ 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.3.3'
-  s.add_dependency 'selenium-webdriver', '>= 2.6.0' 
+  s.add_dependency 'watir-webdriver', '>= 0.3.4'
+  s.add_dependency 'selenium-webdriver', '>= 2.7.0' 
+  s.add_dependency 'mixology'
   
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency 'cucumber', '>= 1.0.0'