druid-ts 1.1.4 → 1.1.5

data/features/step_definations/element_steps.rb

@@ -105,7 +105,28 @@ When(/^I retrieve the label element$/) do
 end
 
 Then(/^I should be able to flash it$/) do
-  sleep 5
   @element.flash
-  sleep 5
+end
+
+class HoverPage
+  include Druid
+
+  link(:hello)
+end
+
+Given(/^I am on the hover page$/) do
+  @page = HoverPage.new(@driver)
+  @page.navigate_to UrlHelper.hover
+end
+
+When(/^I hover over the hello link$/) do
+  @page.hello_element.hover
+end
+
+Then(/^the font size should be "([^"]*)"$/) do |font_size|
+  expect(@page.hello_element.style('font-size')).to eql font_size
+end
+
+Then(/^I should know its id is "([^"]*)"$/) do |id|
+  expect(@element.id).to eql id
 end

data/features/step_definations/page_level_actions_steps.rb

@@ -135,3 +135,38 @@ Then(/^the page should not have the expected element$/) do
 
   expect(FakePage.new(@driver)).not_to have_expected_element
 end
+
+
+When(/^I handle the alert that reloads the page$/) do
+  @msg = @page.alert do
+    @page.alert_button_that_reloads
+  end
+end
+
+When(/^I handle the confirm that reloads the page$/) do
+  @msg = @page.confirm(true) do
+    @page.confirm_button_that_reloads
+  end
+end
+
+When(/^I handle the possible alert$/) do
+  @msg = @page.alert do
+    @page.alert_button_element.focus
+  end
+end
+
+Then(/^I should be able to verify the popup didn't have a message$/) do
+  expect(@msg).to be_nil
+end
+
+When(/^I handle the possible confirm$/) do
+  @msg = @page.confirm(true) do
+    @page.confirm_button_element.focus
+  end
+end
+
+When(/^I handle the possible prompt$/) do
+  @msg = @page.prompt("Tim") do
+    @page.prompt_button_element.focus
+  end
+end

data/features/step_definations/select_list_steps.rb

@@ -81,3 +81,7 @@ end
 When(/^I select an option using the value "([^"]*)"$/) do |value|
   @page.select_list_id_element.select_value(value)
 end
+
+Then(/^the selected option should have a value of "([^"]*)"$/) do |value|
+  expect(@page.select_list_id_element.selected_values[0]).to eql value
+end

data/features/step_definations/table_steps.rb

