testcentricity 2.3.13 → 2.3.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97150cfd69ebee4848af8b0d2d9cf37e5ca816aa
-  data.tar.gz: 78104785082fbdc52d40793fc9bf1bb9199004c9
+  metadata.gz: 57c238014ed1bde365574c49dfd63c8e9716ea5e
+  data.tar.gz: a6bbe0079660a63178e943152ebac311c710f9f5
 SHA512:
-  metadata.gz: 904ae29d561d67a8917ff72520ce10b9743d323edf934603dc744e6259280439c939dd6700a90229cbfba533276f25568681a3d02b30217c4655682ccb6489ff
-  data.tar.gz: 080dec95c5a11b14bd53926ef039c3c412f70b65e11c5efe4382e9c65392b66b25077e309d0a3f4c1a078ffcc28017135e3c0879188bad28d56a0377f60b9d11
+  metadata.gz: 0f758a336d3f13a2257a7661160f2019725b98ec108146e9ec2b4c3ae540608721d246ac0b4c559f227234aae2238815b9a08f11ebeb2ac637fed6530e17222e
+  data.tar.gz: d06d2ffca2e97581347f713eefe91b5ed177ba350419c85f3b75dc549c04a507dd5da982db3f1e3800567df1adc42aa5d56f4112a921c5442f546e57147b6f9f

data/README.md

@@ -28,6 +28,10 @@ hosted instances of Chrome, Firefox, Safari, and IE web browsers.
 
 
 ## What's New
+###Version 2.3.14
+
+* Updated device profiles for iPhone 7 (iOS 10) with MS Edge browser.
+
 ###Version 2.3.13
 
 * Added `AppiumServer.start`, `AppiumServer.running?`, and `AppiumServer.stop` methods for starting and stopping the Appium Server prior to executing tests on

data/lib/devices/devices.yml

@@ -77,7 +77,7 @@
   :css_width: 375
   :css_height: 667
   :default_orientation: portrait
-  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.0 EdgiOS/41.9.0.0 Mobile/14G60 Safari/603.3.8"
+  :user_agent: "Mozilla/5.0 (iPhone; CPU iPhone OS 10_3_3 like Mac OS X) AppleWebKit/603.3.8 (KHTML, like Gecko) Version/10.0 EdgiOS/41.10.1.0 Mobile/14G60 Safari/603.3.8"
 :iphone8:
   :name: "iPhone 8"
   :os: ios

data/lib/testcentricity.rb

@@ -52,6 +52,8 @@ require 'testcentricity/app_elements/label'
 require 'testcentricity/app_elements/switch'
 require 'testcentricity/app_elements/textfield'
 require 'testcentricity/app_elements/list'
+require 'testcentricity/app_elements/image'
+require 'testcentricity/app_elements/alert'
 
 
 module TestCentricity

data/lib/testcentricity/app_core/appium_connect_helper.rb

@@ -80,6 +80,8 @@ module TestCentricity
       @running = true
       Appium.promote_appium_methods TestCentricity::ScreenObject
       Appium.promote_appium_methods TestCentricity::AppUIElement
+
+      Environ.screen_size = $driver.window_size
     end
 
     def self.quit_driver
@@ -134,6 +136,10 @@ module TestCentricity
       $driver.is_keyboard_shown
     end
 
+    def self.set_orientation(orientation)
+      $driver.rotation = orientation.downcase.to_sym
+    end
+
     def self.set_geolocation(latitude, longitude, altitude)
       $driver.set_location(latitude, longitude, altitude)
     end
@@ -149,6 +155,23 @@ module TestCentricity
     def self.available_contexts
       $driver.available_contexts
     end
+
+    def self.default_context
+      $driver.switch_to_default_context
+    end
+
+    def self.is_webview?
+      $driver.current_context.start_with?('WEBVIEW')
+    end
+
+    def self.is_native_app?
+      $driver.current_context.start_with?('NATIVE_APP')
+    end
+
+    def self.webview_context
+      contexts = available_contexts
+      set_context(contexts[1])
+    end
   end
 end
 

