page-object 0.8.1 → 0.8.2

data/lib/page-object/locator_generator.rb

@@ -0,0 +1,77 @@
+module PageObject
+  module LocatorGenerator
+
+    def self.generate_locators(target)
+      [:text_field,
+       :hidden_field,
+       :text_area,
+       :select_list,
+       :link,
+       :checkbox,
+       :radio_button,
+       :button,
+       :div,
+       :span,
+       :table,
+       :cell,
+       :image,
+       :form,
+       :list_item,
+       :ordered_list,
+       :unordered_list,
+       :h1,
+       :h2,
+       :h3,
+       :h4,
+       :h5,
+       :h6,
+       :paragraph,
+       :label,
+       :file_field,
+       :area,
+       :canvas,
+       :audio,
+       :video,
+       :abbr,
+       :address,
+       :article,
+       :aside,
+       :bdi,
+       :bdo,
+       :cite,
+       :code,
+       :dd,
+       :dfn,
+       :dt,
+       :em,
+       :figcaption,
+       :figure,
+       :footer,
+       :header,
+       :hgroup,
+       :kbd,
+       :mark,
+       :nav,
+       :noscript,
+       :rp,
+       :rt,
+       :ruby,
+       :samp,
+       :section,
+       :sub,
+       :summary,
+       :sup,
+       :var,
+       :wbr].each do |tag|
+        target.send(:define_method, "#{tag.to_s}_element") do |*identifier|
+          @platform.send "#{tag.to_s}_for", locator(identifier)
+        end
+
+        target.send(:define_method, "#{tag.to_s}_elements") do |*identifier|
+          @platform.send("#{tag.to_s}s_for", identifier[0] ? identifier[0] : {})
+        end
+      end
+    end
+
+  end
+end

data/lib/page-object/nested_elements.rb

@@ -1,240 +1,17 @@
+require 'page-object/locator_generator'
+
 module PageObject
   module NestedElements
 
-    def link_element(identifier={:index => 0})
-      @platform.link_for(identifier)
-    end
-
-    def link_elements(identifier={:index => 0})
-      @platform.links_for(identifier)
-    end
-
-    def button_element(identifier={:index => 0})
-      @platform.button_for(identifier)
-    end
-
-    def button_elements(identifier={:index => 0})
-      @platform.buttons_for(identifier)
+    def self.included(cls)
+      ::PageObject::LocatorGenerator.generate_locators(cls)
     end
 
-    def text_field_element(identifier={:index => 0})
-      @platform.text_field_for(identifier)
-    end
+    private
 
-    def text_field_elements(identifier={:index => 0})
-      @platform.text_fields_for(identifier)
-    end
-
-    def hidden_field_element(identifier={:index => 0})
-      @platform.hidden_field_for(identifier)
-    end
-
-    def hidden_field_elements(identifier={:index => 0})
-      @platform.hidden_fields_for(identifier)
-    end
-
-    def text_area_element(identifier={:index => 0})
-      @platform.text_area_for(identifier)
-    end
-
-    def text_area_elements(identifier={:index => 0})
-      @platform.text_areas_for(identifier)
-    end
-
-    def select_list_element(identifier={:index => 0})
-      @platform.select_list_for(identifier)
-    end
-
-    def select_list_elements(identifier={:index => 0})
-      @platform.select_lists_for(identifier)
-    end
-
-    def checkbox_element(identifier={:index => 0})
-      @platform.checkbox_for(identifier)
-    end
-
-    def checkbox_elements(identifier={:index => 0})
-      @platform.checkboxes_for(identifier)
-    end
-
-    def radio_button_element(identifier={:index => 0})
-      @platform.radio_button_for(identifier)
-    end
-
-    def radio_button_elements(identifier={:index => 0})
-      @platform.radio_buttons_for(identifier)
-    end
-
-    def div_element(identifier={:index => 0})
-      @platform.div_for(identifier)
-    end
-
-    def div_elements(identifier={:index => 0})
-      @platform.divs_for(identifier)
-    end
-
-    def span_element(identifier={:index => 0})
-      @platform.span_for(identifier)
-    end
-
-    def span_elements(identifier={:index => 0})
-      @platform.spans_for(identifier)
-    end
-
-    def table_element(identifier={:index => 0})
-      @platform.table_for(identifier)
-    end
-    
-    def table_elements(identifier={:index => 0})
-      @platform.tables_for(identifier)
-    end
-    
-    def cell_element(identifier={:index => 0})
-      @platform.cell_for(identifier)
-    end
-    
-    def cell_elements(identifier={:index => 0})
-      @platform.cells_for(identifier)
-    end
-    
-    def image_element(identifier={:index => 0})
-      @platform.image_for(identifier)
-    end
-    
-    def image_elements(identifier={:index => 0})
-      @platform.images_for(identifier)
-    end
-    
-    def form_element(identifier={:index => 0})
-      @platform.form_for(identifier)
+    def locator(identifier)
+      identifier[0] ? identifier[0] : {:index => 0}
     end
     