@@ -71,3 +71,7 @@ end
 Then(/^the data for row "([^"]*)" and column "([^"]*)" should be nil$/) do |row, column|
   expect(@element[row][column]).to be_nil
 end
+
+When(/^I retrieve a table with thead element$/) do
+  @element = @page.table_with_thead_id_element
+end

data/features/step_definations/video_steps.rb

@@ -0,0 +1,19 @@
+When(/^I retrieve the video element$/) do
+  @element = @page.video_id_element
+end
+
+When(/^I search for the video element by "([^"]*)"$/) do |how|
+  @element = @page.send "video_#{how}_element"
+end
+
+When(/^I search for the video element by "([^"]*)" and "([^"]*)"$/) do |param1, param2|
+  @element = @page.send "video_#{param1}_#{param2}_element"
+end
+
+Then(/^I should know the video is not autoplay$/) do
+  expect(@element).not_to be_autoplay
+end
+
+Then(/^I should know that the video is paused$/) do
+  expect(@element).to be_paused
+end

data/features/support/page.rb

@@ -106,6 +106,7 @@ class Page
   table(:table_index, :index => 0)
   table(:table_xpath, :xpath => '//table')
   table(:table_name, :name => 'table_name')
+  table(:table_with_thead_id, :id => 'table_with_thead_id')
   table(:table_class_index, :class => "table_class", :index => 0)
   table(:table_name_index, :name => "table_name", :index => 0)
 
@@ -140,8 +141,8 @@ class Page
   image(:image_id, :id => "image_id")
   image(:image_name, :name => 'image_name')
   image(:image_class, :class => 'image_class')
-  image(:image_index, :index => 0)
-  image(:image_xpath, :xpath => '//img')
+  image(:image_index, :index => 1)
+  image(:image_xpath, :xpath => '//img[2]')
   image(:image_alt, :alt => 'image_alt')
   image(:image_src, :src => 'images/circle.png')
   image(:image_class_index, :class => "image_class", :index => 0)
@@ -173,6 +174,7 @@ class Page
   list_item(:li_name, :name => 'li_name')
   list_item(:li_index, :index => 0)
   list_item(:li_xpath, :xpath => '//li[1]')
+  list_item(:li_text, :text => 'Item One')
   list_item(:li_class_index, :class => "li_class", :index => 0)
   list_item(:li_name_index, :name => "li_name", :index => 0)
 
@@ -206,7 +208,9 @@ class Page
   unordered_list(:ul_class_name, :class => "ul_class", :name => "ul_name")
 
   button(:alert_button, :id => "alert_button")
+  button(:alert_button_that_reloads, :id => 'alert_button_that_reloads')
   button(:confirm_button, :id => "confirm_button")
+  button(:confirm_button_that_reloads, :id => 'confirm_button_that_reloads')
   button(:prompt_button, :id => "prompt_button")
 
   link(:open_window, :text => 'New Window')
@@ -278,6 +282,38 @@ class Page
 
   link(:child, :id => 'child')
 
+  area(:area_id, :id => 'area')
+  area(:area_name, :name => 'area')
+  area(:area_class, :class => 'area')
+  area(:area_index, :index => 0)
+  area(:area_xpath, :xpath => '//area')
+  area(:area_class_index, :class => 'area', :index => 0)
+  area(:area_name_index, :name => 'area', :index => 0)
+
+  canvas(:canvas_id, :id => 'canvas')
+  canvas(:canvas_name, :name => 'canvas')
+  canvas(:canvas_class, :class => 'canvas')
+  canvas(:canvas_index, :index => 0)
+  canvas(:canvas_xpath, :xpath => '//canvas')
+  canvas(:canvas_class_index, :class => 'canvas', :index => 0)
+  canvas(:canvas_name_index, :name => 'canvas', :index => 0)
+
+  audio(:audio_id, :id => 'audio')
+  audio(:audio_name, :name => 'audio')
+  audio(:audio_class, :class => 'audio')
+  audio(:audio_index, :index => 0)
+  audio(:audio_xpath, :xpath => '//audio')
+  audio(:audio_class_index, :class => 'audio', :index => 0)
+  audio(:audio_name_index, :name => 'audio', :index => 0)
+
+  video(:video_id, :id => 'video')
+  video(:video_name, :name => 'video')
+  video(:video_class, :class => 'video')
+  video(:video_index, :index => 0)
+  video(:video_xpath, :xpath => '//video')
+  video(:video_class_index, :class => 'video', :index => 0)
+  video(:video_name_index, :name => 'video', :index => 0)
+
   element(:article_id, :article, :id => 'article_id')
   element(:header_id, :header, :id => 'header_id')
   element(:footer_id, :footer, :id => 'footer_id')

data/features/support/persistent_browser.rb

@@ -3,7 +3,8 @@ module Druid
     @@driver = false
     def self.get_browser
       if !@@driver
-        @@driver = Watir::Browser.new :firefox if ENV['DRIVER'] == 'WATIR'
+        target_browser = ENV['BROWSER'].to_sym
+        @@driver = Watir::Browser.new target_browser if ENV['DRIVER'] == 'WATIR'
       end
       @@driver
     end

data/features/support/url_helper.rb

@@ -40,5 +40,9 @@ module UrlHelper
       "#{files}/multi_elements.html"
     end
 
+    def hover
+      "#{files}/hover.html"
+    end
+
   end
 end

data/features/table.feature

@@ -84,3 +84,11 @@ Feature: Table
     When I retrieve a table element while the script is executing
     Then I should see that the table exists
     And the data for row "1" should be "Data1" and "Data2"
+
+  Scenario: Retrieve data from a table with a thead using a column header
+    When I retrieve a table with thead element
+    Then the data for column "Col1" and row "2" should be "Data1"
+
+  Scenario: Retrieve data from the first row of a table with a thead using a column header
+    When I retrieve a table with thead element
+    Then the data for column "Col1" and row "1" should be "Col1"

data/features/video.feature

@@ -0,0 +1,59 @@
+#Feature: Support for video element
+
+  #Background:
+    #Given I am on the static elements page
+
+  #Scenario: Finding an video element
+    #When I retrieve the video element
+    #Then I should know it exists
+    #And I should know it is visible
+
+  #Scenario Outline: Locating a video element on the page
+    #When I search for the video element by "<search_by>"
+    #Then I should know it is visible
+
+    #Examples:
+      #| search_by |
+      #| id        |
+      #| class     |
+      #| name      |
+      #| xpath     |
+      #| index     |
+
+   #Scenario Outline: Locating videos using multiple parameters
+    #When I search for the video element by "<param1>" and "<param2>"
+     #Then I should know it is visible
+
+     #Examples:
+      # | param1  | param2  |
+       #| class   | index   |
+       #| name    | index   |
+
+   #Scenario Outline: Locating videos using multiple parameters
+    #When I search for the video element by "<param1>" and "<param2>"
+    #Then I should know it is visible
+
+    #Examples:
+    #| param1 | param2 |
+    #| class  | index  |
+    #| name   | index  |
+
+  #Scenario: Should know if it is autoplay
+  #  When I retrieve the video element
+  #  Then I should know the video is not autoplay
+
+  #Scenario: Should know if the controls are displayed
+  #  When I retrieve the video element
+  #  Then I should know that the controls are displayed
+
+  #Scenario: Should know if it is paused
+  #  When I retrieve the video element
+  #  Then I should know that the video is paused
+
+  #Scenario: Should know its duration
+  #  When I retrieve the video element
+  #  Then I should know that the duration is greater than 12 seconds
+
+  #Scenario: Should know its volume
+  #  When I retrieve the video element
+  #  Then I should know that its volume is 1

data/lib/druid/accessors.rb

@@ -139,12 +139,15 @@ module Druid
         # block ? call_block(&block) : link_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         link_for(identifier.clone).exist?
       end
       alias_method "#{name}_link".to_sym, "#{name}_element".to_sym
     end
 
+    alias_method :a, :link
+
+
     #
     # adds four methods to the page objec - one to set text in a text field,
     # another to retrieve text from a text field, another to return the text
@@ -183,7 +186,7 @@ module Druid
         # block ? call_block(&block) : text_field_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         text_field_for(identifier.clone).exist?
       end
       alias_method "#{name}_text_field".to_sym, "#{name}_element".to_sym
@@ -230,7 +233,7 @@ module Druid
         # block ? call_block(&block) : checkbox_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         checkbox_for(identifier.clone).exist?
       end
       alias_method "#{name}_checkbox".to_sym, "#{name}_element".to_sym
@@ -271,11 +274,12 @@ module Druid
         # block ? call_block(&block) : select_list_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         select_list_for(identifier.clone).exist?
       end
       alias_method "#{name}_select_list".to_sym, "#{name}_element".to_sym
     end
+    alias_method :select, :select_list
 
     #
     # adds five methods - one to select, another to clear,
@@ -319,11 +323,12 @@ module Druid
         # block ? call_block(&block) : radio_button_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         radio_button_for(identifier.clone).exist?
       end
       alias_method "#{name}_radio_button".to_sym, "#{name}_element".to_sym
     end
+    alias_method :radio, :radio_button
 
     #
     # adds three methods - one to click a button, another to
@@ -358,7 +363,7 @@ module Druid
         # block ? call_block(&block) : button_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         button_for(identifier.clone).exist?
       end
       alias_method "#{name}_button".to_sym, "#{name}_element".to_sym
@@ -396,7 +401,7 @@ module Druid
         # block ? call_block(&block) : div_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         div_for(identifier.clone).exist?
       end
       alias_method "#{name}_div".to_sym, "#{name}_element".to_sym
@@ -427,7 +432,7 @@ module Druid
         # block ? call_block(&block) : table_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         table_for(identifier.clone).exist?
       end
       alias_method "#{name}_table".to_sym, "#{name}_element".to_sym
@@ -464,11 +469,12 @@ module Druid
         # block ? call_block(&block) : cell_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         cell_for(identifier.clone).exist?
       end
       alias_method "#{name}_cell".to_sym, "#{name}_element".to_sym
     end
+    alias_method :td, :cell
 
     #
     # adds three methods - one to retrieve the text from a span,
@@ -487,6 +493,7 @@ module Druid
     #   * :xpath
     #   * :name
     #   * :text
+    #   * :title
     # @param optional block to be invoked when element method is called
     #
     def span(name, identifier={:index => 0}, &block)
@@ -500,7 +507,7 @@ module Druid
         # block ? call_block(&block) : span_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         span_for(identifier.clone).exist?
       end
       alias_method "#{name}_span".to_sym, "#{name}_element".to_sym
@@ -533,11 +540,12 @@ module Druid
         # block ? call_block(&block) : image_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         image_for(identifier.clone).exist?
       end
       alias_method "#{name}_image".to_sym, "#{name}_element".to_sym
     end
+    alias_method :img, :image
 
     #
     # adds two methods - one to retrieve the form element, and another to
@@ -565,7 +573,7 @@ module Druid
         # block ? call_block(&block) : form_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         form_for(identifier.clone).exist?
       end
       alias_method "#{name}_form".to_sym, "#{name}_element".to_sym
@@ -603,11 +611,12 @@ module Druid
         self.send("#{name}_element").value
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         hidden_field_for(identifier.clone).exist?
       end
       alias_method "#{name}_hidden_field".to_sym, "#{name}_element".to_sym
     end
+    alias_method :hidden, :hidden_field
 
     #
     # adds three methods - one to retrieve the text from a list item,
@@ -626,6 +635,7 @@ module Druid
     #   * :index
     #   * :xpath
     #   * :name
+    #   * :text
     # @param optional block to be invoked when element method is called
     #
     def list_item(name, identifier={:index => 0}, &block)
@@ -639,11 +649,12 @@ module Druid
         # block ? call_block(&block) : list_item_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         list_item_for(identifier.clone).exist?
       end
       alias_method "#{name}_list_item".to_sym, "#{name}_element".to_sym
     end
+    alias_method :li, :list_item
 
     #
     # adds two methods - one to retrieve the ordered list element, and another to
@@ -670,11 +681,12 @@ module Druid
         # block ? call_block(&block) : ordered_list_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         ordered_list_for(identifier.clone).exist?
       end
       alias_method "#{name}_ordered_list".to_sym, "#{name}_element".to_sym
     end
+    alias_method :ol, :ordered_list
 
     #
     # adds four methods to the page object - one to set text in a text area,
@@ -711,11 +723,12 @@ module Druid
         # block ? call_block(&block) : text_area_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         text_area_for(identifier.clone).exist?
       end
       alias_method "#{name}_text_area".to_sym, "#{name}_element".to_sym
     end
+    alias_method :textarea, :text_area
 
     #
     # adds two methods - one to retrieve the unordered list element, and another to
@@ -741,11 +754,12 @@ module Druid
         # block ? call_block(&block) : unordered_list_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         unordered_list_for(identifier.clone).exist?
       end
       alias_method "#{name}_unordered_list".to_sym, "#{name}_element".to_sym
     end
+    alias_method :ul, :unordered_list
 
     #
     # adds three methods - one to retrieve the text of a h1 element, another to
@@ -775,7 +789,7 @@ module Druid
         h1_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         h1_for(identifier.clone).exist?
       end
       alias_method "#{name}_h1".to_sym, "#{name}_element".to_sym
@@ -809,7 +823,7 @@ module Druid
         h2_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         h2_for(identifier.clone).exist?
       end
       alias_method "#{name}_h2".to_sym, "#{name}_element".to_sym
@@ -843,7 +857,7 @@ module Druid
         h3_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         h3_for(identifier.clone).exist?
       end
       alias_method "#{name}_h3".to_sym, "#{name}_element".to_sym
@@ -877,7 +891,7 @@ module Druid
         h4_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         h4_for(identifier.clone).exist?
       end
       alias_method "#{name}_h4".to_sym, "#{name}_element".to_sym
@@ -911,7 +925,7 @@ module Druid
         h5_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         h5_for(identifier.clone).exist?
       end
       alias_method "#{name}_h5".to_sym, "#{name}_element".to_sym
@@ -945,7 +959,7 @@ module Druid
         h6_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         h6_for(identifier.clone).exist?
       end
       alias_method "#{name}_h6".to_sym, "#{name}_element".to_sym
@@ -979,11 +993,12 @@ module Druid
         paragraph_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         paragraph_for(identifier.clone).exist?
       end
       alias_method "#{name}_paragraph".to_sym, "#{name}_element".to_sym
     end
+    alias_method :p, :paragraph
 
     #
     # adds three methods - one to set the file for a file field, another to retrieve
@@ -1014,7 +1029,7 @@ module Druid
         file_field_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? if block_given?
         file_field_for(identifier.clone).exist?
       end
     end
@@ -1048,12 +1063,133 @@ module Druid
         label_for(identifier.clone)
       end
       define_method("#{name}?") do
-        return call_block(&block) if block_given?
+        return call_block(&block).exist? 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 click the area,
+    # another to return the area element, and another to check the area's existence.
+    #
+    # @example
+    #   area(:message, :id => 'message')
+    #   # will generate 'message', 'message_element', and 'message?' methods
+    #
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find an area. You can use a multiple parameters
+    #   by combining of any of the following except xpath. The valid keys are:
+    #   * :class
+    #   * :id
+    #   * :index
+    #   * :name
+    #   * :xpath
+    #   * :text
+    # @param optional block to be invoked when element method is called
+    #
+    def area(name, identifier={:index => 0}, &block)
+      define_method(name) do
+        return click_area_for identifier.clone unless block_given?
+        self.send("#{name}_element").click
+      end
+      define_method("#{name}_element") do
+        return call_block(&block) if block_given?
+        area_for(identifier.clone)
+      end
+      define_method("#{name}?") do
+        return call_block(&block).exist? if block_given?
+        area_for(identifier.clone).exist?
+      end
+    end
+
+    #
+    # adds two method - one to return the canvas element and another to check
+    # the canvas's existence.
+    #
+    # @example
+    #   canvas(:my_canvas, :id => 'canvas_id')
+    #   #  will generate 'my_canvas_element' and 'my_canvas?' methods
+    #
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a canvas. 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 canvas(name, identifier={:index => 0}, &block)
+      define_method("#{name}_element") do
+        return call_block(&block) if block_given?
+        canvas_for(identifier.clone)
+      end
+      define_method("#{name}?") do
+        return call_block(&block).exist? if block_given?
+        canvas_for(identifier.clone).exist?
+      end
+    end
+
+    #
+    # adds two methods - one to return the audio element and another to check
+    # the audio's existence
+    #
+    # @example
+    #   audio(:acdc, :id => 'audio_id')
+    #   # will generate 'acdc_element' and 'acdc?' methods
+    #
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find an audio 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 audio(name, identifier={:index => 0}, &block)
+      define_method("#{name}_element") do
+        return call_block(&block) if block_given?
+        audio_for(identifier.clone)
+      end
+      define_method("#{name}?") do
+        return call_block(&block).exist? if block_given?
+        audio_for(identifier.clone).exist?
+      end
+    end
+
+    #
+    # adds two methods - one to return the video element and another to check
+    # the video's existence
+    #
+    # @example
+    #   video(:movie, :id => 'video_id')
+    #   # will generate 'movie_element' and 'movie?' methods
+    #
+    # @param [Symbol] the name used for the generated methods
+    # @param [Hash] identifier how we find a video 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 video(name, identifier={:index => 0}, &block)
+      define_method("#{name}_element") do
+        return call_block(&block) if block_given?
+        video_for(identifier.clone)
+      end
+      define_method("#{name}?") do
+        return call_block(&block).exist? if block_given?
+        video_for(identifier.clone).exist?
+      end
+    end
+
     #
     # adds three methods - one to retrieve the text an element, another
     # to retrieve an element, and another to check the element's existence.