druid-ts 1.1.2 → 1.1.3

data/features/step_definations/multi_elements_steps.rb

@@ -294,3 +294,15 @@ end
 Then(/^the text for paragraph (\d+) should be "([^"]*)"$/) do |paragraph_num, text|
   expect(@elements[paragraph_num.to_i - 1].text).to eql text
 end
+
+When(/^I select the labels with class "([^"]*)"$/) do |class_name|
+  @elements = @page.label_elements(:class => class_name)
+end
+
+Then(/^I should have (\d+) labels$/) do |num_labels|
+  expect(@elements.size).to eql num_labels.to_i
+end
+
+Then(/^the text for label (\d+) should be "([^"]*)"$/) do |label_num, text|
+  expect(@elements[label_num.to_i - 1].text).to eql text
+end

data/features/step_definations/nested_elements_steps.rb

@@ -27,6 +27,7 @@ class NestedElementsPage
   h6(:nested_h6) { |page| page.outer_div_element.h6_element }
   paragraph(:nested_paragraph) { |page| page.outer_div_element.paragraph_element }
   file_field(:nested_file_field) { |page| page.outer_div_element.file_field_element }
+  label(:nested_label) { |page| page.outer_div_element.label_element }
   unordered_list(:outer_list, :id => 'outer')
   ordered_list(:ordered_outer, :id => 'ol-outer')
 end
@@ -205,7 +206,14 @@ When(/^I get the outter ordered list$/) do
   @list = @page.ordered_outer_element
 end
 
-
 Then(/^I should see "([^"]*)" for list item (\d+)$/) do |text, item_num|
   expect(@list[item_num.to_i - 1].text).to eql text
 end
+
+When(/^I search for a label located in a div$/) do
+  @label = @page.nested_label_element
+end
+
+Then(/^I should see the nested labels text should be "([^"]*)"$/) do |text|
+  expect(@label.text).to eql text
+end

data/features/step_definations/page_level_actions_steps.rb

@@ -118,3 +118,20 @@ end
 When(/^I press the forward button$/) do
   @page.forward
 end
+
+Then(/^the page should have the expected title$/) do
+  expect(@page).to have_expected_title
+end
+
+Then(/^the page should have the expected element$/) do
+  expect(@page).to have_expected_element
+end
+
+Then(/^the page should not have the expected element$/) do
+  class FakePage
+    include Druid
+    expected_element :blah
+  end
+
+  expect(FakePage.new(@driver)).not_to have_expected_element
+end

data/features/step_definations/select_list_steps.rb

@@ -64,3 +64,8 @@ end
 Then(/^the select list should know that "([^"]*)" is selected$/) do |text|
   expect(@page.select_list_id_element.selected?(text)).to be true
 end
+
+Then(/^the value for the option should be "([^"]*)"$/) do |value|
+  @element = @page.send "select_list_#{@how}_element".to_sym
+  expect(@element.value).to eql value
+end

data/features/support/page.rb

@@ -1,5 +1,9 @@
 class Page
   include Druid
+
+  expected_title "Static Elements Page"
+  expected_element :hello0
+
   page_url("http://www.baidu.com")
 
   link(:google_search_id, :id => "link_id")
@@ -11,6 +15,7 @@ class Page
   link(:google_search_index, :index => 0)
   link(:google_search_link, :link => "Google Search")
   link(:google_search_link_text, :link_text => "Google Search")
+  link(:google_search_css, :css => "a.link_class")
   link(:hello0, {:text => "Hello", :index => 0})
   link(:hello1, {:text => "Hello", :index => 1})
   link(:hello2, {:text => "Hello", :index => 2})
@@ -66,6 +71,7 @@ class Page
   button(:button_value, :value => 'Click Me')
   button(:button_class_index, :class => "button_class", :index => 0)
   button(:button_name_index, :name => "button_name", :index => 0)
+  button(:button_css, :css => "input[type='submit']")
 
   button(:button_image_id, :id => 'button_image_id')
   button(:button_image_src, :src => 'images/submit.gif')
@@ -117,6 +123,15 @@ class Page
   span(:span_class_index, :class => "span_class", :index => 0)
   span(:span_name_index, :name => "span_name", :index => 0)
 
+  label(:label_id, :id => "label_id")
+  label(:label_name, :name => "label_name")
+  label(:label_class, :class => "label_class")
+  label(:label_text, :text => "page-object is the best!")
+  label(:label_index, :index => 0)
+  label(:label_xpath, :xpath => "//label")
+  label(:label_class_index, :class => "label_class", :index => 0)
+  label(:label_name_index, :name => "label_name", :index => 0)
+
   image(:image_id, :id => "image_id")
   image(:image_name, :name => 'image_name')
   image(:image_class, :class => 'image_class')
@@ -257,4 +272,10 @@ class Page
   file_field(:file_field_name_index, :name => 'file_field_name', :index => 0)
 
   link(:child, :id => 'child')
+
+  element(:article_id, :article, :id => 'article_id')
+  element(:header_id, :header, :id => 'header_id')
+  element(:footer_id, :footer, :id => 'footer_id')
+  element(:summary_id, :summary, :id => 'summary_id')
+  element(:details_id, :details, :id => 'details_id')
 end

data/lib/druid.rb

@@ -242,6 +242,13 @@ module Druid
     value
   end
 
+  #
+  # Execute javascript on the browser
+  #
+  def execute_script(script)
+    driver.execute_script(script)
+  end
+
   #
   # Attach to a running window. You can locate the window using either
   # the window's title or url or index, If it failes to connect to a window it will
@@ -267,6 +274,16 @@ module Druid
     end
   end
 
+  #
+  # Find the element that has focus on the page
+  #
+  def element_with_focus
+    element = driver.execute_script("return document.activeElement")
+    type = element.type.to_sym if element.tag_name.to_sym == :input
+    cls = Druid::Elements.element_class_for(element.tag_name, type)
+    cls.new(element)
+  end
+
   #
   # Override the normal showModalDialog call is it opens a window instead of a dialog.
   # You will need to attach to the new window in order to continue.

data/lib/druid/accessors.rb

@@ -11,12 +11,51 @@ module Druid
     # 'goto' method to take you to the page.
     #
     # @param [String] the url for the page.
+    # @param [Symbol] a method name to call to get the url
     #
     def page_url(url)
       define_method("goto") do
+        url = url.kind_of?(Symbol) ? self.send(url) : url
         driver.goto url
       end
     end
+    alias_method :direct_url, :page_url
+
+    #
+    # Creates a method that compares the expected_title of a page against the actual.
+    # @param [String] expected_title the literal expected title for the page
+    # @param [Regexp] expected_title the expected title pattern for the page
+    # @return [Boolean]
+    # @raise An exception if expected_title does not match actual title
+    #
+    # @example Specify 'Google' as the expected title of a page
+    #   expected_title "Google"
+    #   page.has_expected_title?
+    #
+    def expected_title(expected_title)
+      define_method("has_expected_title?") do
+        has_expected_title = expected_title.kind_of?(Regexp) ? expected_title =~ title : expected_title == title
+        raise "Expected title '#{expected_title}' instead of '#{title}'" unless has_expected_title
+        has_expected_title
+      end
+    end
+
+    #
+    # Creates a method that provides a way to initialize a page based upon an expected element
+    # This is useful for pages that load dynamic content
+    # @param [Symbol] the name given to the element in the declaration
+    # @param [optional, Interger] timeout default value is 5 seconds
+    # @return [boolean]
+    #
+    # @example Specify a text box named :address expected on the page within 10 seconds
+    #   expected_element(:address, 10)
+    #   page.has_expected_element?
+    #
+    def expected_element(element_name, timeout=5)
+      define_method("has_expected_element?") do
+        self.respond_to? "#{element_name}_element" and self.send("#{element_name}_element").when_present timeout
+      end
+    end
 
     #
     # Identify an element as existing within a frame or iframe.
@@ -77,6 +116,8 @@ module Druid
     #   :xpath
     #   :link
     #   :link_text