data/lib/testcentricity/app_core/screen_objects_helper.rb

@@ -4,50 +4,112 @@ module TestCentricity
   class ScreenObject
     include Test::Unit::Assertions
 
-    attr_reader :strategy, :locator
+    attr_reader :locator
 
     def initialize
-      raise "Screen object #{self.class.name} does not have a page_locator trait defined" unless defined?(page_locator)
-      @strategy = page_locator[0].to_sym
-      @locator  = page_locator[1]
+      raise "Screen object #{self.class.name} does not have a page_name trait defined" unless defined?(page_name)
+      @locator = page_locator if defined?(page_locator)
     end
 
     def self.trait(trait_name, &block)
       define_method(trait_name.to_s, &block)
     end
 
-    def self.element(element_name, strategy, locator)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppUIElement.new("#{element_name}", self, "#{strategy}", "#{locator}", :page);end))
+    def self.element(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppUIElement.new("#{element_name}", self, #{locator}, :page);end))
     end
 
-    def self.button(element_name, strategy, locator)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppButton.new("#{element_name}", self, "#{strategy}", "#{locator}", :page);end))
+    def self.elements(element_hash)
+      element_hash.each do |element_name, locator|
+        element(element_name, locator)
+      end
+    end
+
+    def self.button(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppButton.new("#{element_name}", self, #{locator}, :page);end))
     end
 
-    def self.textfield(element_name, strategy, locator)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppTextField.new("#{element_name}", self, "#{strategy}", "#{locator}", :page);end))
+    def self.buttons(element_hash)
+      element_hash.each do |element_name, locator|
+        button(element_name, locator)
+      end
     end
 
-    def self.switch(element_name, strategy, locator)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppSwitch.new("#{element_name}", self, "#{strategy}", "#{locator}", :page);end))
+    def self.textfield(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppTextField.new("#{element_name}", self, #{locator}, :page);end))
     end
 
-    def self.checkbox(element_name, strategy, locator)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppCheckBox.new("#{element_name}", self, "#{strategy}", "#{locator}", :page);end))
+    def self.textfields(element_hash)
+      element_hash.each do |element_name, locator|
+        textfield(element_name, locator)
+      end
     end
 
