druid-ts 1.1.3 → 1.1.4

data/lib/druid/elements/div.rb

@@ -3,7 +3,7 @@ module Druid
     class Div < Element
 
       def self.finders
-        [:class, :id, :text, :index, :xpath]
+        super + [:text, :title]
       end
     end
 

data/lib/druid/elements/element.rb

@@ -17,91 +17,6 @@ module Druid
         @driver = @element
       end
 
-      # @private
-      def self.identifier_for identifier
-        if have_to_build_xpath(identifier)
-          how = :xpath
-          what = build_xpath_for(identifier)
-          return how => what
-        else
-          all_identities = {}
-          identifier.each do |key, value|
-            each = {key => value}
-            ident = identifier_for_element each, finders, mapping
-            all_identities[ident.keys.first] = ident.values.first
-          end
-          all_identities
-        end
-      end
-
-      def self.have_to_build_xpath(identifier)
-        ['table', 'span', 'div', 'td', 'li', 'ol', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'label'].include? identifier[:tag_name] and identifier[:name]
-      end
-
-      def self.build_xpath_for identifier
-        tag_locator = identifier.delete(:tag_name)
-        idx = identifier.delete(:index)
-        identifier.delete(:tag_name)
-        xpath = ".//#{tag_locator}"
-        xpath << "[#{attribute_expression(identifier)}]" unless identifier.empty?
-        xpath << "[#{idx+1}]" if idx
-        xpath
-      end
-
-      def self.attribute_expression(identifier)
-        identifier.map do |key, value|
-          if value.kind_of?(Array)
-            "(" + value.map { |v| equal_pair(key, v) }.join(" or ") + ")"
-          else
-            equal_pair(key, value)
-          end
-        end.join(" and ")
-      end
-
-      def self.equal_pair(key, value)
-        if key == :label
-          "@id=//label[normalize-space()=#{xpath_string(value)}]/@for"
-        else
-          "#{lhs_for(key)}=#{xpath_string(value)}"
-        end
-      end
-
-      def self.lhs_for(key)
-        case key
-        when :text, 'text'
-          'normalize-space()'
-        when :href
-          'normalize-space(@href)'
-        else
-          "@#{key.to_s.gsub("_", "-")}"
-        end
-      end
-
-      def self.xpath_string(value)
-        if value.include? "'"
-          parts = value.split("'", -1).map { |part| "'#{part}'" }
-          string = parts.join(%{,"'",})
-          "concat(#{string})"
-        else
-          "'#{value}'"
-        end
-      end
-
-      def self.identifier_for_element identifier, find_by, find_by_mapping
-        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
-      end
-
-      def self.finders
-        [:class, :id, :index, :name, :xpath]
-      end
-
-      def self.mapping
-        {}
-      end
-
       #
       # Get the text for the element
       #
@@ -229,6 +144,13 @@ module Druid
         element.focus
       end
 
+      #
+      # Flash the element by temporarily changing the background color
+      #
+      def flash
+        element.flash
+      end
+
       #
       # Returns parent element of current element.
       def parent
@@ -241,19 +163,30 @@ module Druid
       #
       # Waits until the element is present
       #
-      # @param [Integer] (default to:5) seconds to wait before timing out
+      # @param [Integer] (defaults to: 5) seconds to wait before
+      # timing out
       #
-      def when_present(timeout=5)
+      def when_present(timeout=Druid.default_element_wait)
         element.wait_until_present(timeout)
         self
       end
 
+      #
+      # Waits until the element is not present
+      #
+      # @param [Integer] (defaults to: 5) seconds to wait before
+      # timing out
+      #
+      def when_not_present(timeout=Druid.default_element_wait)
+        element.wait_while_present(timeout)
+      end
+
       #
       # Waits until the element is visible
       #
       # @param [Interger] (default to:5) seconds to wait before timing out
       #
-      def when_visible(timeout=5)
+      def when_visible(timeout=Druid.default_element_wait)
         Watir::Wait.until(timeout, "Element was not visible in #{timeout} seconds") do
           visible?
         end
@@ -265,7 +198,7 @@ module Druid
       #
       # @param [Integer] (default to:5) seconds to wait before timing out
       #
-      def when_not_visible(timeout=5)
+      def when_not_visible(timeout=Druid.default_element_wait)
         Watir::Wait.while(timeout, "Element still visible after #{timeout} seconds") do
           visible?
         end
@@ -277,24 +210,126 @@ module Druid
       #
       # @param [Integer] (default to:5) seconds to wait before timing out
       #
-      def wait_until(timeout=5, message=nil, &block)
+      def wait_until(timeout=Druid.default_element_wait, message=nil, &block)
         Watir::Wait.until(timeout, message, &block)
       end
 
+
+      # @private
+      def self.identifier_for identifier
+        if have_to_build_xpath(identifier)
+          how = :xpath
+          what = build_xpath_for(identifier)
+          return how => what
+        end
+        all_identities = {}
+        identifier.each do |key, value|
+          each = {key => value}
+          ident = identifier_for_element each, finders, mapping
+          all_identities[ident.keys.first] = ident.values.first
+        end
+        all_identities
+        # end
+      end
+
       # @private
       # delegate calls to driver element
       def method_missing(m, *args, &block)
-        puts "*** DEPRECATION WARNING"
-        puts "*** You are calling a method named #{m} at #{caller[0]}."
-        puts "*** This method does not exist in druid so it is being passed to the driver."
-        puts "*** This feature will be removed in the near future."
-        puts "*** Please change your code to call the correct druid method."
-        puts "*** If you are using functionality that does not exist in druid please request it be added."
+        $stderr.puts "*** DEPRECATION WARNING"
+        $stderr.puts "*** You are calling a method named #{m} at #{caller[0]}."
+        $stderr.puts "*** This method does not exist in druid so it is being passed to the driver."
+        $stderr.puts "*** This feature will be removed in the near future."
+        $stderr.puts "*** Please change your code to call the correct druid method."
+        $stderr.puts "*** If you are using functionality that does not exist in druid please request it be added."
         unless element.respond_to?(m)
           raise NoMethodError, "undefined method `#{m}` for #{element.inspect}:#{element.class}"
         end
         element.__send__(m, *args, &block)
       end
+
+      protected
+
+      def self.have_to_build_xpath(identifier)
+        ['table', 'span', 'div', 'td', 'li', 'ol', 'ul', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'p', 'label'].include? identifier[:tag_name] and identifier[:name]
+      end
+
+      def self.build_xpath_for identifier
+        tag_locator = identifier.delete(:tag_name)
+        idx = identifier.delete(:index)
+        if tag_locator == 'input' and identifier[:type] == 'submit'
+          identifier.delete(:type)
+          btn_ident = identifier.clone
+          if btn_ident[:value]
+            btn_ident[:text] = btn_ident[:value]
+            btn_ident.delete(:value)
+          end
+          xpath = ".//button"
+          xpath << "[#{attribute_expression(btn_ident)}]" unless btn_ident.empty?
+          xpath << "[#{idx+1}]" if idx
+          identifier[:type] = %w[button reset submit image]
+          xpath << " | .//input"
+        else
+          xpath = ".//#{tag_locator}"
+        end
+        xpath << "[#{attribute_expression(identifier)}]" unless identifier.empty?
+        xpath << "[#{idx+1}]" if idx
+        xpath
+      end
+
+      def self.attribute_expression(identifier)
+        identifier.map do |key, value|
+          if value.kind_of?(Array)
+            "(" + value.map { |v| equal_pair(key, v) }.join(" or ") + ")"
+          else
+            equal_pair(key, value)
+          end
+        end.join(" and ")
+      end
+
+      def self.equal_pair(key, value)
+        if key == :label
+          "@id=//label[normalize-space()=#{xpath_string(value)}]/@for"
+        else
+          "#{lhs_for(key)}=#{xpath_string(value)}"
+        end
+      end
+
+      def self.lhs_for(key)
+        case key
+        when :text, 'text'
+          'normalize-space()'
+        when :href
+          'normalize-space(@href)'
+        else
+          "@#{key.to_s.gsub("_", "-")}"
+        end
+      end
+
+      def self.xpath_string(value)
+        if value.include? "'"
+          parts = value.split("'", -1).map { |part| "'#{part}'" }
+          string = parts.join(%{,"'",})
+          "concat(#{string})"
+        else
+          "'#{value}'"
+        end
+      end
+
+      def self.identifier_for_element identifier, find_by, find_by_mapping
+        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
+      end
+
+      def self.finders
+        [:class, :id, :index, :name, :xpath]
+      end
+
+      def self.mapping
+        {}
+      end
+
     end
   end
 end

