testcentricity_web 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94ffd88fe954574651b54fba9e6747fd53b465d5
-  data.tar.gz: fea249644cb1b4b87c10539c5d70a40a7f9a3424
+  metadata.gz: bf088aa9322606d81ac794bcbea4d0add3c8e240
+  data.tar.gz: b15d632286aad7fe7b96963ec9270b82f4fcbca3
 SHA512:
-  metadata.gz: 0a7f2e6559be17263e95d568979c6c4c55df1b0a509ca1678ace66a8a771f23eaf7c6b3eed1fbc0e90b556d7f6f0747acc9d580e9e8ea81e29cc82947d22d6ee
-  data.tar.gz: ff98b147a0e30a18ca0cf03a6c391b88742b750a24457b2ff47feb3b8bde69de3f753922fcc17f6b80dedcfd0f784f43200def58ab8c51704b0c3ad36902bc67
+  metadata.gz: 37eeb21e6780778e32782f45dddb4742a18a461ac4d7a6c741088981534f6bff04ba4e0b7dc72d9054acad610f2bb49484148537310ac1e3f297f6d16dff2850
+  data.tar.gz: def87f53539c983c3a9a168e8cd3548025f3634f3ae1225a22de44650f0d992b1883cb95b71c27f47b2a7a4d1b66824e98041166f7f1d5fcbf37e092b1d49be8

data/lib/testcentricity_web/exception_queue_helper.rb

@@ -6,14 +6,14 @@ module TestCentricity
 
     def self.enqueue_assert_equal(expected, actual, error_message)
       unless expected == actual
-        enqueue("#{error_message} to be\n  #{expected}\nbut found\n  #{actual}")
+        enqueue("#{error_message} to be\n  '#{expected}'\nbut found\n  '#{actual}'")
         enqueue_screenshot
       end
     end
 
     def self.enqueue_assert_not_equal(expected, actual, error_message)
       unless expected != actual
-        enqueue("#{error_message} to not be equal to #{expected}")
+        enqueue("#{error_message} to not be equal to '#{expected}'")
         enqueue_screenshot
       end
     end

data/lib/testcentricity_web/page_objects_helper.rb

@@ -458,21 +458,36 @@ module TestCentricity
           when :siebel_options
             actual = ui_object.get_siebel_options
           else
-            props = property.to_s.split('_')
-            case props[0].to_sym
-            when :cell
-              cell = property.to_s.delete('cell_')
-              cell = cell.split('_')
-              actual = ui_object.get_table_cell(cell[0].to_i, cell[1].to_i)
-            when :row
-              row = property.to_s.delete('row_')
-              actual = ui_object.get_table_row(row.to_i)
-            when :column
-              column = property.to_s.delete('column_')
-              actual = ui_object.get_table_column(column.to_i)
-            when :item
-              item = property.to_s.delete('item_')
-              actual = ui_object.get_list_item(item.to_i)
+            if property.is_a?(Hash)
+              property.each do |key, value|
+                case key
+                when :cell
+                  actual = ui_object.get_table_cell(value[0].to_i, value[1].to_i)
+                when :row
+                  actual = ui_object.get_table_row(value.to_i)
+                when :column
+                  actual = ui_object.get_table_column(value.to_i)
+                when :item
+                  actual = ui_object.get_list_item(value.to_i)
+                end
+              end
+            else
+              props = property.to_s.split('_')
+              case props[0].to_sym
+              when :cell
+                cell = property.to_s.delete('cell_')
+                cell = cell.split('_')
+                actual = ui_object.get_table_cell(cell[0].to_i, cell[1].to_i)
+              when :row
+                row = property.to_s.delete('row_')
+                actual = ui_object.get_table_row(row.to_i)
+              when :column
+                column = property.to_s.delete('column_')
+                actual = ui_object.get_table_column(column.to_i)
+              when :item
+                item = property.to_s.delete('item_')
+                actual = ui_object.get_list_item(item.to_i)
+              end
             end
           end
 
@@ -481,23 +496,23 @@ module TestCentricity
             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
+                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
+                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
+                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
+                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)
+                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)
+                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)
+                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)
+                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
+                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")
@@ -509,7 +524,7 @@ module TestCentricity
                 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)
+                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")

data/lib/testcentricity_web/page_sections_helper.rb

@@ -529,21 +529,36 @@ module TestCentricity
           when :siebel_options
             actual = ui_object.get_siebel_options
           else
-            props = property.to_s.split('_')
-            case props[0].to_sym
-            when :cell
-              cell = property.to_s.delete('cell_')
-              cell = cell.split('_')
-              actual = ui_object.get_table_cell(cell[0].to_i, cell[1].to_i)
-            when :row
-              row = property.to_s.delete('row_')
-              actual = ui_object.get_table_row(row.to_i)
-            when :column
-              column = property.to_s.delete('column_')
-              actual = ui_object.get_table_column(column.to_i)
-            when :item
-              item = property.to_s.delete('item_')
-              actual = ui_object.get_list_item(item.to_i)
+            if property.is_a?(Hash)
+              property.each do |key, value|
+                case key
+                when :cell
+                  actual = ui_object.get_table_cell(value[0].to_i, value[1].to_i)
+                when :row
+                  actual = ui_object.get_table_row(value.to_i)
+                when :column
+                  actual = ui_object.get_table_column(value.to_i)
+                when :item
+                  actual = ui_object.get_list_item(value.to_i)
+                end
+              end
+            else
+              props = property.to_s.split('_')
+              case props[0].to_sym
+              when :cell
+                cell = property.to_s.delete('cell_')
+                cell = cell.split('_')
+                actual = ui_object.get_table_cell(cell[0].to_i, cell[1].to_i)
+              when :row
+                row = property.to_s.delete('row_')
+                actual = ui_object.get_table_row(row.to_i)
+              when :column
+                column = property.to_s.delete('column_')
+                actual = ui_object.get_table_column(column.to_i)
+              when :item
+                item = property.to_s.delete('item_')
+                actual = ui_object.get_list_item(item.to_i)
+              end
             end
           end
 
@@ -552,23 +567,23 @@ module TestCentricity
             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
+                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
+                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
+                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
+                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)
+                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)
+                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)
+                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)
+                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
+                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")
@@ -580,7 +595,7 @@ module TestCentricity
                 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)
+                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")

data/lib/testcentricity_web/version.rb

@@ -1,3 +1,3 @@
 module TestCentricityWeb
-  VERSION = '2.0.5'
+  VERSION = '2.0.6'
 end

metadata

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