-    def self.label(element_name, strategy, locator)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppLabel.new("#{element_name}", self, "#{strategy}", "#{locator}", :page);end))
+    def self.switch(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppSwitch.new("#{element_name}", self, #{locator}, :page);end))
     end
 
-    def self.list(element_name, strategy, locator)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppList.new("#{element_name}", self, "#{strategy}", "#{locator}", :page);end))
+    def self.switches(element_hash)
+      element_hash.each do |element_name, locator|
+        switch(element_name, locator)
+      end
+    end
+
+    def self.checkbox(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppCheckBox.new("#{element_name}", self, #{locator}, :page);end))
+    end
+
+    def self.checkboxes(element_hash)
+      element_hash.each do |element_name, locator|
+        checkbox(element_name, locator)
+      end
+    end
+
+    def self.label(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppLabel.new("#{element_name}", self, #{locator}, :page);end))
+    end
+
+    def self.labels(element_hash)
+      element_hash.each do |element_name, locator|
+        label(element_name, locator)
+      end
+    end
+
+    def self.list(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppList.new("#{element_name}", self, #{locator}, :page);end))
+    end
+
+    def self.lists(element_hash)
+      element_hash.each do |element_name, locator|
+        list(element_name, locator)
+      end
+    end
+
+    def self.image(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppImage.new("#{element_name}", self, #{locator}, :page);end))
+    end
+
+    def self.images(element_hash)
+      element_hash.each do |element_name, locator|
+        image(element_name, locator)
+      end
+    end
+
+    def self.alert(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppAlert.new("#{element_name}", self, #{locator}, :page);end))
     end
 
     def self.section(section_name, class_name)
       class_eval(%(def #{section_name};@#{section_name} ||= #{class_name}.new("#{section_name}", self, :page);end))
     end
 
+    def self.sections(section_hash)
+      section_hash.each do |section_name, class_name|
+        section(section_name, class_name)
+      end
+    end
+
+
     def open_portal
       environment = Environ.current
 
@@ -56,10 +118,32 @@ module TestCentricity
 
     def verify_page_exists
       wait = Selenium::WebDriver::Wait.new(timeout: Environ.default_max_wait_time)
-      wait.until { $driver.find_element(@strategy.to_sym, @locator).displayed? }
+      wait.until { exists? }
       PageManager.current_page = self
     rescue
-      raise "Could not find page_locator for screen object '#{self.class.name}' (:#{@strategy}, #{@locator}) after #{Environ.default_max_wait_time} seconds"
+      raise "Could not find page_locator for screen object '#{self.class.name}' (#{@locator}) after #{Environ.default_max_wait_time} seconds"
+    end
+
+    def exists?
+      @locator.is_a?(Array) ? tries ||= 2 : tries ||= 1
+      if @locator.is_a?(Array)
+        loc = @locator[tries - 1]
+        find_element(loc.keys[0], loc.values[0])
+      else
+        find_element(@locator.keys[0], @locator.values[0])
+      end
+      true
+    rescue
+      retry if (tries -= 1) > 0
+      false
+    end
+
+    def wait_until_gone(seconds = nil)
+      timeout = seconds.nil? ? Environ.default_max_wait_time : seconds
+      wait = Selenium::WebDriver::Wait.new(timeout: timeout)
+      wait.until { !exists? }
+    rescue
+      raise "Screen object #{self.class.name} remained visible after #{timeout} seconds" if exists?
     end
 
     def navigate_to; end
@@ -67,6 +151,7 @@ module TestCentricity
     def verify_page_ui; end
 
     def load_page
+      navigate_to unless exists?
       verify_page_exists
       PageManager.current_page = self
     end
@@ -77,10 +162,8 @@ module TestCentricity
       ui_states.each do |ui_object, object_states|
         object_states.each do |property, state|
 
-
           puts "#{ui_object.get_name} - #{property} = #{state}" if ENV['DEBUG']
 
-
           case property
           when :exists
             actual = ui_object.exists?
@@ -104,10 +187,22 @@ module TestCentricity
             actual = ui_object.tag_name
           when :placeholder
             actual = ui_object.get_placeholder
+          when :readonly
+            actual = ui_object.read_only?
+          when :maxlength
+            actual = ui_object.get_max_length
           when :items
             actual = ui_object.get_list_items
           when :itemcount
             actual = ui_object.get_item_count
+          when :width
+            actual = ui_object.width
+          when :height
+            actual = ui_object.height
+          when :x
+            actual = ui_object.x_loc
+          when :y
+            actual = ui_object.y_loc
           end
 
           if state.is_a?(Hash) && state.length == 1

data/lib/testcentricity/app_core/screen_sections_helper.rb

@@ -7,7 +7,6 @@ module TestCentricity
     attr_reader   :context, :name
     attr_accessor :locator
     attr_accessor :parent
-    attr_accessor :strategy
     attr_accessor :parent_list
     attr_accessor :list_index
 
@@ -17,50 +16,31 @@ module TestCentricity
       @context     = context
       @parent_list = nil
       @list_index  = nil
-      @strategy    = nil
       @locator     = nil
     end
 
     def get_locator
-      if @locator.nil? && defined?(section_locator)
-        @strategy = section_locator[0]
-        @locator  = section_locator[1]
-      end
-
+      @locator = section_locator
       locators = []
       if @context == :section && !@parent.nil?
-        parent_strategy, parent_locator = @parent.get_locator
+        locators.push(@parent.get_locator)
       end
 
       if @parent_list.nil?
-        if parent_strategy == @strategy
-          locators.push([@strategy, @locator])
-        else
-          locators.push([parent_strategy, parent_locator]) unless parent_strategy.nil?
-          locators.push([@strategy, "#{parent_locator}#{@locator}"])
-        end
+        locators.push(@locator)
       else
-        list_strategy, list_locator = @parent_list.get_locator
-        if parent_strategy == list_strategy
-          list_locator = "#{parent_locator}#{list_locator}"
+        locators.push(@parent_list.get_locator)
+        if @list_index.nil?
+          locators.push(@locator)
         else
-          locators.push([parent_strategy, parent_locator]) unless parent_strategy.nil?
+          list_key = @locator.keys[0]
+          list_value = "#{@locator.values[0]}[#{@list_index}]"
+          locators.push( { list_key => list_value } )
         end
-        if list_strategy == @strategy
-          obj_locator = "#{list_locator}#{@locator}"
-        else
-          obj_locator = @locator
-          locators.push([list_strategy, list_locator])
-        end
-        unless @list_index.nil?
-          obj_locator = "#{obj_locator}[#{@list_index}]"
-        end
-        locators.push([@strategy, obj_locator])
       end
       locators
     end
 
-
     def set_list_index(list, index = 1)
       @parent_list = list unless list.nil?
       @list_index  = index
@@ -92,54 +72,114 @@ module TestCentricity
       @parent = parent
     end
 
-
     def self.trait(trait_name, &block)
       define_method(trait_name.to_s, &block)
     end
 
-    def self.element(element_name, strategy, locator)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppUIElement.new("#{element_name}", self, "#{strategy}", "#{locator}", :section);end))
+    def self.element(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppUIElement.new("#{element_name}", self, #{locator}, :section);end))
+    end
+
+    def self.elements(element_hash)
+      element_hash.each do |element_name, locator|
+        element(element_name, locator)
+      end
+    end
+
+    def self.button(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppButton.new("#{element_name}", self, #{locator}, :section);end))
+    end
+
+    def self.buttons(element_hash)
+      element_hash.each do |element_name, locator|
+        button(element_name, locator)
+      end
+    end
+
+    def self.textfield(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppTextField.new("#{element_name}", self, #{locator}, :section);end))
+    end
+
+    def self.textfields(element_hash)
+      element_hash.each do |element_name, locator|
+        textfield(element_name, locator)
+      end
+    end
+
+    def self.switch(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppSwitch.new("#{element_name}", self, #{locator}, :section);end))
+    end
+
+    def self.switches(element_hash)
+      element_hash.each do |element_name, locator|
+        switch(element_name, locator)
+      end
+    end
+
+    def self.checkbox(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppCheckBox.new("#{element_name}", self, #{locator}, :section);end))
+    end
+
+    def self.checkboxes(element_hash)
+      element_hash.each do |element_name, locator|
+        checkbox(element_name, locator)
+      end
+    end
+
+    def self.label(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppLabel.new("#{element_name}", self, #{locator}, :section);end))
     end
 
-    def self.button(element_name, strategy, locator)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppButton.new("#{element_name}", self, "#{strategy}", "#{locator}", :section);end))
+    def self.labels(element_hash)
+      element_hash.each do |element_name, locator|
+        label(element_name, locator)
+      end
     end
 
-    def self.textfield(element_name, strategy, locator)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppTextField.new("#{element_name}", self, "#{strategy}", "#{locator}", :section);end))
+    def self.list(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppList.new("#{element_name}", self, #{locator}, :section);end))
     end
 
-    def self.switch(element_name, strategy, locator)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppSwitch.new("#{element_name}", self, "#{strategy}", "#{locator}", :section);end))
+    def self.lists(element_hash)
+      element_hash.each do |element_name, locator|
+        list(element_name, locator)
+      end
     end
 
-    def self.checkbox(element_name, strategy, locator)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppCheckBox.new("#{element_name}", self, "#{strategy}", "#{locator}", :section);end))
+    def self.image(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppImage.new("#{element_name}", self, #{locator}, :section);end))
     end
 
-    def self.label(element_name, strategy, locator)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppLabel.new("#{element_name}", self, "#{strategy}", "#{locator}", :section);end))
+    def self.images(element_hash)
+      element_hash.each do |element_name, locator|
+        image(element_name, locator)
+      end
     end
 
-    def self.list(element_name, strategy, locator)
-      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppList.new("#{element_name}", self, "#{strategy}", "#{locator}", :section);end))
+    def self.alert(element_name, locator)
+      class_eval(%(def #{element_name};@#{element_name} ||= TestCentricity::AppAlert.new("#{element_name}", self, #{locator}, :page);end))
     end
 
     def self.section(section_name, class_name)
       class_eval(%(def #{section_name};@#{section_name} ||= #{class_name}.new("#{section_name}", self, :section);end))
     end
 
+    def self.sections(section_hash)
+      section_hash.each do |section_name, class_name|
+        section(section_name, class_name)
+      end
+    end
 
 
     def click
       section = find_section
-      raise "Section object '#{get_name}' (#{get_locator}) not found" unless section
+      section_not_found_exception(section)
       section.click
     end
 
     def tap
       section = find_section
-      raise "Section object '#{get_name}' (#{get_locator}) not found" unless section
+      section_not_found_exception(section)
       x = section.location.x
       y = section.location.y
       tap_action = Appium::TouchAction.new.tap(element: section, x: x, y: y)
@@ -148,7 +188,7 @@ module TestCentricity
 
     def double_tap
       section = find_section
-      raise "Section object '#{get_name}' (#{get_locator}) not found" unless section
+      section_not_found_exception(section)
       x = section.location.x
       y = section.location.y
       tap_action = Appium::TouchAction.new.double_tap(element: section, x: x, y: y)
@@ -162,13 +202,13 @@ module TestCentricity
 
     def enabled?
       section = find_section
-      raise "Section object '#{get_name}' (#{get_locator}) not found" unless section
+      section_not_found_exception(section)
       section.enabled?
     end
 
     def disabled?
       section = find_section
-      raise "Section object '#{get_name}' (#{get_locator}) not found" unless section
+      section_not_found_exception(section)
       section.enabled?
     end
 
@@ -217,14 +257,40 @@ module TestCentricity
     end
 
 
+
+    def width
+      section = find_section
+      section_not_found_exception(section)
+      section.size.width
+    end
+
+    def height
+      section = find_section
+      section_not_found_exception(section)
+      section.size.height
+    end
+
+    def x_loc
+      section = find_section
+      section_not_found_exception(section)
+      section.location.x
+    end
+
+    def y_loc
+      section = find_section
+      section_not_found_exception(section)
+      section.location.y
+    end
+
+
+
+
     def verify_ui_states(ui_states)
       ui_states.each do |ui_object, object_states|
         object_states.each do |property, state|
 
-
           puts "#{ui_object.get_name} - #{property} = #{state}" if ENV['DEBUG']
 
-
           case property
           when :exists
             actual = ui_object.exists?
@@ -248,10 +314,22 @@ module TestCentricity
             actual = ui_object.tag_name
           when :placeholder
             actual = ui_object.get_placeholder
+          when :readonly
+            actual = ui_object.read_only?
+          when :maxlength
+            actual = ui_object.get_max_length
           when :items
             actual = ui_object.get_list_items
           when :itemcount
             actual = ui_object.get_item_count
+          when :width
+            actual = ui_object.width
+          when :height
+            actual = ui_object.height
+          when :x
+            actual = ui_object.x_loc
+          when :y
+            actual = ui_object.y_loc
           end
 
           if state.is_a?(Hash) && state.length == 1
@@ -324,9 +402,24 @@ module TestCentricity
     private
 
     def find_section
-      find_element(@strategy, @locator)
+      obj = nil
+      locators = get_locator
+      locators.each do |loc|
+        if obj.nil?
+          obj = find_element(loc.keys[0], loc.values[0])
+          puts "Found object #{loc}" if ENV['DEBUG']
+        else
+          obj = obj.find_element(loc.keys[0], loc.values[0])
+          puts "Found object #{loc}" if ENV['DEBUG']
+        end
+      end
+      obj
     rescue
       nil
     end
+
+    def section_not_found_exception(obj)
+      raise "Section object '#{get_name}' (#{get_locator}) not found" unless obj
+    end
   end
 end

data/lib/testcentricity/app_elements/alert.rb

@@ -0,0 +1,27 @@
+module TestCentricity
+  class AppAlert < AppUIElement
+    def initialize(name, parent, locator, context)
+      super
+      @type = :alert
+    end
+
+    def await(seconds)
+      timeout = seconds.nil? ? Environ.default_max_wait_time : seconds
+      wait = Selenium::WebDriver::Wait.new(timeout: timeout)
+      wait.until { exists? }
+      true
+    rescue
+      false
+    end
+
+    def accept
+      alert_accept
+      wait_until_gone(5)
+    end
+
+    def dismiss
+      alert_dismiss
+      wait_until_gone(5)
+    end
+  end
+end

data/lib/testcentricity/app_elements/app_element_helper.rb

@@ -4,16 +4,14 @@ module TestCentricity
   class AppUIElement
     include Test::Unit::Assertions
 
-    attr_reader   :parent, :strategy, :locator, :context, :type, :name
-    attr_accessor :mru_element, :mru_name
+    attr_reader   :parent, :locator, :context, :type, :name
 
-    def initialize(name, parent, strategy, locator, context)
-      @name        = name
-      @parent      = parent
-      @strategy    = strategy.to_sym
-      @locator     = locator
-      @context     = context
-      @type        = nil
+    def initialize(name, parent, locator, context)
+      @name       = name
+      @parent     = parent
+      @locator    = locator
+      @context    = context
+      @type       = nil
     end
 
     def get_object_type
@@ -21,7 +19,7 @@ module TestCentricity
     end
 
     def get_locator
-      [@strategy.to_sym, @locator]
+      @locator
     end
 
     def get_name
@@ -78,16 +76,34 @@ module TestCentricity
     def get_value
       obj = element
       object_not_found_exception(obj)
-      obj.value
+      if AppiumConnect.is_webview?
+        case obj.tag_name.downcase
+        when 'input', 'select', 'textarea'
+          obj.value
+        else
+          obj.text
+        end
+      else
+        obj.value
+      end
     end
 
     def get_caption
       obj = element
       object_not_found_exception(obj)
-      if obj.tag_name == 'XCUIElementTypeNavigationBar'
-        obj.attribute('name')
+      if AppiumConnect.is_webview?
+        case obj.tag_name.downcase
+        when 'input', 'select', 'textarea'
+          obj.value
+        else
+          obj.text
+        end
       else
-        obj.attribute('label')
+        if obj.tag_name == 'XCUIElementTypeNavigationBar'
+          obj.attribute('name')
+        else
+          obj.attribute('label')
+        end
       end
     end
 
@@ -230,13 +246,52 @@ module TestCentricity
       raise "Value of UI #{object_ref_message} failed to change from '#{value}' after #{timeout} seconds" if get_value == value
     end
 
+    def width
+      obj = element
+      object_not_found_exception(obj)
+      obj.size.width
+    end
+
+    # Return height of object.
+    #
+    # @return [Integer]
+    # @example
+    #   button_height = my_button.height
+    #
+    def height
+      obj = element
+      object_not_found_exception(obj)
+      obj.size.height
+    end
+
+    # Return x coordinate of object's location.
+    #
+    # @return [Integer]
+    # @example
+    #   button_x = my_button.x
+    #
+    def x_loc
+      obj = element
+      object_not_found_exception(obj)
+      obj.location.x
+    end
 
-    def scroll_into_view
-      scroll(:down) unless visible?
+    # Return y coordinate of object's location.
+    #
+    # @return [Integer]
+    # @example
+    #   button_y = my_button.y
+    #
+    def y_loc
+      obj = element
+      object_not_found_exception(obj)
+      obj.location.y
     end
 
     def scroll(direction)
-      execute_script('mobile: scroll', direction: direction.to_s)
+      obj = element
+      object_not_found_exception(obj)
+      execute_script('mobile: scroll', direction: direction.to_s, element: obj)
     end
 
     def swipe(direction)
@@ -255,25 +310,18 @@ module TestCentricity
         locators = @parent.get_locator
         locators.each do |parent_locator|
           if parent_obj.nil?
-            parent_obj = find_element(parent_locator[0], parent_locator[1])
+            parent_obj = find_element(parent_locator.keys[0], parent_locator.values[0])
           else
-            parent_obj = parent_obj.find_element(parent_locator[0], parent_locator[1])
+            parent_obj = parent_obj.find_element(parent_locator.keys[0], parent_locator.values[0])
           end
         end
-
         puts "Found parent object '#{@parent.get_name}' - #{@parent.get_locator}" if ENV['DEBUG']
-
-
-        obj = parent_obj.find_element(@strategy, @locator)
-
-        puts "Found object '#{@name}' - [:#{@strategy}, #{@locator}]" if ENV['DEBUG']
-
+        obj = parent_obj.find_element(@locator.keys[0], @locator.values[0])
+        puts "Found object '#{@name}' - #{@locator}" if ENV['DEBUG']
         obj
       else
-        obj = find_element(@strategy, @locator)
-
-        puts "Found object '#{@name}' - [:#{@strategy}, #{@locator}]" if ENV['DEBUG']
-
+        obj = find_element(@locator.keys[0], @locator.values[0])
+        puts "Found object '#{@name}' - #{@locator}" if ENV['DEBUG']
         obj
       end
     rescue

data/lib/testcentricity/app_elements/button.rb

@@ -1,6 +1,6 @@
 module TestCentricity
   class AppButton < AppUIElement
-    def initialize(name, parent, strategy, locator, context)
+    def initialize(name, parent, locator, context)
       super
       @type = :button
     end

data/lib/testcentricity/app_elements/checkbox.rb

@@ -1,20 +1,26 @@
 module TestCentricity
   class AppCheckBox < AppUIElement
-    def initialize(name, parent, strategy, locator, context)
+    def initialize(name, parent, locator, context)
       super
       @type = :checkbox
     end
 
     def checked?
-      element.attribute('checked') == 'true'
+      obj = element
+      object_not_found_exception(obj)
+      obj.attribute('checked') == 'true'
     end
 
     def check
-      element.click unless checked?
+      obj = element
+      object_not_found_exception(obj)
+      obj.click unless obj.attribute('checked') == 'true'
     end
 
     def uncheck
-      element.click if checked?
+      obj = element
+      object_not_found_exception(obj)
+      obj.click if obj.attribute('checked') == 'true'
     end
   end
 end

data/lib/testcentricity/app_elements/image.rb

@@ -0,0 +1,8 @@
+module TestCentricity
+  class AppImage < AppUIElement
+    def initialize(name, parent, locator, context)
+      super
+      @type = :image
+    end
+  end
+end

data/lib/testcentricity/app_elements/label.rb

@@ -1,6 +1,6 @@
 module TestCentricity
   class AppLabel < AppUIElement
-    def initialize(name, parent, strategy, locator, context)
+    def initialize(name, parent, locator, context)
       super
       @type = :label
     end

data/lib/testcentricity/app_elements/list.rb

@@ -1,15 +1,17 @@
 module TestCentricity
   class AppList < AppUIElement
-    def initialize(name, parent, strategy, locator, context)
+    def initialize(name, parent, locator, context)
       super
       @type = :list
     end
 
     def get_item_count
+      obj = element
+      object_not_found_exception(obj)
       if Environ.device_os == :ios
-        items = find_elements(class: 'XCUIElementTypeCell')
+        items = obj.find_elements(:class, 'XCUIElementTypeCell')
       else
-        items = find_elements(class: 'android.widget.FrameLayout')
+        items = obj.find_elements(:class, 'android.widget.FrameLayout')
       end
       items.size
     end
@@ -21,5 +23,22 @@ module TestCentricity
     def get_list_item(index)
 
     end
+
+    def wait_until_item_count_is(value, seconds = nil)
+      timeout = seconds.nil? ? Environ.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 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? ? Environ.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/app_elements/switch.rb

@@ -1,20 +1,26 @@
 module TestCentricity
   class AppSwitch < AppUIElement
-    def initialize(name, parent, strategy, locator, context)
+    def initialize(name, parent, locator, context)
       super
       @type = :switch
     end
 
     def on?
-      element.get_value == 1
+      obj = element
+      object_not_found_exception(obj)
+      obj.get_value == 1
     end
 
     def on
-      element.click unless on?
+      obj = element
+      object_not_found_exception(obj)
+      obj.click unless obj.get_value == 1
     end
 
     def off
-      element.click if on?
+      obj = element
+      object_not_found_exception(obj)
+      obj.click if obj.get_value == 1
     end
   end
 end

data/lib/testcentricity/app_elements/textfield.rb

@@ -1,12 +1,49 @@
 module TestCentricity
   class AppTextField < AppUIElement
-    def initialize(name, parent, strategy, locator, context)
+    def initialize(name, parent, locator, context)
       super
       @type = :textfield
     end
 
+    # Is text field set to read-only?
+    #
+    # @return [Boolean]
+    # @example
+    #   comments_field.read_only?
+    #
+    def read_only?
+      obj = element
+      object_not_found_exception(obj)
+      !!obj.attribute('readonly')
+    end
+
+    # Return maxlength character count of a text field.
+    #
+    # @return [Integer]
+    # @example
+    #   max_num_chars = comments_field.get_max_length
+    #
+    def get_max_length
+      obj = element
+      object_not_found_exception(obj)
+      max_length = obj.attribute('maxlength')
+      max_length.to_i unless max_length.blank?
+    end
+
+    # Return placeholder text of a text field.
+    #
+    # @return [String]
+    # @example
+    #   placeholder_message = username_field.get_placeholder
+    #
     def get_placeholder
-      element.text
+      obj = element
+      object_not_found_exception(obj)
+      if AppiumConnect.is_webview?
+        obj.attribute('placeholder')
+      else
+        obj.text
+      end
     end
   end
 end

data/lib/testcentricity/data_objects/environment.rb

@@ -36,6 +36,7 @@ module TestCentricity
     attr_accessor :device_type
     attr_accessor :device_os
     attr_accessor :device_orientation
+    attr_accessor :screen_size
     attr_accessor :platform
     attr_accessor :driver
     attr_accessor :tunneling
@@ -130,6 +131,14 @@ module TestCentricity
       @browser_size
     end
 
+    def self.screen_size=(size)
+      @screen_size = size
+    end
+
+    def self.screen_size
+      @screen_size
+    end
+
     def self.session_state=(session_state)
       @session_state = session_state
     end

data/lib/testcentricity/version.rb

@@ -1,3 +1,3 @@
 module TestCentricity
-  VERSION = '2.3.13'
+  VERSION = '2.3.14'
 end

data/lib/testcentricity/web_elements/list.rb

@@ -69,5 +69,22 @@ module TestCentricity
         "#{@locator} > #{@list_item}:nth-of-type(#{row})"
       end
     end
+
+    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 { get_item_count == value }
+    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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: testcentricity
 version: !ruby/object:Gem::Version
-  version: 2.3.13
+  version: 2.3.14
 platform: ruby
 authors:
 - A.J. Mrozinski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-21 00:00:00.000000000 Z
+date: 2018-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -252,9 +252,11 @@ files:
 - lib/testcentricity/app_core/appium_server.rb
 - lib/testcentricity/app_core/screen_objects_helper.rb
 - lib/testcentricity/app_core/screen_sections_helper.rb
+- lib/testcentricity/app_elements/alert.rb
 - lib/testcentricity/app_elements/app_element_helper.rb
 - lib/testcentricity/app_elements/button.rb
 - lib/testcentricity/app_elements/checkbox.rb
+- lib/testcentricity/app_elements/image.rb
 - lib/testcentricity/app_elements/label.rb
 - lib/testcentricity/app_elements/list.rb
 - lib/testcentricity/app_elements/switch.rb