druid-ts 1.2.4 → 1.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8af3e9a526cfd660e1eff1bd0f079f5948db7cdd
-  data.tar.gz: 3600c658bdecc5186b1e381619171ef405f9aa9f
+  metadata.gz: a37878faec17d55dc5e46271488aa642a92a3f00
+  data.tar.gz: cf7cfade0356638ddd7e22c310789f33c4cd60a8
 SHA512:
-  metadata.gz: 1b545e4e4936a8117fdb3cbbaa1e18adc92907df2aa815a8bc3a28246cc8d3b5c716362c4774b862c9709640d7dbefaf156ae1125c00eccb1dd0bbfe96b6ee71
-  data.tar.gz: 266b41d2f1557c0580f3fec6871b3299e57d39ecab66f8f0da2901f293782af256c58ba6429ae7d4edee41e31e37a944028a3caee49bc94ed5d9423cb4228ed8
+  metadata.gz: 351a66a011905ed2722a268153d9d9dbfbca1a276a51cbb2681a831823fa4c93785e193983aa8aa7831d9912883c2f160d8eeb55e15840206345b93064c635e9
+  data.tar.gz: 56f28412001a34ad9c26dd3d43fff4141bad3774b567203b03dfdc22d48f5c715137b9cee773d303bf34914f7c360edf92c1d881ffb7b9b5c113cb11f198918a

data/ChangeLog

@@ -1,6 +1,25 @@
-=== 2017-06-12
+=== Version 1.2.5/ 2017-10-16
+* Enhancements
+  * Added the ability to get the values of a table column
+  * Added the ability to populate sections with a nested entry from data_magic
+=== 2017-10-15
+* Enhancements
+  * Added the preceding_sibling method to Element
+  * Added the following_sibling method to Element
+  * Added the siblings method to Element
+  * Added the children method to Element
+  * Added the preceding_siblings method to Element
+  * Added the following_siblings method to Element
+* Fixes
+  * Fixed issue that occurred when things were moved around in Watir 6.8
+=== 2017-10-12
+* Enhancements
+  * Fix bug in integration of frames and sections
+  * delegate select list text method directly to watir
+  * optimize the way to generate a array of symbol
+=== Version 1.2.4/ 2017-06-12
 * Add cookies method to druid
-=== 2017-04-24
+=== Version 1.2.3/ 2017-04-24
 * Removed all direct delegateds. Now relies on method_missing to call Watir methods.
   * You may have to change RSpec matchers to use method instead of predicate.
 === Version 1.2.2/ 2017/02-14

data/Gemfile

@@ -1,4 +1,4 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 # adding rake so travis-ci will build properly
 gem 'rake'

data/druid.gemspec

@@ -18,11 +18,11 @@ Gem::Specification.new do |s|
   s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f)}
   s.require_paths = ["lib"]
-  s.add_dependency "watir", "~> 6.0"
+  s.add_dependency "watir", "~> 6.8"
   s.add_dependency "page_navigation", ">= 0.10"
 
-  s.add_development_dependency "rspec", ">= 3.0.0"
-  s.add_development_dependency "cucumber", ">= 2.0.0"
+  s.add_development_dependency "rspec", "~> 3.0"
+  s.add_development_dependency "cucumber", "~> 2.0"
   s.add_development_dependency "rack", ">= 1.0"
   s.add_development_dependency "net-http-persistent", "~> 3.0"
 

data/features/element.feature

@@ -244,11 +244,6 @@ Feature: Elements
     When I retrieve a button element
     Then I should know its id is "button_id"
 
-  Scenario: Scrolling so an element is visible
-    When I retrieve a heading element
-    And I scroll the heading element into view
-    Then the heading element should be visible
-
   Scenario: Expanding how we find elemnts to include non-stardard locators
     When I retrieve a div using data-entity
     Then I should know it exists

data/features/frames.feature

@@ -70,3 +70,7 @@ Scenario: Accessing elements within the frame using multiple identifiers
   Given I am on the iframe elements page
   When I type "page-object" into the text field for frame 2 using "multiple identifiers"
   Then I should verify "page-object" is in the text field for frame 2 using "multiple identifiers"
+
+Scenario: Frames in sections
+  Given I am on the frame section page
+  Then I should be able to access an element in the frame in the section repeatedly

data/features/html/static_elements.html

@@ -119,6 +119,17 @@
       </tbody>
     </table>
 
+    <table id='table_with_regex' border='1'>
+      <tr>
+        <td>Price1 |</td>
+        <td>$420.99</td>
+      </tr>
+      <tr>
+        <td>Price |</td>
+        <td>$69.99</td>
+      </tr>
+    </table>
+
     <form method="get" action="success.html">
       <input id='button_id' name='button_name' class='button_class' type="submit" value="Click Me"/>
       <input id='button_image_id' type='image' src='images/submit.gif' alt='Submit'/>

data/features/populate_page_with.feature

@@ -0,0 +1,25 @@
+Feature: Populate Page With
+  In order to quickly fill out forms on a page
+  A tester will use the populate_page_with method
+  To fill in text, select options, check boxes, and select radio buttons
+
+  Background:
+    Given I am on the static elements page
+
+  Scenario:
+    When I populate the page with the data:
+      | text_field_id   | abcDEF            |
+      | text_area_id    | abcdefghijklmnop  |
+      | select_list_id  | Test 2            |
+      | cb_id           | check             |
+      | butter_id       | check             |
+      | favorite_cheese | muen              |
+    Then the text field should contain "abcDEF"
+    And the text area should contain "abcdefghijklmnop"
+    And the selected option should be "Test 2"
+    And the First check box should be selected
+    And the "Butter" radio button should be selected
+    And the "muen" radio button should be selected in the group
+    When I populate the page with the data:
+      | select_list_id | option3 |
+    Then the selected option should be "Test/Test 3"

data/features/select_list.feature

@@ -73,6 +73,7 @@ Feature: Select List
   Scenario: Clearing multiple select list
     When I clear multiple select list
     Then multiple select list should have no selected options
+    And cleared multiple select list should return nil for value
 
   Scenario: Selecting an option by its value
     When I select an option using the value "option2"

data/features/step_definations/audio_steps.rb

@@ -19,7 +19,7 @@ Then(/^I should know that the audio is paused$/) do
 end
 
 Then(/^I should know that its volume is (\d+)$/) do |volume|
-  expect(@element.volume).to eql volume.to_i
+  expect(@element.volume).to eql volume.to_f
 end
 
 Given(/^I am on the audio video page$/) do

data/features/step_definations/element_steps.rb

@@ -135,10 +135,6 @@ Then(/^I should know the html is "(.*)"$/) do |html|
   expect(@element.html).to eql html
 end
 
-When(/^I scroll the heading element into view$/) do
-  @element.scroll_into_view
-end
-
 Then(/^the heading element should be visible$/) do
   expect(@element.visible?).to be true
 end

data/features/step_definations/frame_steps.rb

@@ -57,6 +57,41 @@ class IFramePage
   end
 end
 
+class FrameSectionPageSection
+  include Druid
+
+  paragraph :p_in_section
+
+  in_iframe(id: 'three') do |frame|
+    link :success, id: 'four', frame: frame
+  end
+
+end
+
+class FrameSectionPage
+  include Druid
+
+  in_frame(id: 'two') do |frame|
+    page_section :frame_section, FrameSectionPageSection, tag_name: 'body', frame: frame
+    paragraph :p_on_page, frame: frame
+  end
+
+end
+
+Given(/^I am on the frame section page$/) do
+  @page = FrameSectionPage.new(@driver)
+  @page.navigate_to(UrlHelper.nested_frame_elements)
+end
+
+Then(/^I should be able to access an element in the frame in the section repeatedly$/) do
+  expect(@page.p_on_page_element).to be_visible
+  expect(@page.frame_section.p_in_section_element).to be_visible
+  expect(@page.frame_section.success_element).to be_visible
+  expect(@page.frame_section.success_element.text).to eq "this link should open the page success page"
+  @page.frame_section.success
+  expect(@page.text.strip).to eq 'Success'
+end
+
 Given(/^I am on the frame elements page$/) do
   @page = FramePage.new(@driver)
   @page.navigate_to(UrlHelper.frame_elements)

data/features/step_definations/populate_page_with_steps.rb

@@ -0,0 +1,3 @@
+When(/^I populate the page with the data:$/) do |table|
+  @page.populate_page_with table.rows_hash
+end

data/features/step_definations/select_list_steps.rb

@@ -85,3 +85,7 @@ 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
+
+Then(/^cleared multiple select list should return nil for value$/) do
+  expect(@page.select_list_multiple).to be nil
+end

data/features/step_definations/table_steps.rb

@@ -88,3 +88,22 @@ end
 Then(/^the table should be like the expected one$/) do |expected_table|
   expect(expected_table.diff!@element.hashes).to be_nil
 end
+
+When(/^I retrieve a table element with regex characters$/) do
+  @element = @page.table_with_regex_element
+end
+
+When(/^I ask for the column values for "([^"]*)"$/) do |header|
+  @values = @page.table_id_element.column_values(header)
+end
+
+Then(/^I should receive:$/) do |table|
+  expect(@values.size).to eql 2
+  table.hashes.each do |hsh|
+    expect(@values).to include hsh['values']
+  end
+end
+
+When(/^I ask for the column values for column (\d+)$/) do |index|
+  @values = @page.table_id_element.column_values(index.to_i)
+end

data/features/support/page.rb

@@ -124,6 +124,8 @@ class Page
   table(:table_css, :css => '.table_class')
   table(:table_class_index, :class => "table_class", :index => 0)
   table(:table_name_index, :name => "table_name", :index => 0)
+  table(:table_with_regex, :id => 'table_with_regex')
+
 
   cell(:cell_id, :id => 'cell_id')
   cell(:cell_class, :class => 'cell_class')

data/features/table.feature

@@ -104,3 +104,24 @@ Feature: Table
       | Table | Header  |
       | Data1 | Data2   |
       | Data3 | Data4   |
+
+  Scenario: Get rows by text with special chars
+    When I retrieve a table element with regex characters
+    Then the data for row "Price1 |" should be "Price1 |" and "$420.99"
+    And the data for row "rice |" should be "Price |" and "$69.99"
+    And the data for row "$420.99" should be "Price1 |" and "$420.99"
+    And the data for row "$420" should be "Price1 |" and "$420.99"
+
+  Scenario: Retrieving column values using header string
+    When I ask for the column values for "Header"
+    Then I should receive:
+      | values  |
+      | Data2   |
+      | Data4   |
+
+  Scenario: Retrieving column values using a column number
+    When I ask for the column values for column 1
+    Then I should receive:
+      | values  |
+      | Data2   |
+      | Data4   |

data/lib/druid.rb

@@ -2,7 +2,6 @@ require 'watir'
 require 'druid/accessors'
 require 'druid/assist'
 require 'druid/page_factory'
-require 'druid/core_ext/string'
 require 'druid/element_locators'
 require 'druid/page_populator'
 require 'druid/section_collection'

data/lib/druid/assist.rb

@@ -63,7 +63,9 @@ module Druid
     end
 
     def select_list_value_for identifier
-      process_call("select_list(identifier).options.find {|o| o.selected?}.text", Elements::SelectList, identifier)
+      options = process_call("select_list(identifier).selected_options", Elements::SelectList, identifier)
+      return nil if options.empty?
+      options.first.text
     end
 
     def select_list_for identifier
@@ -620,8 +622,9 @@ module Druid
     end
 
     def parse_identifiers(identifier, element, tag_name=nil)
-      frame_identifiers = identifier.delete(:frame)
-      return identifier, frame_identifiers
+      new_identifiers = identifier.dup
+      frame_identifiers = new_identifiers.delete(:frame)
+      return new_identifiers, frame_identifiers
     end
 
     def nested_frames(frame_identifiers)
@@ -632,7 +635,7 @@ module Druid
         identifier = frame.values.first.map do |key, value|
           if value.is_a?(Regexp)
             ":#{key} => #{value.inspect}"
-          elsif value.to_s.is_integer
+          elsif value.is_a? Integer
             ":#{key} => #{value}"
           else
             ":#{key} => '#{value}'"
@@ -644,7 +647,7 @@ module Druid
     end
 
     def switch_to_default_content(frame_identifiers)
-      driver.wd.switch_to.default_content unless frame_identifiers.nil?
+      driver.browser.wd.switch_to.default_content unless frame_identifiers.nil?
     end
   end
 end

data/lib/druid/elements/area.rb

@@ -2,26 +2,6 @@ module Druid
   module Elements
     class Area < Element
 
-      #
-      # Return the coordinates of the area
-      #
-      def coords
-        attribute(:coords)
-      end
-
-      #
-      # Return the shape of the area
-      #
-      def shape
-        attribute(:shape)
-      end
-
-      #
-      # Return the href of the area
-      #
-      def href
-        attribute(:href)
-      end
     end
 
     Druid::Elements.type_to_class[:area] = Druid::Elements::Area

data/lib/druid/elements/check_box.rb

@@ -2,26 +2,6 @@ module Druid
   module Elements
     class CheckBox < Element
 
-      #
-      # Check the checkbox
-      #
-      def check
-        element.set
-      end
-
-      #
-      # Uncheck the CheckBox
-      #
-      def uncheck
-        element.clear
-      end
-
-      #
-      # Return true if checkbox is checked
-      #
-      def checked?
-        element.set?
-      end
     end
 
     Druid::Elements.type_to_class[:checkbox] = Druid::Elements::CheckBox

data/lib/druid/elements/element.rb

@@ -1,4 +1,3 @@
-require 'watir/extensions/select_text'
 require 'druid/nested_elements'
 require 'druid/assist'
 module Druid
@@ -32,94 +31,86 @@ module Druid
         other.is_a? self.class and element == other.element
       end
 
-      #
-      # Get the value of the given attribute of the element
-      # @param [String]
-      # @return [String, nil]
-      #
-      def attribute(attribute_name)
-        element.attribute_value attribute_name
-      end
-
-      #
-      # retrieve the class name for an element
-      #
-      def class_name
-        element.class_name
+      def check_visible(timeout=Druid.default_element_wait)
+        timed_loop(timeout) do |element|
+          element.visible?
+        end
+        # wait_until(timeout: timeout, message: "Element not visible in #{timeout} seconds", &:present?)
       end
+      # alias_method :when_present, :check_visible
+      # alias_method :when_visible, :check_visible
 
-      def inspect
-        element.inspect
+      def check_exist(timeout=Druid.default_element_wait)
+        timed_loop(timeout) do |element|
+          element.exists?
+        end
+        # wait_until(timeout: timeout, &:exist?)
       end
 
       #
-      # Scroll until the element is viewable
+      # find the parent element
       #
-      def scroll_into_view
-        element.wd.location_once_scrolled_into_view
+      def parent(opt = {})
+        parent = element.parent(opt)
+        druid_wrapper(parent)
       end
 
       #
-      # location of element (x,y)
+      # Return the element that exists at the same level of the DOM
+      # immediately prior to this element
       #
-      def location
-        element.wd.location
+      def preceding_sibling(opt = {})
+        sibling = element.preceding_sibling(opt)
+        druid_wrapper(sibling)
       end
 
       #
-      # size of element (width, height)
+      # Return the element that exists at the same level of the DOM
+      # immediately after this element
       #
-      def size
-        element.wd.size
+      def following_sibling(opt={})
+        sibling = element.following_sibling(opt)
+        druid_wrapper(sibling)
       end
 
       #
-      # Get width of element
+      # Return all elements that are direct children of this element's parent
       #
-      def width
-        size['width']
+      def siblings(opt={})
+        siblings = element.siblings(opt)
+        siblings.collect {|sibling| druid_wrapper(sibling)}
       end
 
       #
-      # Get height of element
+      # Return all elements that are children of this element
       #
-      def height
-        size['height']
+      def children(opt={})
+        children = element.children(opt)
+        children.collect {|child| druid_wrapper(child)}
       end
 
       #
-      # Get centre coordinates of element
+      # Return all elements that exist at the same level of the DOM
+      # immediately prior to this element
       #
-      def centre
-        { 'y' => (location['y'] + (size['height']/2)), 'x' => (location['x'] + (size['width']/2)) }
-      end
-
-      def check_visible(timeout=Druid.default_element_wait)
-        timed_loop(timeout) do |element|
-          element.visible?
-        end
-      end
-
-      def check_exist(timeout=Druid.default_element_wait)
-        timed_loop(timeout) do |element|
-          element.exist?
-        end
+      def preceding_siblings(opt={})
+        siblings = element.preceding_siblings(opt)
+        siblings.collect {|sibling| druid_wrapper(sibling)}
       end
 
       #
-      # Returns parent element of current element.
-      def parent
-        parent = element.parent
-        type = element.type if parent.tag_name.to_sym == :input
-        cls = Druid::Elements.element_class_for(parent.tag_name, type)
-        cls.new(parent)
+      # Return all elements that exist at the same level of the DOM
+      # immediately after this element
+      #
+      def following_siblings(opt={})
+        siblings = element.following_siblings(opt)
+        siblings.collect {|sibling| druid_wrapper(sibling)}
       end
 
       #
-      # Waits until the element is present
+      # Wait until the element is present
       #
-      # @param [Integer] (defaults to: 5) seconds to wait before
-      # timing out
+      # @param [Integer] (defaults to: 5) seconds to wait before timing out
       #
       def when_present(timeout=Druid.default_element_wait)
         element.wait_until(timeout: timeout, message: "Element not present in #{timeout} seconds", &:present?)
@@ -133,13 +124,13 @@ module Druid
       # timing out
       #
       def when_not_present(timeout=Druid.default_element_wait)
-        element.wait_while(timeout: timeout, message: "Element still present after #{timeout} seconds", &:present?)
+        element.wait_while(timeout: timeout, message: "Element still present in #{timeout} seconds", &:present?)
       end
 
       #
-      # Waits until the element is visible
+      # Wait until the element is visible
       #
-      # @param [Interger] (default to:5) seconds to wait before timing out
+      # @param [Integer] (defaults to: 5) seconds to wait before timing out
       #
       def when_visible(timeout=Druid.default_element_wait)
         when_present(timeout)
@@ -150,23 +141,28 @@ module Druid
       #
       # Waits until the element is not visible
       #
-      # @param [Integer] (default to:5) seconds to wait before timing out
+      # @param [Integer] (default to: 5) seconds to wait before timing out
       #
       def when_not_visible(timeout=Druid.default_element_wait)
         when_present(timeout)
         element.wait_while(timeout: timeout, message: "Element still visible after #{timeout} seconds", &:visible?)
-        self
       end
 
       #
       # Waits until the block returns true
       #
-      # @param [Integer] (default to:5) seconds to wait before timing out
+      # @param [Integer] (defaults to: 5) seconds to wait before timing out
+      # @param [String] the message to display if the event timeouts
+      # @param the block to execute when the event occurs
       #
       def wait_until(timeout=Druid.default_element_wait, message=nil, &block)
         element.wait_until(timeout: timeout, message: message, &block)
       end
 
+      def name
+        element.attribute(:name)
+      end
+
       # @private
       # delegate calls to driver element
       def method_missing(*args, &block)
@@ -174,17 +170,30 @@ module Druid
         element.send m, *args, &block
       end
 
+      def respond_to_missing?(m,*args)
+        element.respond_to?(m) || super
+      end
+
+      protected
+
+      def druid_wrapper(object)
+        type = element.type if object.tag_name.to_sym == :input
+        cls = Druid::Elements.element_class_for(object.tag_name, type)
+        cls.new(object.to_subtype)
+      end
+
       private
 
       def timed_loop(timeout)
-        end_time = Time.now + timeout
-        until Time.now > end_time
+        end_time = ::Time.now + timeout
+        until ::Time.now > end_time
           result = yield(self)
           return result if result
           sleep 0.5
         end
         false
       end
+
     end
   end
 end