druid-ts 1.1.6 → 1.1.7

data/lib/druid/elements/element.rb

@@ -160,6 +160,13 @@ module Druid
         attribute(:id)
       end
 
+      #
+      # Scroll until the element is viewable
+      #
+      def scroll_into_view
+        element.wd.location_once_scrolled_into_view
+      end
+
       #
       # Flash the element by temporarily changing the background color
       #

data/lib/druid/locator_generator.rb

@@ -0,0 +1,73 @@
+module Druid
+  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,
+       :unordered_list,
+       :ordered_list,
+       :h1,
+       :h2,
+       :h3,
+       :h4,
+       :h5,
+       :h6,
+       :paragraph,
+       :label,
+       :file_field,
+       :area,
+       :canvas,
+       :audio,
+       :video,
+       :abbr,
+       :address,
+       :article,
+       :aside,
+       :bdi,
+       :cite,
+       :code,
+       :dd,
+       :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|
+           self.send "#{tag.to_s}_for", locator(identifier).clone
+         end
+
+         target.send(:define_method, "#{tag.to_s}_elements") do |*identifier|
+           self.send "#{tag.to_s}s_for", identifier[0] ? identifier[0].clone : {}
+         end
+       end
+    end
+  end
+end

data/lib/druid/nested_elements.rb

@@ -1,239 +1,56 @@
+require 'druid/locator_generator'
+
 module Druid
   module NestedElements
-    def link_element(identifier={:index => 0})
-      link_for(identifier)
-    end
-
-    def link_elements(identifier={:index => 0})
-      links_for(identifier)
-    end
-
-    def button_element(identifier={:index => 0})
-      button_for(identifier)
-    end
-
-    def button_elements(identifier={:index => 0})
-      buttons_for(identifier)
-    end
-
-    def text_field_element(identifier={:index => 0})
-      text_field_for(identifier)
-    end
-
-    def text_field_elements(identifier={:index => 0})
-      text_fields_for(identifier)
-    end
-
-    def hidden_field_element(identifier={:index => 0})
-      hidden_field_for(identifier)
-    end
-
-    def hidden_field_elements(identifier={:index => 0})
-      hidden_fields_for(identifier)
-    end
-
-    def text_area_element(identifier={:index => 0})
-      text_area_for(identifier)
-    end
-
-    def text_area_elements(identifier={:index => 0})
-      text_areas_for(identifier)
-    end
-
-    def select_list_element(identifier={:index => 0})
-      select_list_for(identifier)
-    end
-
-    def select_list_elements(identifier={:index => 0})
-      select_lists_for(identifier)
-    end
-
-    def checkbox_element(identifier={:index => 0})
-      checkbox_for(identifier)
-    end
-
-    def checkbox_elements(identifier={:index => 0})
-      checkboxes_for(identifier)
-    end
-
-    def radio_button_element(identifier={:index => 0})
-      radio_button_for(identifier)
-    end
-
-    def radio_button_elements(identifier={:index => 0})
-      radio_buttons_for(identifier)
-    end
-
-    def div_element(identifier={:index => 0})
-      div_for(identifier)
-    end
-
-    def div_elements(identifier={:index => 0})
-      divs_for(identifier)
-    end
-
-    def span_element(identifier={:index => 0})
-      span_for(identifier)
-    end
-
-    def span_elements(identifier={:index => 0})
-      spans_for(identifier)
-    end
-
-    def table_element(identifier={:index => 0})
-      table_for(identifier)
-    end
-
-    def table_elements(identifier={:index => 0})
-      tables_for(identifier)
-    end
-
-    def cell_element(identifier={:index => 0})
-      cell_for(identifier)
-    end
-
-    def cell_elements(identifier={:index => 0})
-      cells_for(identifier)
-    end
-
-    def image_element(identifier={:index => 0})
-      image_for(identifier)
-    end
-
-    def image_elements(identifier={:index => 0})
-      images_for(identifier)
-    end
-
-    def form_element(identifier={:index => 0})
-      form_for(identifier)
-    end
-
-    def form_elements(identifier={:index => 0})
-      forms_for(identifier)
-    end
-
-    def ordered_list_element(identifier={:index => 0})
-      ordered_list_for(identifier)
-    end
 