-    def form_elements(identifier={:index => 0})
-      @platform.forms_for(identifier)
-    end
-    
-    def ordered_list_element(identifier={:index => 0})
-      @platform.ordered_list_for(identifier)
-    end
-    
-    def ordered_list_elements(identifier={:index => 0})
-      @platform.ordered_lists_for(identifier)
-    end
-    
-    def unordered_list_element(identifier={:index => 0})
-      @platform.unordered_list_for(identifier)
-    end
-    
-    def unordered_list_elements(identifier={:index => 0})
-      @platform.unordered_lists_for(identifier)
-    end
-    
-    def list_item_element(identifier={:index => 0})
-      @platform.list_item_for(identifier)
-    end
-    
-    def list_item_elements(identifier={:index => 0})
-      @platform.list_items_for(identifier)
-    end
-    
-    def h1_element(identifier={:index => 0})
-      @platform.h1_for(identifier)
-    end
-    
-    def h1_elements(identifier={:index => 0})
-      @platform.h1s_for(identifier)
-    end
-    
-    def h2_element(identifier={:index => 0})
-      @platform.h2_for(identifier)
-    end
-    
-    def h2_elements(identifier={:index => 0})
-      @platform.h2s_for(identifier)
-    end
-
-    def h3_element(identifier={:index => 0})
-      @platform.h3_for(identifier)
-    end
-    
-    def h3_elements(identifier={:index => 0})
-      @platform.h3s_for(identifier)
-    end
-    
-    def h4_element(identifier={:index => 0})
-      @platform.h4_for(identifier)
-    end
-
-    def h4_elements(identifier={:index => 0})
-      @platform.h4s_for(identifier)
-    end
-
-    def h5_element(identifier={:index => 0})
-      @platform.h5_for(identifier)
-    end
-    
-    def h5_elements(identifier={:index => 0})
-      @platform.h5s_for(identifier)
-    end
-
-    def h6_element(identifier={:index => 0})
-      @platform.h6_for(identifier)
-    end
-    
-    def h6_elements(identifier={:index => 0})
-      @platform.h6s_for(identifier)
-    end
-
-    def paragraph_element(identifier={:index => 0})
-      @platform.paragraph_for(identifier)
-    end
-
-    def paragraph_elements(identifier={:index => 0})
-      @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
-
-    def area_element(identifier={:index => 0})
-      @platform.area_for(identifier)
-    end
-
-    def area_elements(identifier={:index => 0})
-      @platform.areas_for(identifier)
-    end
-
-    def canvas_element(identifier={:index => 0})
-      @platform.canvas_for(identifier)
-    end
-
-    def canvas_elements(identifier={:index => 0})
-      @platform.canvases_for(identifier)
-    end
-
-    def audio_element(identifier={:index => 0})
-      @platform.audio_for(identifier)
-    end
-
-    def audio_elements(identifier={:index => 0})
-      @platform.audios_for(identifier)
-    end
-    
-    def video_element(identifier={:index => 0})
-      @platform.video_for(identifier)
-    end
-
-    def video_elements(identifier={:index => 0})
-      @platform.video_for(identifier)
-    end
   end
 end

data/lib/page-object/page_factory.rb

@@ -26,9 +26,12 @@ module PageObject
   # @example Example routes defined in env.rb
   #   PageObject::PageFactory.routes = {
   #     :default => [[PageOne,:method1], [PageTwoA,:method2], [PageThree,:method3]],
-  #     :another_route => [[PageOne,:method1], [PageTwoB,:method2b], [PageThree,:method3]]
+  #     :another_route => [[PageOne,:method1, "arg1"], [PageTwoB,:method2b], [PageThree,:method3]]
   #   }
-  # 
+  #
+  # Notice the first entry of :anouther_route is passing an argument
+  # to the method.
+  #
   module PageFactory
 
     #
@@ -147,15 +150,16 @@ module PageObject
     end
     
     def navigate_through_pages(pages)
-      pages.each do |cls, method|
+      pages.each do |cls, method, *args|
         page = on_page(cls)
-        fail("Navigation method not specified on #{cls}.  Please call the ") unless page.respond_to? method
-        page.send method
+        fail("Navigation method not specified on #{cls}.") unless page.respond_to? method
+        page.send method unless args
+        page.send method, *args if args
       end
     end
 
     def find_index_for(path, item)
-      path.each_with_index { |each, index| return index if each[0] == item}
+      path.find_index { |each| each[0] == item}
     end
 
     class << self

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

@@ -264,6 +264,13 @@ module PageObject
           attribute(:id)
         end
 
+        #
+        # Scroll until the element is viewable
+        #
+        def scroll_into_view
+          element.location_once_scrolled_into_view
+        end
+
         private
 
         def bridge

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

@@ -401,7 +401,7 @@ module PageObject
         #
         # platform method to retrieve all checkbox elements
         #
-        def checkboxes_for(identifier)
+        def checkboxs_for(identifier)
           find_selenium_elements(identifier, Elements::CheckBox, 'input', :type => 'checkbox')
         end
 
@@ -940,7 +940,7 @@ module PageObject
         #
         # platform method to return an array of canvas elements
         #
-        def canvases_for(identifier)
+        def canvass_for(identifier)
           find_selenium_elements(identifier, Elements::Canvas, 'canvas')
         end
         

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

@@ -227,6 +227,13 @@ module PageObject
         def id
           element.id
         end
+
+        #
+        # Scroll until the element is viewable
+        #
+        def scroll_into_view
+          element.wd.location_once_scrolled_into_view
+        end
       end
     end
   end

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

@@ -366,7 +366,7 @@ module PageObject
         #
         # platform method to retrieve an array of checkbox elements
         #
-        def checkboxes_for(identifier)
+        def checkboxs_for(identifier)
           find_watir_elements("checkboxes(identifier)", Elements::CheckBox, identifier)
         end
 
@@ -867,7 +867,7 @@ module PageObject
         #
         # platform method to retrieve an array of canvas elements
         #
-        def canvases_for(identifier)
+        def canvass_for(identifier)
           find_watir_elements("canvases(identifier)", Elements::Canvas, identifier, 'canvas')
         end
 

data/lib/page-object/version.rb

@@ -1,4 +1,4 @@
 module PageObject
   # @private
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/spec/page-object/elements/selenium_element_spec.rb

@@ -164,4 +164,9 @@ describe "Element for Selenium" do
     @selenium_driver.should_receive(:executeScript)
     @selenium_element.focus
   end
+
+  it "should scroll into view" do
+    @selenium_driver.should_receive(:location_once_scrolled_into_view)
+    @selenium_element.scroll_into_view
+  end
 end

data/spec/page-object/elements/watir_element_spec.rb

@@ -133,4 +133,10 @@ describe "Element for Watir" do
     watir_driver.should_receive(:clear)
     watir_element.clear
   end
+
+  it "should scroll into view" do
+    watir_driver.stub(:wd).and_return(watir_driver)
+    watir_driver.should_receive(:location_once_scrolled_into_view)
+    watir_element.scroll_into_view
+  end
 end