testcentricity_web 2.3.16 → 2.3.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68595e3bcab28823d4fe64782abec19ff6419740
-  data.tar.gz: fe8e3d045f00f1736a5fc7f3456ce474410b2183
+  metadata.gz: df906d46604b41bddf152f1b278b37dbd52bf288
+  data.tar.gz: 88f6d0090a3779394e948fc1a6c598e639e70a9a
 SHA512:
-  metadata.gz: 1d503a58934422dec74065e8cb9bf4707f4d0beb695e0253cbede76c26cd5a755c51021d0e76e1caef8f03983f5b8976c4b24d90dab9ec5ccffd8aee1a7d963d
-  data.tar.gz: c6a71f6edd10a03e6e130640316f247c7f208e6aff571727623d58d6fe176204288c57d88a2c3bb8d8c14acda86758c8265d99efb133875c481b58262802b56f
+  metadata.gz: 604568dc130aa338f194b430bf0ca5e39474175171b701ae54f2fd16cd7fc272d9801a1f94cf043f02a1da510a4e23b7c99ce86f07adeead452dc862db16fc51
+  data.tar.gz: 701cac1a5faefcb72aeff3e5e3c3bee639be52e4a0800224acedcb4cce67f5fea7859dbb00aa2d2eaf1be04a56296f0c08fac8ce1bf5130f96425c76389a4aef

data/README.md

@@ -28,6 +28,11 @@ hosted instances of Chrome, Firefox, Safari, and IE web browsers.
 
 
 ## What's New
+###Version 2.3.17
+
+* Added `List.wait_until_item_count_is` and `List.wait_until_item_count_changes` methods.
+* `UIElement.wait_until_value_is` and `List.wait_until_item_count_is` methods now accept comparison hash.
+
 ###Version 2.3.16
 
 * Added `PageSection.double_click`, `PageObject.right_click`, and `PageObject.send_keys` methods.

data/lib/testcentricity_web/exception_queue_helper.rb

@@ -28,6 +28,50 @@ module TestCentricity
       @error_queue = nil
     end
 
+    def self.enqueue_comparison(state, actual, error_msg)
+      if state.is_a?(Hash) && state.length == 1
+        state.each do |key, value|
+          case key
+            when :lt, :less_than
+              enqueue_exception("#{error_msg} be less than #{value} but found '#{actual}'") unless actual < value
+            when :lt_eq, :less_than_or_equal
+              enqueue_exception("#{error_msg} be less than or equal to #{value} but found '#{actual}'") unless actual <= value
+            when :gt, :greater_than
+              enqueue_exception("#{error_msg} be greater than #{value} but found '#{actual}'") unless actual > value
+            when :gt_eq, :greater_than_or_equal
+              enqueue_exception("#{error_msg} be greater than or equal to  #{value} but found '#{actual}'") unless actual >= value
+            when :starts_with
+              enqueue_exception("#{error_msg} start with '#{value}' but found '#{actual}'") unless actual.start_with?(value)
+            when :ends_with
+              enqueue_exception("#{error_msg} end with '#{value}' but found '#{actual}'") unless actual.end_with?(value)
+            when :contains
+              enqueue_exception("#{error_msg} contain '#{value}' but found '#{actual}'") unless actual.include?(value)
+            when :not_contains, :does_not_contain
+              enqueue_exception("#{error_msg} not contain '#{value}' but found '#{actual}'") if actual.include?(value)
+            when :not_equal
+              enqueue_exception("#{error_msg} not equal '#{value}' but found '#{actual}'") if actual == value
+            when :like, :is_like
+              actual_like = actual.delete("\n")
+              actual_like = actual_like.delete("\r")
+              actual_like = actual_like.delete("\t")
+              actual_like = actual_like.delete(' ')
+              actual_like = actual_like.downcase
+              expected    = value.delete("\n")
+              expected    = expected.delete("\r")
+              expected    = expected.delete("\t")
+              expected    = expected.delete(' ')
+              expected    = expected.downcase
+              enqueue_exception("#{error_msg} be like '#{value}' but found '#{actual}'") unless actual_like.include?(expected)
+            when :translate
+              expected = I18n.t(value)
+              enqueue_assert_equal(expected, actual, error_msg)
+          end
+        end
+      else
+        enqueue_assert_equal(state, actual, error_msg)
+      end
+    end
+
     private
 
     def self.enqueue(message)
@@ -38,7 +82,11 @@ module TestCentricity
       timestamp = Time.now.strftime('%Y%m%d%H%M%S')
       filename = "Screenshot-#{timestamp}"
       path = File.join Dir.pwd, 'reports/screenshots/', filename
-      Capybara.save_screenshot "#{path}.png"
+      if Environ.driver == :appium
+        AppiumConnect.take_screenshot("#{path}.png")
+      else
+        Capybara.save_screenshot "#{path}.png"
+      end
       puts "Screenshot saved at #{path}.png"
       screen_shot = { :path => path, :filename => filename }
       Environ.save_screen_shot(screen_shot)

