page-object 0.3.1 → 0.3.2

data/lib/page-object/element_locators.rb

@@ -273,5 +273,50 @@ module PageObject
     def ordered_list_element(identifier)
       platform.ordered_list_for(identifier.clone)
     end
+    
+    #
+    # Finds a h1
+    #
+    # @param [Hash] identifier how we find a H1.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def h1_element(identifier)
+      platform.h1_for(identifier.clone)
+    end
+
+    #
+    # Finds a h2
+    #
+    # @param [Hash] identifier how we find a H2.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def h2_element(identifier)
+      platform.h2_for(identifier.clone)
+    end
+
+    #
+    # Finds a h3
+    #
+    # @param [Hash] identifier how we find a H3.  You can use a multiple paramaters
+    #   by combining of any of the following except xpath.  The valid keys are:
+    #   * :class => Watir and Selenium
+    #   * :id => Watir and Selenium
+    #   * :index => Watir and Selenium
+    #   * :name => Watir and Selenium
+    #   * :xpath => Watir and Selenium
+    #
+    def h3_element(identifier)
+      platform.h3_for(identifier.clone)
+    end
   end
 end

data/lib/page-object/elements.rb

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

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

@@ -58,7 +58,7 @@ module PageObject
       protected
 
       def self.should_build_watir_xpath identifier
-        ['table', 'span', 'div', 'td', 'li', 'ul', 'ol'].include? identifier[:tag_name] and identifier[:name]
+        ['table', 'span', 'div', 'td', 'li', 'ul', 'ol', 'h1', 'h2', 'h3'].include? identifier[:tag_name] and identifier[:name]
       end
 
       def self.build_xpath_for identifier

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

@@ -0,0 +1,7 @@
+module PageObject
+  module Elements
+    class Heading < Element
+
+    end
+  end
+end

data/lib/page-object/nested_elements.rb

@@ -68,5 +68,17 @@ module PageObject
     def list_item_element(identifier={:index => 0})
       @platform.list_item_for(identifier)
     end
+    
+    def h1_element(identifier={:index => 0})
+      @platform.h1_for(identifier)
+    end
+    
+    def h2_element(identifier={:index => 0})
+      @platform.h2_for(identifier)
+    end
+
+    def h3_element(identifier={:index => 0})
+      @platform.h3_for(identifier)
+    end
   end
 end

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

@@ -100,6 +100,7 @@ module PageObject
           wait.until do
             self.exists?
           end
+          self
         end
 
         #
@@ -112,6 +113,7 @@ module PageObject
           wait.until do
             self.visible?
           end
+          self
         end
 
         #
@@ -124,6 +126,7 @@ module PageObject
           wait.until do
             not self.visible?
           end
+          self
         end
 
         #
@@ -138,18 +141,6 @@ module PageObject
           wait.until &block
         end
         
-        #
-        # Waits until the block returns true
-        #
-        # @param [Integer] (defaults to: 5) seconds to wait before timing out
-        # @param [String] the message to display if the event timeouts
-        # @param the block to execute when the event occurrs
-        #
-        def wait_until(timeout=5, message=nil, &block)
-          wait = Object::Selenium::WebDriver::Wait.new({:timeout => timeout, :message => message})
-          wait.until &block
-        end
-      
         #
         # Send keystrokes to this element
         #

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

@@ -553,6 +553,78 @@ module PageObject
           @browser.switch_to.default_content unless frame_identifiers.nil?
           ::PageObject::Elements::OrderedList.new(element, :platform => :selenium_webdriver)
         end
+        
+        #
+        # platform method to retrieve the text from a h1
+        # See PageObject::Accessors#h1
+        #
+        def h1_text_for(identifier)
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h1')
+          switch_to_frame(frame_identifiers)
+          value = @browser.find_element(how, what).text
+          @browser.switch_to.default_content
+          value          
+        end
+        
+        #
+        # platform method to retrieve the h1 element
+        # See PageObject::Accessors#h1
+        #
+        def h1_for(identifier)
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h1')
+          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 h2
+        # See PageObject::Accessors#h2
+        #
+        def h2_text_for(identifier)
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h2')
+          switch_to_frame(frame_identifiers)
+          value = @browser.find_element(how, what).text
+          @browser.switch_to.default_content
+          value          
+        end
+        
+        #
+        # platform method to retrieve the h2 element
+        # See PageObject::Accessors#h2
+        #
+        def h2_for(identifier)
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h2')
+          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 h3
+        # See PageObject::Accessors#h3
+        #
+        def h3_text_for(identifier)
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h3')
+          switch_to_frame(frame_identifiers)
+          value = @browser.find_element(how, what).text
+          @browser.switch_to.default_content
+          value          
+        end
+        
+        #
+        # platform method to retrieve the h3 element
+        # See PageObject::Accessors#h3
+        #
+        def h3_for(identifier)
+          how, what, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h3')
+          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
 
         private
         

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

@@ -90,6 +90,7 @@ module PageObject
         #
         def when_present(timeout=5)
           @element.wait_until_present(timeout)
+          self
         end
 
         #
@@ -101,6 +102,7 @@ module PageObject
           Object::Watir::Wait.until(timeout, "Element was not visible in #{timeout} seconds") do
             visible?
           end
+          self
         end
 
         #
@@ -112,6 +114,7 @@ module PageObject
           Object::Watir::Wait.while(timeout, "Element still visible after #{timeout} seconds") do
             visible?
           end
+          self
         end
 
         #

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

@@ -454,6 +454,63 @@ module PageObject
           element = @browser.instance_eval "#{nested_frames(frame_identifiers)}ol(identifier)"
           Object::PageObject::Elements::OrderedList.new(element, :platform => :watir_webdriver)
         end
+        
+        #
+        # platform method to retrieve the text for a h1
+        # See PageObject::Accessors#h1
+        #
+        def h1_text_for(identifier)
+          identifier, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h1')
+          @browser.instance_eval "#{nested_frames(frame_identifiers)}h1(identifier).text"          
+        end
+        
+        #
+        # platform method to retrieve the h1 element
+        # See PageObject::Accessors#h1
+        #
+        def h1_for(identifier)
+          identifier, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h1')
+          element = @browser.instance_eval "#{nested_frames(frame_identifiers)}h1(identifier)"
+          Object::PageObject::Elements::Heading.new(element, :platform => :watir_webdriver)
+        end  
+
+        #
+        # platform method to retrieve the text for a h2
+        # See PageObject::Accessors#h2
+        #
+        def h2_text_for(identifier)
+          identifier, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h2')
+          @browser.instance_eval "#{nested_frames(frame_identifiers)}h2(identifier).text"          
+        end
+        
+        #
+        # platform method to retrieve the h2 element
+        # See PageObject::Accessors#h2
+        #
+        def h2_for(identifier)
+          identifier, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h2')
+          element = @browser.instance_eval "#{nested_frames(frame_identifiers)}h2(identifier)"
+          Object::PageObject::Elements::Heading.new(element, :platform => :watir_webdriver)
+        end  
+
+        #
+        # platform method to retrieve the text for a h3
+        # See PageObject::Accessors#h3
+        #
+        def h3_text_for(identifier)
+          identifier, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h3')
+          @browser.instance_eval "#{nested_frames(frame_identifiers)}h3(identifier).text"          
+        end
+        
+        #
+        # platform method to retrieve the h3 element
+        # See PageObject::Accessors#h3
+        #
+        def h3_for(identifier)
+          identifier, frame_identifiers = parse_identifiers(identifier, Elements::Heading, 'h3')
+          element = @browser.instance_eval "#{nested_frames(frame_identifiers)}h3(identifier)"
+          Object::PageObject::Elements::Heading.new(element, :platform => :watir_webdriver)
+        end  
 
         private
     

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

@@ -10,6 +10,13 @@ module PageObject
         def value=(new_value)
           element.send_keys(new_value)
         end
+        
+        #
+        # Clear the TextArea
+        #
+        def clear
+          element.wd.clear
+        end
       end
     end
   end

data/lib/page-object/version.rb

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

data/page-object.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency 'watir-webdriver', '>= 0.3.3'
-  s.add_dependency 'selenium-webdriver', '>= 2.5.0' 
+  s.add_dependency 'selenium-webdriver', '>= 2.6.0' 
   
   s.add_development_dependency 'rspec', '>= 2.6.0'
   s.add_development_dependency 'cucumber', '>= 1.0.0'

data/spec/page-object/accessors_spec.rb

@@ -21,6 +21,9 @@ class AccessorsTestPageObject
   list_item(:item_one, :id => 'one')
   unordered_list(:menu, :id => 'main_menu')
   ordered_list(:top_five, :id => 'top')
+  h1(:heading1, :id => 'main_heading')
+  h2(:heading2, :id => 'main_heading')
+  h3(:heading3, :id => 'main_heading')
 end
 
 class BlockPageObject
@@ -79,6 +82,15 @@ class BlockPageObject
   ordered_list :top_five do |element|
     "ordered_list"
   end
