druid-ts 1.1.7 → 1.1.8

data/lib/druid/assist.rb

@@ -63,7 +63,7 @@ module Druid
     end
 
     def select_list_value_for identifier
-      process_call("select_list(identifier).options.each {|o| return o.text if o.selected?}", Elements::SelectList, identifier)
+      process_call("select_list(identifier).options.find {|o| o.selected?}.text", Elements::SelectList, identifier)
     end
 
     def select_list_for identifier
@@ -490,6 +490,24 @@ module Druid
       find_element("#{tag.to_s}(identifier)", Elements::Element, identifier, tag.to_s)
     end
 
+    def elements_for(tag, identifier)
+      find_elements("#{tag.to_s}s(identifier)", Elements::Element, identifier, tag.to_s)
+    end
+
+    #
+    # method to return a svg element
+    #
+    def svg_for(identifier)
+      find_element("element(identifier)", Elements::Element, identifier)
+    end
+
+    #
+    # method to return an array of svg elements
+    #
+    def svgs_for(identifier)
+      find_elements("element(identifier)", Elements::Element, identifier)
+    end
+
     private
 
     def find_elements(the_call, type, identifier, tag_name=nil)

data/lib/druid/elements/canvas.rb

@@ -1,7 +1,7 @@
 module Druid
   module Elements
     class Canvas < Element
-
+      
       #
       # return the width of the canvas
       #

data/lib/druid/elements/check_box.rb

@@ -3,7 +3,7 @@ module Druid
     class CheckBox < Element
 
       def self.finders
-        super + [:value]
+        super + [:value, :label]
       end
 
       #

data/lib/druid/elements/element.rb

@@ -349,7 +349,7 @@ module Druid
         how, what = identifier.keys.first, identifier.values.first
         return how => what if find_by.include? how
         return find_by_mapping[how] => what if find_by_mapping[how]
-        return nil => what
+        identifier
       end
 
       def self.finders

data/lib/druid/elements/file_field.rb

@@ -2,7 +2,7 @@ module Druid
   module Elements
     class FileField < Element
       def self.finders
-        super + [:title]
+        super + [:title, :label]
       end
 
       #

data/lib/druid/elements/radio_button.rb

@@ -3,7 +3,7 @@ module Druid
     class RadioButton < Element
 
       def self.finders
-        super + [:value]
+        super + [:value, :label]
       end
       #
       # Select the RadioButton

data/lib/druid/elements/select_list.rb

@@ -3,7 +3,7 @@ module Druid
     class SelectList < Element
 
       def self.finders
-        super + [:value, :text]
+        super + [:value, :text, :label]
       end
 
       def [](idx)

data/lib/druid/elements/text_area.rb

@@ -2,6 +2,9 @@ module Druid
   module Elements
     class TextArea < Element
 
+      def self.finders
+        super + [:label]
+      end
       #
       # Set the value of the TextArea
       #

data/lib/druid/locator_generator.rb

@@ -1,65 +1,109 @@
 module Druid
   module LocatorGenerator
 
+    BASIC_ELEMENTS = [:abbr,
+                      :address,
+                      :article,
+                      :as,
+                      :aside,
+                      :bdi,
+                      :bdo,
+                      :blockquote,
+                      :body,
+                      :br,
+                      :caption,
+                      :cite,
+                      :code,
+                      :col,
+                      :colgroup,
+                      :command,
+                      :data,
+                      :datalist,
+                      :dd,
+                      :del,
+                      :details,
+                      :dfn,
+                      :dialog,
+                      :dl,
+                      :dt,
+                      :em,
+                      :embed,
+                      :fieldset,
+                      :figcaption,
+                      :figure,
+                      :footer,
+                      :head,
+                      :header,
+                      :hgroup,
+                      :hr,
+                      :ins,
+                      :kbd,
+                      :keygen,
+                      :legend,
+                      :map,
+                      :mark,
+                      :menu,
+                      :meta,
+                      :meter,
+                      :nav,
+                      :noscript,
+                      :object,
+                      :optgroup,
+                      :output,
+                      :param,
+                      :pre,
+                      :progress,
+                      :rp,
+                      :rt,
+                      :ruby,
+                      :samp,
+                      :section,
+                      :small,
+                      :strong,
+                      :style,
+                      :sub,
+                      :summary,
+                      :sup,
+                      :time,
+                      :title,
+                      :track,
+                      :var,
+                      :wbr]
+
+    ADVANCED_ELEMENTS = [: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,
+                         :svg]
+
     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|
+       ADVANCED_ELEMENTS.each do |tag|
          target.send(:define_method, "#{tag.to_s}_element") do |*identifier|
            self.send "#{tag.to_s}_for", locator(identifier).clone
          end
@@ -68,6 +112,16 @@ module Druid
            self.send "#{tag.to_s}s_for", identifier[0] ? identifier[0].clone : {}
          end
        end
+
+       BASIC_ELEMENTS.each do |tag|
+         target.send(:define_method, "#{tag.to_s}_element") do |*identifier|
+           self.send :element_for, tag, locator(identifier)
+         end
+
+         target.send(:define_method, "#{tag.to_s}_elements") do |*identifier|
+           self.send(:elements_for, tag, identifier[0] ? identifier[0] : {})
+         end
+       end
     end
   end
 end

data/lib/druid/page_factory.rb

@@ -1,3 +1,5 @@
+require 'page_navigation'
+
 module Druid
   #
   # Module to facilitate to creating of page objects in step definitions.  You