data/lib/druid/elements/hidden_field.rb

@@ -7,11 +7,7 @@ module Druid
       end
 
       def self.finders
-        super + [:tag_name, :text, :value]
-      end
-
-      def self.mapping
-        super.merge({:css => :tag_name})
+        super + [:text, :value]
       end
 
     end

data/lib/druid/elements/link.rb

@@ -5,7 +5,7 @@ module Druid
       protected
 
       def self.finders
-         super + [:href, :text, :css]
+         super + [:href, :text, :css, :title]
       end
 
       def self.mapping

data/lib/druid/elements/select_list.rb

@@ -21,6 +21,14 @@ module Druid
         element.select(value)
       end
 
+      #
+      # Select the options whose value attribute matches the Given
+      # string
+      #
+      def select_value(value)
+        element.select_value(value)
+      end
+
       #
       # @return [Array<sTRING>] An array of strings representing the text value of the currently selected options.
       #

data/lib/druid/elements/span.rb

@@ -3,7 +3,7 @@ module Druid
     class Span < Element
 
       def self.finders
-        [:class, :id, :index, :xpath, :text]
+        [:class, :id, :index, :xpath, :text, :title]
       end
 
     end

data/lib/druid/elements/table.rb

@@ -3,13 +3,16 @@ module Druid
     class Table < Element
       #
       # Return the Druid::Elements::Table for the index provided.  Index
-      # is zero based.
+      # is zero based. If the index provided is a String then it
+      # will be matched with the text from any column. The text can be
+      # a substring of the full column text.
       #
       # @return [Druid::Elements::Table]
       #
       def [](idx)
-        table_row = element[idx]
-        Druid::Elements::TableRow.new(table_row)
+        idx = find_index_by_title(idx) if idx.kind_of?(String)
+        return nil unless idx
+        Druid::Elements::TableRow.new(element[idx])
       end
       #
       # Returns the number of rows in the table.
@@ -42,6 +45,14 @@ module Druid
         self[-1]
       end
 
+      private
+
+      def find_index_by_title(row_title)
+        element.rows.find_index do |row|
+          row.cells.any? { |col| col.text.include? row_title}
+        end
+      end
+
     end
 
     Druid::Elements.tag_to_class[:table] = Druid::Elements::Table

data/lib/druid/elements/table_row.rb

@@ -1,9 +1,16 @@
 module Druid
   module Elements
     class TableRow < Element
+
+      #
+      # Return the Druid::Elements::TableCell for the index provided. Index
+      # is zero based. If the index provided is a String then it
+      # will be matched with the text from the columns in the first row.
+      #
       def [](idx)
-        table_cell = element[idx]
-        Druid::Elements::TableCell.new(table_cell)
+        idx = find_index_by_title(idx) if idx.kind_of?(String)
+        return nil unless idx
+        Druid::Elements::TableCell.new(element[idx])
       end
       #
       # Returns the number of rows in the table.
@@ -18,6 +25,14 @@ module Druid
         end
       end
 
+      private
+
+      def find_index_by_title(title)
+        table = element.parent
+        first_row = table[0]
+        first_row.cells.find_index { |column| column.text.include? title}
+      end
+
     end
 
     Druid::Elements.tag_to_class[:tr] = Druid::Elements::TableRow

data/lib/druid/elements/text_area.rb

@@ -2,14 +2,6 @@ module Druid
   module Elements
     class TextArea < Element
 
-      def self.finders
-        super + [:tag_name]
-      end
-
-      def self.mapping
-        super.merge({:css => :tag_name})
-      end
-
       #
       # Set the value of the TextArea
       #

data/lib/druid/elements/text_field.rb

@@ -3,7 +3,7 @@ module Druid
     class TextField < Element
 
       def self.finders
-        super + [:css, :tag_name, :text, :title]
+        super + [:text, :title, :label]
       end
 
       #

data/lib/druid/javascript/yui.rb

@@ -0,0 +1,19 @@
+module Druid
+  module Javascript
+
+    module YUI
+      #
+      # return the number of pending ajax requests
+      #
+      def self.pending_requests
+         "var inProgress=0
+         for(var i=0; i < YAHOO.util.Connect._transaction_id; i++) {
+           if(YAHOO.util.Connect.isCallInProgress(i))
+             inProgress++;
+         }
+         return inProgress;"
+      end
+    end
+
+  end
+end