+  h1 :heading1 do |element|
+    "h1"
+  end
+  h2 :heading2 do |element|
+    "h2"
+  end
+  h3 :heading3 do |element|
+    "h3"
+  end
 end
 
 describe PageObject::Accessors do
@@ -860,4 +872,127 @@ describe PageObject::Accessors do
       end
     end
   end
+  
+  describe "h1 accessors" do
+    context "when called on a page object" do
+      it "should generate accessor methods" do
+        watir_page_object.should respond_to(:heading1)
+        watir_page_object.should respond_to(:heading1_element)
+      end
+      
+      it "should call a block on the element method when present" do
+        block_page_object.heading1_element.should == "h1"
+      end
+    end
+    
+    context "watir implementation" do
+      it "should retrieve the text from the h1" do
+        watir_browser.should_receive(:h1).and_return(watir_browser)
+        watir_browser.should_receive(:text).and_return("value")
+        watir_page_object.heading1.should == "value"        
+      end
+      
+      it "should retrieve the element from the page" do
+        watir_browser.should_receive(:h1).and_return(watir_browser)
+        element = watir_page_object.heading1_element
+        element.should be_instance_of PageObject::Elements::Heading
+      end
+    end
+    
+    context "selenium implementation" do
+      it "should retrieve the text from the h1" do
+        selenium_browser.should_receive(:find_element).and_return(selenium_browser)
+        selenium_browser.should_receive(:text).and_return("value")
+        selenium_page_object.heading1.should == "value"
+      end
+      
+      it "should retrieve the element from the page" do
+        selenium_browser.should_receive(:find_element).and_return(selenium_browser)
+        element = selenium_page_object.heading1_element
+        element.should be_instance_of PageObject::Elements::Heading
+      end
+    end
+  end
+  
+  describe "h2 accessors" do
+    context "when called on a page object" do
+      it "should generate accessor methods" do
+        watir_page_object.should respond_to(:heading2)
+        watir_page_object.should respond_to(:heading2_element)
+      end
+      
+      it "should call a block on the element method when present" do
+        block_page_object.heading2_element.should == "h2"
+      end
+    end
+    
+    context "watir implementation" do
+      it "should retrieve the text from the h2" do
+        watir_browser.should_receive(:h2).and_return(watir_browser)
+        watir_browser.should_receive(:text).and_return("value")
+        watir_page_object.heading2.should == "value"        
+      end
+      
+      it "should retrieve the element from the page" do
+        watir_browser.should_receive(:h2).and_return(watir_browser)
+        element = watir_page_object.heading2_element
+        element.should be_instance_of PageObject::Elements::Heading
+      end
+    end
+    
+    context "selenium implementation" do
+      it "should retrieve the text from the h2" do
+        selenium_browser.should_receive(:find_element).and_return(selenium_browser)
+        selenium_browser.should_receive(:text).and_return("value")
+        selenium_page_object.heading2.should == "value"
+      end
+      
+      it "should retrieve the element from the page" do
+        selenium_browser.should_receive(:find_element).and_return(selenium_browser)
+        element = selenium_page_object.heading2_element
+        element.should be_instance_of PageObject::Elements::Heading
+      end
+    end
+
+    describe "h3 accessors" do
+      context "when called on a page object" do
+        it "should generate accessor methods" do
+          watir_page_object.should respond_to(:heading3)
+          watir_page_object.should respond_to(:heading3_element)
+        end
+
+        it "should call a block on the element method when present" do
+          block_page_object.heading3_element.should == "h3"
+        end
+      end
+
+      context "watir implementation" do
+        it "should retrieve the text from the h3" do
+          watir_browser.should_receive(:h3).and_return(watir_browser)
+          watir_browser.should_receive(:text).and_return("value")
+          watir_page_object.heading3.should == "value"        
+        end
+
+        it "should retrieve the element from the page" do
+          watir_browser.should_receive(:h3).and_return(watir_browser)
+          element = watir_page_object.heading3_element
+          element.should be_instance_of PageObject::Elements::Heading
+        end
+      end
+
+      context "selenium implementation" do
+        it "should retrieve the text from the h3" do
+          selenium_browser.should_receive(:find_element).and_return(selenium_browser)
+          selenium_browser.should_receive(:text).and_return("value")
+          selenium_page_object.heading3.should == "value"
+        end
+
+        it "should retrieve the element from the page" do
+          selenium_browser.should_receive(:find_element).and_return(selenium_browser)
+          element = selenium_page_object.heading3_element
+          element.should be_instance_of PageObject::Elements::Heading
+        end
+      end
+    end
+  end
 end