@@ -31,20 +33,21 @@ module Druid
   # to the method
   # You must also call the navigation_method on each page.
   module PageFactory
+    include PageNavigation
     # attr_accessor :page
     #
     # Create and navigate to a page object.  The navigation will only work if the
     # 'page_url' method was call on the page object.
     #
-    # @param [PageObject, String] a class that has included the Druid module or a string containing the name of the class
+    # @param [PageObject, String] a class that has included the
+    # Druid module or a string containing the name of the class
+    # @param Hash values that is pass through to page class a
+    # available in the @params instance variable
     # @param an optional block to be called
     # @return [PageObject] the newly created page object
     #
     def visit_page(page_class, params={:using_params => {}}, &block)
-      page_class = class_from_string(page_class) if page_class.is_a? String
-      merged = page_class.params.merge(params[:using_params])
-      page_class.instance_variable_set("@merged_params", merged) unless merged.empty?
-      on_page page_class, true, &block
+      on_page page_class, params, true, &block
     end
 
     # Support 'visit' for readability of usage
@@ -53,12 +56,16 @@ module Druid
     # Create a page object.
     #
     # @param [PageObject, String] a class that has included the Druid module or a string containing the name of the class
+    # @param  Hash values that is pass through to page class a
+    # available in the @params instance variable.
     # @param [Bool] should the page be visited?  default is false.
     # @param an optional block to be called
     # @return [PageObject] the newly created page object
     #
-    def on_page(page_class, visit=false, &block)
+    def on_page(page_class, params={:using_params => {}}, visit=false, &block)
       page_class = class_from_string(page_class) if page_class.is_a? String
+      merged = page_class.params.merge(params[:using_params])
+      page_class.instance_variable_set("@merged_params", merged) unless merged.empty?
       @current_page = page_class.new(@driver, visit)
       block.call @current_page if block
       @current_page
@@ -82,65 +89,19 @@ module Druid
     #      page.update
     #   end
     # @param [PageObject, String] a class that has included the Druid module or a string containing the name of the class
+    # @param Hash values that is pass through to page class a
+    # available in the @params instance variable
     # @param [block] an optional block to be called
     # @return [PageObject] the newly created page object
-    def if_page(page_class, &block)
+    def if_page(page_class, params={:using_params => {}}, &block)
       page_class = class_from_string(page_class) if page_class.is_a? String
       return @current_page unless @current_page.class == page_class
-      on_page(page_class, false, &block)
+      on_page(page_class, params, false, &block)
     end
 
     # support 'if' for readability of usage
     alias_method :if, :if_page
 
-    #
-    # Navigate to a specific page following a predefined path.
-    #
-    # This method requires a lot of setup.  See the documentation for
-    # this class.  Once the setup is complete you can navigate to a
-    # page traversing through all other pages along the way.  It will
-    # call the method you specified in the routes for each
-    # page as it navigates.  Using the example setup defined in the
-    # documentation above you can call the method two ways:
-    #
-    # @example
-    #   page.navigate_to(PageThree)  # will use the default path
-    #   page.navigate_to(PageThree, :using => :another_route)
-    #
-    # @param [PageObject]  a class that has included the PageObject
-    # module and which has the navigation_method defined
-    # @param [Hash] a hash that contains an element with the key
-    # :using.  This will be used to lookup the route.  It has a
-    # default value of :default.
-    # @param [block]  an optional block to be called
-    # @return [PageObject] the page you are navigating to
-    #
-    def navigate_to(page_cls, how = {:using => :default}, &block)
-      path = path_for how
-      to_index = find_index_for(path, page_cls)-1
-      navigate_through_pages(path[0..to_index])
-      on_page(page_cls, &block)
-    end
-
-    #
-    # Same as navigate_to except it will start at the @current_page
-    # instead the beginning of the path.
-    #
-    # @param [Druid] a class that has included the Druid
-    # module and which has the navigation_method defined
-    # @param [Hash] a hash that contains an element with the key
-    # :using. This will be used to lookup the route. It has a default value of :default.
-    # @param [block] an optional block to be called
-    # @return [Druid] the page you are navigating to
-    #
-    def continue_navigation_to(page_cls, how = {:using => :default}, &block)
-      path = path_for how
-      from_index = find_index_for(path, @current_page.class)+1
-      to_index = find_index_for(path, page_cls)-1
-      navigate_through_pages(path[from_index..to_index])
-      on_page(page_cls, &block)
-    end
-
     private
 
     def class_from_string(str)
@@ -149,32 +110,5 @@ module Druid
       end
     end
 
-    def path_for(how)
-      path = Druid::PageFactory.page_object_routes[how[:using]]
-      fail("PageFactory route :#{how[:using].to_s} not found") unless path
-      path
-    end
-
-    def navigate_through_pages(pages)
-      pages.each do |cls, method, *args|
-        page = on_page(cls)
-        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 }
-    end
-
-    class << self
-      attr_accessor :page_object_routes
-
-      def routes=(routes)
-        raise("You must provide a :default route for PageFactory routes") unless routes[:default]
-        @page_object_routes = routes
-      end
-    end
   end
 end

data/lib/druid/page_populator.rb

@@ -66,7 +66,8 @@ module Druid
 
     def is_enabled?(key)
       return true if (self.send "#{key}_element").tag_name == "textarea"
-      self.send("#{key}_element").enabled?
+      element = self.send("#{key}_element")
+      element.enabled? and element.visible?
     end
   end
 end