data/lib/testcentricity_web/page_objects_helper.rb

@@ -595,49 +595,8 @@ module TestCentricity
               end
             end
           end
-
-          if state.is_a?(Hash) && state.length == 1
-            error_msg = "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) #{property} property to"
-            state.each do |key, value|
-              case key
-              when :lt, :less_than
-                ExceptionQueue.enqueue_exception("#{error_msg} be less than #{value} but found '#{actual}'") unless actual < value
-              when :lt_eq, :less_than_or_equal
-                ExceptionQueue.enqueue_exception("#{error_msg} be less than or equal to #{value} but found '#{actual}'") unless actual <= value
-              when :gt, :greater_than
-                ExceptionQueue.enqueue_exception("#{error_msg} be greater than #{value} but found '#{actual}'") unless actual > value
-              when :gt_eq, :greater_than_or_equal
-                ExceptionQueue.enqueue_exception("#{error_msg} be greater than or equal to  #{value} but found '#{actual}'") unless actual >= value
-              when :starts_with
-                ExceptionQueue.enqueue_exception("#{error_msg} start with '#{value}' but found '#{actual}'") unless actual.start_with?(value)
-              when :ends_with
-                ExceptionQueue.enqueue_exception("#{error_msg} end with '#{value}' but found '#{actual}'") unless actual.end_with?(value)
-              when :contains
-                ExceptionQueue.enqueue_exception("#{error_msg} contain '#{value}' but found '#{actual}'") unless actual.include?(value)
-              when :not_contains, :does_not_contain
-                ExceptionQueue.enqueue_exception("#{error_msg} not contain '#{value}' but found '#{actual}'") if actual.include?(value)
-              when :not_equal
-                ExceptionQueue.enqueue_exception("#{error_msg} not equal '#{value}' but found '#{actual}'") if actual == value
-              when :like, :is_like
-                actual_like = actual.delete("\n")
-                actual_like = actual_like.delete("\r")
-                actual_like = actual_like.delete("\t")
-                actual_like = actual_like.delete(' ')
-                actual_like = actual_like.downcase
-                expected    = value.delete("\n")
-                expected    = expected.delete("\r")
-                expected    = expected.delete("\t")
-                expected    = expected.delete(' ')
-                expected    = expected.downcase
-                ExceptionQueue.enqueue_exception("#{error_msg} be like '#{value}' but found '#{actual}'") unless actual_like.include?(expected)
-              when :translate
-                expected = I18n.t(value)
-                ExceptionQueue.enqueue_assert_equal(expected, actual, "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) translated #{property} property")
-              end
-            end
-          else
-            ExceptionQueue.enqueue_assert_equal(state, actual, "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) #{property} property")
-          end
+          error_msg = "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) #{property} property to"
+          ExceptionQueue.enqueue_comparison(state, actual, error_msg)
         end
       end
     rescue ObjectNotFoundError => e

data/lib/testcentricity_web/page_sections_helper.rb

@@ -787,49 +787,8 @@ module TestCentricity
               end
             end
           end
-
-          if state.is_a?(Hash) && state.length == 1
-            error_msg = "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) #{property} property to"
-            state.each do |key, value|
-              case key
-              when :lt, :less_than
-                ExceptionQueue.enqueue_exception("#{error_msg} be less than #{value} but found '#{actual}'") unless actual < value
-              when :lt_eq, :less_than_or_equal
-                ExceptionQueue.enqueue_exception("#{error_msg} be less than or equal to #{value} but found '#{actual}'") unless actual <= value
-              when :gt, :greater_than
-                ExceptionQueue.enqueue_exception("#{error_msg} be greater than #{value} but found '#{actual}'") unless actual > value
-              when :gt_eq, :greater_than_or_equal
-                ExceptionQueue.enqueue_exception("#{error_msg} be greater than or equal to  #{value} but found '#{actual}'") unless actual >= value
-              when :starts_with
-                ExceptionQueue.enqueue_exception("#{error_msg} start with '#{value}' but found '#{actual}'") unless actual.start_with?(value)
-              when :ends_with
-                ExceptionQueue.enqueue_exception("#{error_msg} end with '#{value}' but found '#{actual}'") unless actual.end_with?(value)
-              when :contains
-                ExceptionQueue.enqueue_exception("#{error_msg} contain '#{value}' but found '#{actual}'") unless actual.include?(value)
-              when :not_contains, :does_not_contain
-                ExceptionQueue.enqueue_exception("#{error_msg} not contain '#{value}' but found '#{actual}'") if actual.include?(value)
-              when :not_equal
-                ExceptionQueue.enqueue_exception("#{error_msg} not equal '#{value}' but found '#{actual}'") if actual == value
-              when :like, :is_like
-                actual_like = actual.delete("\n")
-                actual_like = actual_like.delete("\r")
-                actual_like = actual_like.delete("\t")
-                actual_like = actual_like.delete(' ')
-                actual_like = actual_like.downcase
-                expected    = value.delete("\n")
-                expected    = expected.delete("\r")
-                expected    = expected.delete("\t")
-                expected    = expected.delete(' ')
-                expected    = expected.downcase
-                ExceptionQueue.enqueue_exception("#{error_msg} be like '#{value}' but found '#{actual}'") unless actual_like.include?(expected)
-              when :translate
-                expected = I18n.t(value)
-                ExceptionQueue.enqueue_assert_equal(expected, actual, "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) translated #{property} property")
-              end
-            end
-          else
-            ExceptionQueue.enqueue_assert_equal(state, actual, "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) #{property} property")
-          end
+          error_msg = "Expected UI object '#{ui_object.get_name}' (#{ui_object.get_locator}) #{property} property to"
+          ExceptionQueue.enqueue_comparison(state, actual, error_msg)
         end
       end
     rescue ObjectNotFoundError => e