-    def ordered_list_elements(identifier={:index => 0})
-      ordered_lists_for(identifier)
-    end
-
-    def unordered_list_element(identifier={:index => 0})
-      unordered_list_for(identifier)
-    end
-
-    def unordered_list_elements(identifier={:index => 0})
-      unordered_lists_for(identifier)
-    end
-
-    def list_item_element(identifier={:index => 0})
-      list_item_for(identifier)
-    end
-
-    def list_item_elements(identifier={:index => 0})
-      list_items_for(identifier)
-    end
-
-    def h1_element(identifier={:index => 0})
-      h1_for(identifier)
-    end
-
-    def h1_elements(identifier={:index => 0})
-      h1s_for(identifier)
-    end
-
-    def h2_element(identifier={:index => 0})
-      h2_for(identifier)
-    end
-
-    def h2_elements(identifier={:index => 0})
-      h2s_for(identifier)
-    end
-
-    def h3_element(identifier={:index => 0})
-      h3_for(identifier)
-    end
-
-    def h3_elements(identifier={:index => 0})
-      h3s_for(identifier)
-    end
-
-    def h4_element(identifier={:index => 0})
-      h4_for(identifier)
-    end
-
-    def h4_elements(identifier={:index => 0})
-      h4s_for(identifier)
-    end
-
-    def h5_element(identifier={:index => 0})
-      h5_for(identifier)
-    end
-
-    def h5_elements(identifier={:index => 0})
-      h5s_for(identifier)
-    end
+    def self.included(cls)
+      Druid::LocatorGenerator.generate_locators(cls)
+    end
+
+    private
+
+    def locator(identifier)
+      identifier[0] ? identifier[0] : {:index => 0}
+    end
+
+    # [:text_field,
+    #  :hidden_field,
+    #  :text_area,
+    #  :select_list,
+    #  :link,
+    #  :checkbox,
+    #  :radio_button,
+    #  :button,
+    #  :div,
+    #  :span,
+    #  :table,
+    #  :cell,
+    #  :image,
+    #  :form,
+    #  :list_item,
+    #  :unordered_list,
+    #  :ordered_list,
+    #  :h1,
+    #  :h2,
+    #  :h3,
+    #  :h4,
+    #  :h5,
+    #  :h6,
+    #  :paragraph,
+    #  :label,
+    #  :file_field,
+    #  :area,
+    #  :canvas,
+    #  :audio,
+    #  :video].each do |tag|
+    #    define_method("#{tag.to_s}_element") do |*identifier|
+    #      self.send "#{tag.to_s}_for", locator(identifier)
+    #    end
+    #
+    #    define_method("#{tag.to_s}_elements") do |*identifier|
+    #      self.send "#{tag.to_s}s_for", locator(identifier)
+    #    end
+    #  end
 
-    def h6_element(identifier={:index => 0})
-      h6_for(identifier)
-    end
-
-    def h6_elements(identifier={:index => 0})
-      h6s_for(identifier)
-    end
-
-    def paragraph_element(identifier={:index => 0})
-      paragraph_for(identifier)
-    end
-
-    def paragraph_elements(identifier={:index => 0})
-      paragraphs_for(identifier)
-    end
-
-    def file_field_element(identifier={:index => 0})
-      file_field_for(identifier)
-    end
-
-    def label_element(identifier={:index => 0})
-      label_for(identifier)
-    end
-
-    def label_elements(identifier={:index => 0})
-      labels_for(identifier)
-    end
-
-    def area_element(identifier={:index => 0})
-      area_for(identifier)
-    end
-
-    def area_elements(identifier={:index => 0})
-      areas_for(identifier)
-    end
-
-    def canvas_element(identifier={:index => 0})
-      canvas_for(identifier)
-    end
-
-    def canvas_elements(identifier={:index => 0})
-      canvases_for(identifier)
-    end
-
-    def audio_element(identifier={:index => 0})
-      audio_for(identifier)
-    end
-
-    def audio_elements(identifier={:index => 0})
-      audios_for(identifier)
-    end
-
-    def video_element(identifier={:index => 0})
-      video_for(identifier)
-    end
-
-    def video_elements(identifier={:index => 0})
-      videos_for(identifier)
-    end
   end
 end

data/lib/druid/page_factory.rb

@@ -25,8 +25,10 @@ module Druid
   # @example Example routes defined in env.rb
   #  Druid::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 :another_route is passing an argument
+  # to the method
   # You must also call the navigation_method on each page.
   module PageFactory
     # attr_accessor :page
@@ -154,10 +156,11 @@ module Druid
     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
 

data/lib/druid/version.rb

@@ -1,3 +1,3 @@
 module Druid
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

data/spec/druid/accessors_spec.rb

@@ -190,7 +190,7 @@ describe Druid::Accessors do
     end
 
     it "should raise error when it does not have expected title" do
-      expect(driver).to receive(:title).twice.and_return("Not Expected")
+      expect(driver).to receive(:title).and_return("Not Expected")
       expect {druid.has_expected_title? }.to raise_error
     end
   end
@@ -484,6 +484,17 @@ describe Druid::Accessors do
         expect(driver).to receive(:select_list)
         expect(druid.state_element).to be_instance_of Druid::Elements::SelectList
       end
+
+      it "should return list of selection options" do
+        option1 = double('option')
+        option2 = double('option')
+        expect(option1).to receive(:text).and_return("CA")
+        expect(option2).to receive(:text).and_return('OH')
+        select_element = double("select")
+        expect(select_element).to receive(:options).twice.and_return([option1,option2])
+        expect(druid).to receive(:state_element).and_return(select_element)
+        expect(druid.state_options).to eql ["CA","OH"]
+      end
     end
   end
 
@@ -634,7 +645,7 @@ describe Druid::Accessors do
       end
 
       it "should call a block on the element method when present" do
-        expect(block_druid.total_cell).to eql "cell"
+        expect(block_druid.total_element).to eql "cell"
       end
     end
 

data/spec/druid/element_locators_spec.rb

@@ -582,15 +582,15 @@ describe Druid::ElementLocators do
     page.label_elements
   end
 
-  it "should find an element" do
+  it "should find an audio element" do
     expect(driver).to receive(:audio).with(:id => 'blah').and_return(driver)
-    element = page.element(:audio, :id => 'blah')
-    expect(element).to be_instance_of Druid::Elements::Element
+    element = page.audio_element(:id => 'blah')
+    expect(element).to be_instance_of Druid::Elements::Audio
   end
 
-  it "should find an element using a default identifier" do
+  it "should find an audio element using a default identifier" do
     expect(driver).to receive(:audio).with(:index => 0).and_return(driver)
-    page.element(:audio)
+    page.audio_element
   end
 
   it "should find an area element" do