+    #   :css
+    #
     def link(name, identifier=nil, &block)
       define_method(name) do
         return click_link_for identifier.clone unless block_given?
@@ -183,7 +224,7 @@ module Druid
 
     #
     # adds four methods - one to select an item in a drop-down,
-    # another to fetch the currently selected item, another
+    # another to fetch the currently selected item text, another
     # to retrieve the select list element, and another to check the
     # drop down's existence.
     #
@@ -202,7 +243,7 @@ module Druid
     def select_list(name, identifier=nil, &block)
       define_method(name) do
         return select_list_value_for identifier.clone unless block_given?
-        self.send("#{name}_element").value
+        self.send("#{name}_element").options.each {|o| return o.text if o.selected?}
       end
       define_method("#{name}=") do |value|
         return select_list_value_set(identifier.clone, value) unless block_given?
@@ -284,6 +325,7 @@ module Druid
     #   :xpath
     #   :src
     #   :alt
+    #   :css
     #
     def button(name, identifier=nil, &block)
       define_method(name) do
@@ -938,5 +980,71 @@ module Druid
         file_field_for(identifier.clone).exist?
       end
     end
+
+    #
+    # adds three methods - one to retrieve the text from a label,
+    # another to return the label element, and another to check the label's existence.
+    #
+    # @example
+    #   label(:message, :id => 'message')
+    #   # will generate 'message', 'message_element', and 'message?' methods
+    #
+    # @param [String] the name used for the generated methods
+    # @param [Hash] identifier how we find a label. You can use a multiple parameters
+    #  by combining of any of the following except xpath. The valid keys are:
+    #  * :class
+    #  * :id
+    #  * :index
+    #  * :name
+    #  * :text
+    #  * :xpath
+    # @param optional block to be invoked when element method is called
+    #
+    def label(name, identifier=nil, &block)
+      define_method(name) do
+        return label_text_for identifier.clone unless block_given?
+        self.send("#{name}_element").text
+      end
+      define_method("#{name}_element") do
+        return call_block(&block) if block_given?
+        label_for(identifier.clone)
+      end
+      define_method("#{name}?") do
+        return call_block(&block) if block_given?
+        label_for(identifier.clone).exist?
+      end
+      alias_method "#{name}_label".to_sym, "#{name}_element".to_sym
+    end
+
+    #
+    # adds three methods - one to retrieve the text an element, another
+    # to retrieve an element, and another to check the element's existence.
+    #
+    # @example
+    #   element(:titile, :id => 'title')
+    #   # will generate 'title'm 'title_element', and 'title?' methods
+    #
+    # @param [String] the name used for the generated methods
+    # @param [Hash] identifier how we find an element. You can use a multiple parameters
+    # by combining of any of the following except xpath. The valid keys are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    # @param optional block to be invoked when element method is called
+    #
+    def element(name, tag, identifier=nil, &block)
+      define_method("#{name}") do
+        self.send("#{name}_element").text
+      end
+      define_method("#{name}_element") do
+        return call_block(&block) if block_given?
+        element_for(tag, identifier.clone)
+      end
+      define_method("#{name}?") do
+        self.send("#{name}_element").exist?
+      end
+    end
   end
 end

data/lib/druid/assist.rb

@@ -62,7 +62,7 @@ module Druid
     end
 
     def select_list_value_for identifier
-      process_call("select_list(identifier).value", Elements::SelectList, identifier)
+      process_call("select_list(identifier).options.each {|o| return o.text if o.selected?}", Elements::SelectList, identifier)
     end
 
     def select_list_for identifier
@@ -373,6 +373,31 @@ module Druid
       find_element("file_field(identifier)", Elements::FileField, identifier)
     end
 
+    #
+    # method to return the text for a label
+    #
+    def label_text_for(identifier)
+      process_call("label(identifier).text", Elements::Label, identifier, nil, 'label')
+    end
+
+    #
+    # method to return a Druid::Elements::Label element
+    #
+    def label_for(identifier)
+      find_element("label(identifier)", Elements::Label, identifier, 'label')
+    end
+
+    #
+    # method to retrieve an array of label elements
+    #
+    def labels_for(identifier)
+      find_elements("labels(identifier)", Elements::Label, identifier, 'p')
+    end
+
+    def element_for(tag, identifier)
+      find_element("#{tag.to_s}(identifier)", Elements::Element, identifier, tag.to_s)
+    end
+
     private
 
     def find_elements(the_call, type, identifier, tag_name=nil)

data/lib/druid/element_locators.rb

@@ -15,6 +15,7 @@ module Druid
     #   * :xpath
     #   * :src
     #   * :alt
+    #   * :css
     #
     def button_element identifier
       button_for identifier.clone
@@ -23,7 +24,7 @@ module Druid
     #
     # Finds all buttons that match the provided identifier
     #
-    # @param [Hash] identifier how we find a button.  You can use a multiple paramaters
+    # @param [Hash] identifier how we find all buttons.  You can use a multiple paramaters
     #  by combining of any of the following except xpath.  The valid keys are:
     #   * :class
     #   * :id
@@ -34,6 +35,7 @@ module Druid
     #   * :xpath
     #   * :src
     #   * :alt
+    #   * :css
     #
     def button_elements identifier
       buttons_for identifier.clone
@@ -61,7 +63,7 @@ module Druid
     #
     # Finds all text fields that match the provided identifier
     #
-    # @param [Hash] identifier how we find a text field. You can use a multiple parameters
+    # @param [Hash] identifier how we find all text fields. You can use a multiple parameters
     # by combining of any of the following except xpath. The valid keys are:
     #
     #   * :class
@@ -100,7 +102,7 @@ module Druid
     #
     # Finds all hidden fields that match the identifier
     #
-    # @param [Hash] identifier how we find a hidden field. You can use a multiple parameters
+    # @param [Hash] identifier how we find all hidden fields. You can use a multiple parameters
     # by combining of any of the following except xpath. The valid keys are:
     #
     #   * :class
@@ -137,7 +139,7 @@ module Druid
     #
     # Finds all text areas for the provided identifier
     #
-    # @param [Hash] identifier how we find a text area. You can use a multiple parameters
+    # @param [Hash] identifier how we find all text areas. You can use a multiple parameters
     # by combining of any of the following except xpath. The valid keys are:
     #   * :class
     #   * :css
@@ -171,7 +173,7 @@ module Druid
     #
     # Finds all select lists for the provided identifier
     #
-    # @param [Hash] identifier how we find a select list. You can use a multiple paramaters
+    # @param [Hash] identifier how we find all select lists. You can use a multiple paramaters
     # by combining of any of the following except xpath. The valid keys are:
     #   * :class
     #   * :id
@@ -199,6 +201,7 @@ module Druid
     #   * :name
     #   * :xpath
     #   * :text
+    #   * :css
     #
     def link_element identifier
       link_for identifier.clone
@@ -207,7 +210,7 @@ module Druid
     #
     # Finds all links for the provided identifier
     #
-    # @param [Hash] identifier how we find a link. You can use a multiple parameters
+    # @param [Hash] identifier how we find all links. You can use a multiple parameters
     # by combining of any of the following except xpath. The valid keys are:
     #   * :class
     #   * :href
@@ -218,6 +221,7 @@ module Druid
     #   * :name
     #   * :xpath
     #   * :text
+    #   * :css
     #
     def link_elements identifier
       links_for identifier.clone
@@ -794,5 +798,37 @@ module Druid
     def file_field_element identifier
       file_field_for identifier.clone
     end
+
+    #
+    # Finds a label
+    #
+    # @param [Hash] identifier how we find a label. You can use a multiple paramaters
+    # by combining of any of the following except xpath. The valid keys are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :text
+    #   * :xpath
+    #
+    def label_element(identifier)
+      label_for identifier.clone
+    end
+
+    #
+    # Finds all labels that match the provided identifier
+    #
+    # @param [Hash] identifier how we find a label. You can use a multiple paramaters
+    # by combining of any of the following except xpath. The valid keys are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :text
+    #   * :xpath
+    #
+    def label_elements(identifier)
+      labels_for identifier.clone
+    end
   end
 end