data/lib/testcentricity_web/version.rb

@@ -1,3 +1,3 @@
 module TestCentricityWeb
-  VERSION = '2.3.16'
+  VERSION = '2.3.17'
 end

data/lib/testcentricity_web/web_elements/list.rb

@@ -11,10 +11,10 @@ module TestCentricity
     def define_list_elements(element_spec)
       element_spec.each do |element, value|
         case element
-        when :list_item
-          @list_item = value
-        else
-          raise "#{element} is not a recognized list element"
+          when :list_item
+            @list_item = value
+          else
+            raise "#{element} is not a recognized list element"
         end
       end
     end
@@ -63,11 +63,38 @@ module TestCentricity
 
     def get_list_row_locator(row)
       case @locator_type
-      when :xpath
-        "#{@locator}/#{@list_item}[#{row}]"
-      when :css
-        "#{@locator} > #{@list_item}:nth-of-type(#{row})"
+        when :xpath
+          "#{@locator}/#{@list_item}[#{row}]"
+        when :css
+          "#{@locator} > #{@list_item}:nth-of-type(#{row})"
       end
     end
+
+    # Wait until the list's item_count equals the specified value, or until the specified wait time has expired. If the wait
+    # time is nil, then the wait time will be Capybara.default_max_wait_time.
+    #
+    # @param value [Integer or Hash] value expected or comparison hash
+    # @param seconds [Integer or Float] wait time in seconds
+    # @example
+    #   search_results_list.wait_until_item_count_is(10, 15)
+    #     or
+    #   search_results_list.wait_until_item_count_is({ :greater_than_or_equal => 1 }, 5)
+    #
+    def wait_until_item_count_is(value, seconds = nil)
+      timeout = seconds.nil? ? Capybara.default_max_wait_time : seconds
+      wait = Selenium::WebDriver::Wait.new(timeout: timeout)
+      wait.until { compare(value, get_item_count) }
+    rescue
+      raise "Value of List #{object_ref_message} failed to equal '#{value}' after #{timeout} seconds" unless get_item_count == value
+    end
+
+    def wait_until_item_count_changes(seconds = nil)
+      value = get_item_count
+      timeout = seconds.nil? ? Capybara.default_max_wait_time : seconds
+      wait = Selenium::WebDriver::Wait.new(timeout: timeout)
+      wait.until { get_item_count != value }
+    rescue
+      raise "Value of List #{object_ref_message} failed to change from '#{value}' after #{timeout} seconds" if get_item_count == value
+    end
   end
 end

data/lib/testcentricity_web/web_elements/ui_elements_helper.rb

@@ -301,14 +301,17 @@ module TestCentricity
     # Wait until the object's value equals the specified value, or until the specified wait time has expired. If the wait
     # time is nil, then the wait time will be Capybara.default_max_wait_time.
     #
+    # @param value [String or Hash] value expected or comparison hash
     # @param seconds [Integer or Float] wait time in seconds
     # @example
-    #   card_authorized_label.wait_until_value_is(5, 'Card authorized')
+    #   card_authorized_label.wait_until_value_is('Card authorized', 5)
+    #     or
+    #   total_weight_field.wait_until_value_is({ :greater_than => '250' }, 5)
     #
     def wait_until_value_is(value, seconds = nil)
       timeout = seconds.nil? ? Capybara.default_max_wait_time : seconds
       wait = Selenium::WebDriver::Wait.new(timeout: timeout)
-      wait.until { get_value == value }
+      wait.until { compare(value, get_value) }
     rescue
       raise "Value of UI #{object_ref_message} failed to equal '#{value}' after #{timeout} seconds" unless get_value == value
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testcentricity_web
 version: !ruby/object:Gem::Version
-  version: 2.3.16
+  version: 2.3.17
 platform: ruby
 authors:
 - A.J. Mrozinski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-04 00:00:00.000000000 Z
+date: 2018-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler