testa_appium_driver 0.1.13 → 0.1.14

data/lib/testa_appium_driver/common/locator.rb

@@ -6,6 +6,7 @@ module TestaAppiumDriver
   class Locator
     include Helpers
 
+
     attr_accessor :xpath_selector
     attr_accessor :single
 
@@ -59,9 +60,9 @@ module TestaAppiumDriver
       end
 
       selectors[:id] = selectors[:name] unless selectors[:name].nil?
-      if from_element.instance_of?(Selenium::WebDriver::Element)
-        @xpath_selector = "//*" # to select current element
-        @xpath_selector += hash_to_xpath(@driver.device, selectors, single)[1..-1]
+      if from_element.instance_of?(::Selenium::WebDriver::Element) || from_element.instance_of?(::Appium::Core::Element) || from_element.instance_of?(::TestaAppiumDriver::Locator)
+        @xpath_selector = "."
+        @xpath_selector += hash_to_xpath(@driver.device, selectors, single)
       else
         @xpath_selector = hash_to_xpath(@driver.device, selectors, single)
       end
@@ -122,8 +123,8 @@ module TestaAppiumDriver
       # elements[2] will be resolved with xpath because we are looking for multiple elements from element
       # and since we are looking for instance 2, [](instance) method will return new "empty locator"
       # we are executing click on that "empty locator" so we have to return the instance 2 of elements for the click
-      if @xpath_selector == "//*[1]" && !@from_element.nil? && @image_selector.nil?
-        return @from_element if @from_element.instance_of?(Selenium::WebDriver::Element)
+      if @xpath_selector == ".//*[1]" && !@from_element.nil? && @image_selector.nil?
+        return @from_element if @from_element.instance_of?(::Selenium::WebDriver::Element) || @from_element.instance_of?(::Appium::Core::Element)
         return @from_element.execute(skip_cache: skip_cache, force_cache_element: force_cache_element, ignore_implicit_wait: ignore_implicit_wait) if @from_element.instance_of?(TestaAppiumDriver::Locator)
         return @from_element
       end
@@ -302,38 +303,44 @@ module TestaAppiumDriver
       @driver.first_and_last_leaf(execute)
     end
 
-
-    def tap(x = nil, y = nil)
-      click(x, y)
+    def double_click(x = nil, y = nil)
+      click(x,y, double: true)
     end
 
+
+
     # if both x or y, or both are not given, will click in the center of the element
     # @param x If positive integer, will offset the click from the left side, if negative integer, will offset the click  from the right. If float value is given, it will threat it as percentage offset, giving it 0.5 will click in the middle
     # @param y If positive integer, will offset the click from the bottom side, if negative integer, will offset the click  from the top. If float value is given, it will threat it as percentage offset, giving it 0.5 will click in the middle
-    def click(x = nil, y = nil)
-      if !x.nil? && !y.nil?
+    def click(x = nil, y = nil, double: false)
+      if !x.nil? && !y.nil? || double
+
+        x=0.5 if x.nil?
+        y=0.5 if y.nil?
 
         b = self.bounds
-        if x.kind_of? Integer
+        if x.kind_of?(Integer)
           if x >= 0
             x = b.top_left.x + x
           else
             x = b.bottom_right.x + x
           end
-        elsif x.kind_of? Float
+        elsif x.kind_of?(Float) && x <= 1.0 && x >= 0
           x = b.top_left.x + b.width*x
         else
-          raise "x value #{x} not supported"
+          raise "x value #{x} not supported. Use integer as pixel or float (0..1) as percentage of element width"
         end
 
-        if y.kind_of? Integer
+        if y.kind_of?(Integer)
           if y >= 0
-            y = b.bottom_right.y + y
+            y = b.top_left.y + y
           else
-            y = b.top_left + y
+            y = b.bottom_right + y
           end
-        elsif y.kind_of? Float
-          y = b.bottom_right.y + b.height*y
+        elsif y.kind_of?(Float)  && y <= 1.0 && y >= 0
+          y = b.top_left.y + b.height*y
+        else
+          raise "y value #{x} not supported. Use integer as pixel or float (0..1) as percentage of element height"
         end
 
         action_builder = @driver.action
@@ -341,6 +348,11 @@ module TestaAppiumDriver
         f1.create_pointer_move(duration: 0, x: x, y: y, origin: ::Selenium::WebDriver::Interactions::PointerMove::VIEWPORT)
         f1.create_pointer_down(:left)
         f1.create_pointer_up(:left)
+        if double
+          f1.create_pause(0.1)
+          f1.create_pointer_down(:left)
+          f1.create_pointer_up(:left)
+        end
         @driver.perform_actions [f1]
       else
         if @driver.device == :android
@@ -355,6 +367,11 @@ module TestaAppiumDriver
       end
     end
 
+
+    alias_method :tap, :click
+    alias_method :double_tap, :double_click
+
+
     def send_key(*args)
       perform_driver_method(:send_keys, *args)
     end
@@ -368,7 +385,7 @@ module TestaAppiumDriver
     # @return [TestaAppiumDriver::Locator]
     def parent
       raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "parent") if @strategy != FIND_STRATEGY_XPATH && !@strategy.nil?
-      raise "Cannot add parent selector to a retrieved instance of a class array" if (@xpath_selector == "//*" || @xpath_selector == "//*[1]")  && !@from_element.nil?
+      raise "Cannot add parent selector to a retrieved instance of a class array" if (@xpath_selector == ".//*" || @xpath_selector == ".//*[1]")  && !@from_element.nil?
 
       locator = self.dup
       locator.strategy = FIND_STRATEGY_XPATH
@@ -426,7 +443,7 @@ module TestaAppiumDriver
     def siblings
       raise "Cannot add siblings selector to array" unless @single
       raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "siblings") if @strategy != FIND_STRATEGY_XPATH && !@strategy.nil?
-      raise "Cannot add siblings selector to a retrieved instance of a class array" if (@xpath_selector == "//*" || @xpath_selector == "//*[1]")  && !@from_element.nil?
+      raise "Cannot add siblings selector to a retrieved instance of a class array" if (@xpath_selector == ".//*" || @xpath_selector == ".//*[1]")  && !@from_element.nil?
 
       locator = self.dup
       locator.strategy = FIND_STRATEGY_XPATH
@@ -442,7 +459,7 @@ module TestaAppiumDriver
     def preceding_siblings
       raise "Cannot add preceding_siblings selector to array" unless @single
       raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "preceding_siblings") if @strategy != FIND_STRATEGY_XPATH && !@strategy.nil?
-      raise "Cannot add preceding_siblings selector to a retrieved instance of a class array" if (@xpath_selector == "//*" || @xpath_selector == "//*[1]")  && !@from_element.nil?
+      raise "Cannot add preceding_siblings selector to a retrieved instance of a class array" if (@xpath_selector == ".//*" || @xpath_selector == ".//*[1]")  && !@from_element.nil?
 
       locator = self.dup
       locator.strategy = FIND_STRATEGY_XPATH
@@ -458,7 +475,7 @@ module TestaAppiumDriver
     def preceding_sibling
       raise "Cannot add preceding_sibling selector to array" unless @single
       raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "preceding_sibling") if @strategy != FIND_STRATEGY_XPATH && !@strategy.nil?
-      raise "Cannot add preceding siblings selector to a retrieved instance of a class array" if (@xpath_selector == "//*" || @xpath_selector == "//*[1]")  && !@from_element.nil?
+      raise "Cannot add preceding siblings selector to a retrieved instance of a class array" if (@xpath_selector == ".//*" || @xpath_selector == ".//*[1]")  && !@from_element.nil?
 
       locator = self.dup
       locator.strategy = FIND_STRATEGY_XPATH
@@ -477,7 +494,7 @@ module TestaAppiumDriver
     def following_siblings
       raise "Cannot add following_siblings selector to array" unless @single
       raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "following_siblings") if @strategy != FIND_STRATEGY_XPATH && !@strategy.nil?
-      raise "Cannot add following_siblings selector to a retrieved instance of a class array" if (@xpath_selector == "//*" || @xpath_selector == "//*[1]")  && !@from_element.nil?
+      raise "Cannot add following_siblings selector to a retrieved instance of a class array" if (@xpath_selector == ".//*" || @xpath_selector == ".//*[1]")  && !@from_element.nil?
 
       locator = self.dup
       locator.strategy = FIND_STRATEGY_XPATH
@@ -493,7 +510,7 @@ module TestaAppiumDriver
     def following_sibling
       raise "Cannot add following_sibling selector to array" unless @single
       raise StrategyMixException.new(@strategy, @strategy_reason, FIND_STRATEGY_XPATH, "following_sibling") if @strategy != FIND_STRATEGY_XPATH && !@strategy.nil?
-      raise "Cannot add following_sibling selector to a retrieved instance of a class array" if (@xpath_selector == "//*" || @xpath_selector == "//*[1]")  && !@from_element.nil?
+      raise "Cannot add following_sibling selector to a retrieved instance of a class array" if (@xpath_selector == ".//*" || @xpath_selector == ".//*[1]")  && !@from_element.nil?
 
       locator = self.dup
       locator.strategy = FIND_STRATEGY_XPATH
@@ -548,7 +565,7 @@ module TestaAppiumDriver
     def _attributes_match(attributes)
       all_match = true
       attributes.each do |key, value|
-        unless attribute(key) == value
+        unless testa_attribute(key) == value
           all_match = false
           break
         end

data/lib/testa_appium_driver/common/scroll_actions/json_wire_scroll_actions.rb

@@ -1,4 +1,4 @@
 module TestaAppiumDriver
-  class ScrollActions
+  module JsonWireScrollActions
   end
 end

data/lib/testa_appium_driver/common/scroll_actions/w3c_scroll_actions.rb

@@ -1,7 +1,7 @@
-module TestaAppiumDriver
-  class ScrollActions
+module ::TestaAppiumDriver
+  module W3cScrollActions
+
 
-    private
     # @return [Array]
     def w3c_scroll_each(direction, &block)
       elements = []
@@ -19,48 +19,105 @@ module TestaAppiumDriver
             direction = :right
           end
         end
+        case direction
+        when :up
+          align_with = :bottom
+        when :down
+          align_with = :top
+        when :right
+          align_with = :left
+        when :left
+          align_with = :right
+        else
+          align_with = :top
+        end
+
+
+
+        ignore_element_ids = []
+        previous_element = nil
 
         until is_end_of_scroll?
+          aligned_items = 0
+          new_ignore_element_ids = []
           matches = @locator.execute(skip_cache: true)
-          matches.each_with_index do |m|
-            next if elements.include?(m)
+          matches.each_with_index do |m, index|
+            if ignore_element_ids.include?(m.id)
+              previous_element = m
+              next
+            end
+
+            sa = self.dup
+            sa.locator = m
+            sa.w3c_align(align_with, false, 1, speed_coef: 2.0)
+            is_aligned = sa.is_aligned?(align_with, m)
+            if !is_aligned && !previous_element.nil?
+              new_ignore_element_ids << previous_element.id
+            end
+
+            if is_aligned
+              aligned_items += 1
+            end
+
+            if matches.count == index + 1
+              new_ignore_element_ids << m.id
+            end
+
             elements << m
             if block_given? # block is given
+              @locator.driver.invalidate_cache
               block.call(m) # use call to execute the block
             else # the value of block_argument becomes nil if you didn't give a block
               # block was not given
             end
+            previous_element = m
           end
+
           iterations += 1
           break if !@max_scrolls.nil? && iterations == @max_scrolls
-          self.send("page_#{direction}")
+
+          if aligned_items == 0
+            self.send("page_#{direction}")
+          else
+            ignore_element_ids = new_ignore_element_ids.dup
+          end
+
+
+
+
         end
       rescue => e
         raise e
-
       end
       elements
     end
 
-    def w3c_align(with, scroll_to_find)
+    def w3c_align(with, scroll_to_find, max_attempts, speed_coef: 1.25)
       default_deadzone!
 
 
 
       @locator.scroll_to if scroll_to_find
 
-      element = @locator.execute
+      if @locator.instance_of?(TestaAppiumDriver::Locator)
+        element = @locator.execute
+      else
+        element = @locator
+      end
+
+
+      max_attempts = 3 if max_attempts.nil? || max_attempts <= 0
 
       timeout = 0
-      until is_aligned?(with, element) || timeout == 3
-        w3c_attempt_align(with)
+      until is_aligned?(with, element) || timeout == max_attempts
+        w3c_attempt_align(with, speed_coef)
         timeout += 1
       end
 
     end
 
 
-    def w3c_attempt_align(with)
+    def w3c_attempt_align(with, speed_coef)
       case with
       when :top
         y0 = @bounds.bottom_right.y - @deadzone[:bottom]
@@ -91,7 +148,7 @@ module TestaAppiumDriver
       end
 
       x1, y1 = apply_w3c_correction(x1, y1, scroll_direction) if @driver.device == :android
-      w3c_action(x0, y0, x1, y1, SCROLL_ACTION_TYPE_SCROLL)
+      w3c_action(x0, y0, x1, y1, SCROLL_ACTION_TYPE_SCROLL, speed_coef: speed_coef)
     end
 
 
@@ -171,7 +228,9 @@ module TestaAppiumDriver
           y0 = @bounds.top_left.y + @deadzone[:top].to_i
           y1 = @bounds.bottom_right.y - @deadzone[:bottom].to_i
         end
-        x0 = @bounds.width / 2
+        x0 = @bounds.top_left.x + (@bounds.width - @deadzone[:left].to_i - @deadzone[:right].to_i)/ 2
+        x0 = @bounds.top_left.x if x0 < @bounds.top_left.x
+        x0 = @bounds.bottom_right.x if x0 > @bounds.bottom_right.x
         x1 = x0
       else
         if direction == :right
@@ -181,24 +240,32 @@ module TestaAppiumDriver
           x0 = @bounds.top_left.x + @deadzone[:left].to_i
           x1 = @bounds.bottom_right.x - @deadzone[:right].to_i
         end
-        y0 = @bounds.height / 2
+
+        y0 = @bounds.top_left.y + (@bounds.height -  @deadzone[:top].to_i - @deadzone[:bottom].to_i)/ 2
+        y0 = @bounds.top_left.y if y0 < @bounds.top_left.y
+        y0 = @bounds.bottom_right.y if y0 > @bounds.bottom_right.y
         y1 = y0
       end
       x1, y1 = apply_w3c_correction(x1, y1, direction) if @driver.device == :android
 
+      speed_coef = 1
+      if type == SCROLL_ACTION_TYPE_SCROLL
+        speed_coef = 1.5
+      end
 
-      w3c_action(x0, y0, x1, y1, type)
+      w3c_action(x0, y0, x1, y1, type, speed_coef: speed_coef)
 
     end
 
 
-    def w3c_action(x0, y0, x1, y1, type)
+    def w3c_action(x0, y0, x1, y1, type, speed_coef: 1.0)
+      speed_coef = 1/speed_coef
       if type == SCROLL_ACTION_TYPE_SCROLL
-        duration = 1.8
+        duration = 1.8*speed_coef
       elsif type == SCROLL_ACTION_TYPE_FLING
-        duration = 0.1
+        duration = 0.1*speed_coef
       elsif type == SCROLL_ACTION_TYPE_DRAG
-        duration = 3.5
+        duration = 3.5*speed_coef
       else
         raise "Unknown scroll action type #{type}"
       end

data/lib/testa_appium_driver/common/scroll_actions.rb

@@ -5,6 +5,10 @@ module TestaAppiumDriver
 
   # Class for handling scroll actions
   class ScrollActions
+    include W3cScrollActions
+    include JsonWireScrollActions
+
+    attr_accessor :locator
     # @param [TestaAppiumDriver::Locator, nil] scrollable container that will be used to determine the bounds for scrolling
     # @param [Hash] params
     #   acceptable params
@@ -15,6 +19,7 @@ module TestaAppiumDriver
     def initialize(scrollable, params = {})
       @scrollable = scrollable
       @locator = params[:locator]
+      # TODO: raise error if locator is for multiple, but not for scroll each, chekc other cases aswell
       @deadzone = params[:deadzone]
       @max_scrolls = params[:max_scrolls]
       @default_scroll_strategy = params[:default_scroll_strategy]
@@ -36,8 +41,8 @@ module TestaAppiumDriver
       @bounds = @scrollable.bounds
     end
 
-    def align(with, scroll_to_find)
-      w3c_align(with, scroll_to_find)
+    def align(with, scroll_to_find, max_attempts)
+      w3c_align(with, scroll_to_find, max_attempts)
       @locator
     end
 
@@ -195,7 +200,25 @@ module TestaAppiumDriver
       w3c_drag_to(x0, y0, x1, y1)
     end
 
-    private
+
+    def is_aligned?(with, element)
+      align_bounds = @locator.bounds(force_cache_element: element)
+      case with
+      when :top
+        @align_offset = align_bounds.top_left.y - @bounds.top_left.y - @deadzone[:top]
+      when :bottom
+        @align_offset = @bounds.bottom_right.y - @deadzone[:bottom] - align_bounds.bottom_right.y
+      when :right
+        @align_offset = @bounds.bottom_right.x - @deadzone[:right] - align_bounds.bottom_right.x
+      when :left
+        @align_offset = align_bounds.top_left.x - @bounds.top_left.x - @deadzone[:left]
+      else
+        raise "Unsupported align with option: #{with}"
+      end
+      @align_offset < SCROLL_ALIGNMENT_THRESHOLD
+    end
+
+
 
     def is_end_of_scroll?
       old_elements = @previous_elements
@@ -227,21 +250,5 @@ module TestaAppiumDriver
       end
     end
 
-    def is_aligned?(with, element)
-      align_bounds = @locator.bounds(force_cache_element: element)
-      case with
-      when :top
-        @align_offset = align_bounds.top_left.y - @bounds.top_left.y + @deadzone[:top]
-      when :bottom
-        @align_offset = @bounds.bottom_right.y - @deadzone[:bottom] - align_bounds.bottom_right.y
-      when :right
-        @align_offset = @bounds.bottom_right.x - @deadzone[:right] - align_bounds.bottom_right.x
-      when :left
-        @align_offset = align_bounds.top_left.x - @bounds.top_left.x + @deadzone[:left]
-      else
-        raise "Unsupported align with option: #{with}"
-      end
-      @align_offset < SCROLL_ALIGNMENT_THRESHOLD
-    end
   end
 end

data/lib/testa_appium_driver/common/selenium_element.rb

@@ -1,5 +1,5 @@
-module Selenium
-  module WebDriver
+module ::Appium
+  module Core
     class Element
       # sets the testa appium driver instance for the current phone
       def self.set_driver(driver, udid)

data/lib/testa_appium_driver/driver.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'em/pure_ruby'
+#require 'em/pure_ruby'
 require 'appium_lib_core'
 
 require_relative 'common/bounds'
@@ -27,25 +27,24 @@ module TestaAppiumDriver
     # - default_find_strategy: default strategy to be used for finding elements. Available strategies :uiautomator or :xpath
     # - default_scroll_strategy: default strategy to be used for scrolling. Available strategies: :uiautomator(android only), :w3c
     def initialize(opts = {})
-      opts[:shouldEnforceXpath1] = false
 
       @testa_opts = opts[:testa_appium_driver] || {}
 
       core = Appium::Core.for(opts)
-      extend_for(core.device, core.automation_name)
-      @device = core.device
-      @automation_name = core.automation_name
+      @driver = core.start_driver
+      @automation_name = @driver.capabilities["automationName"].downcase.to_sym
+      @device = @driver.capabilities.platform_name.downcase.to_sym
+
+      extend_for(@device, @automation_name)
 
       handle_testa_opts
 
-      @driver = core.start_driver
       invalidate_cache
 
+      #disable_wait_for_idle
+      #disable_implicit_wait
 
-      disable_wait_for_idle
-      disable_implicit_wait
-
-      Selenium::WebDriver::Element.set_driver(self, opts[:caps][:udid])
+      ::Appium::Core::Element.set_driver(self, @driver.capabilities["udid"])
     end
 
 
@@ -84,7 +83,11 @@ module TestaAppiumDriver
       from_element_id = from_element.instance_of?(TestaAppiumDriver::Locator) ? from_element.strategies_and_selectors : nil
 
       begin
+        begin
         ss = strategies_and_selectors[ss_index % strategies_and_selectors.count]
+        rescue ZeroDivisionError
+          puts "aa"
+        end
         ss_index +=1
 
         puts "Executing #{from_element_id ? "from #{from_element.strategy}: #{from_element.strategies_and_selectors} => " : ""}#{ss.keys[0]}: #{ss.values[0]}"
@@ -153,7 +156,7 @@ module TestaAppiumDriver
         @implicit_wait_ms = @implicit_wait_ms/1000 if @implicit_wait_ms > 100000
         @implicit_wait_uiautomator_ms = @driver.get_settings["waitForSelectorTimeout"]
         @driver.manage.timeouts.implicit_wait = 0
-        @driver.update_settings({waitForSelectorTimeout: 1})
+        @driver.update_settings({waitForSelectorTimeout: 0})
     end
 
 
@@ -246,26 +249,28 @@ module TestaAppiumDriver
       @driver.long_press_keycode(code)
     end
 
-    def click(x, y)
+    def click(x, y, double: false)
       ws = driver.window_size
       window_width = ws.width.to_i
       window_height = ws.height.to_i
-      if x.kind_of? Integer
+      if x.kind_of?(Integer)
         if x < 0
           x = window_width + x
         end
-      elsif x.kind_of? Float
+      elsif x.kind_of?(Float) && x <= 1.0 && x >= 0
         x = window_width*x
       else
-        raise "x value #{x} not supported"
+        raise "x value #{x} not supported. Use integer as pixel or float (0..1) as percentage of screen"
       end
 
-      if y.kind_of? Integer
+      if y.kind_of?(Integer)
         if y < 0
           y = window_height + y
         end
-      elsif y.kind_of? Float
+      elsif y.kind_of?(Float) && y <= 1.0 && y >= 0
         y = window_height*y
+      else
+        raise "y value #{x} not supported. Use integer as pixel or float (0..1) as percentage of screen"
       end
 
 
@@ -274,14 +279,23 @@ module TestaAppiumDriver
       f1.create_pointer_move(duration: 0, x: x, y: y, origin: ::Selenium::WebDriver::Interactions::PointerMove::VIEWPORT)
       f1.create_pointer_down(:left)
       f1.create_pointer_up(:left)
+      if double
+        f1.create_pause(0.1)
+        f1.create_pointer_down(:left)
+        f1.create_pointer_up(:left)
+      end
       @driver.perform_actions [f1]
     end
 
+    def double_click(x,y)
+      click(x,y, double: true)
+    end
+
 
 
     # @return [Array<Selenium::WebDriver::Element] array of 2 elements, the first element without children and the last element without children in the current page
     def first_and_last_leaf(from_element = @driver)
-      elements = from_element.find_elements(xpath: "//*[not(*)]")
+      elements = from_element.find_elements(xpath: ".//*[not(*)]")
       return nil if elements.count == 0
       [elements[0], elements[-1]]
     end
@@ -291,7 +305,7 @@ module TestaAppiumDriver
       case device
       when :android
         case automation_name
-        when :uiautomator2
+        when :uiautomator2, :espresso, :Espresso
           require_relative 'android/driver'
         else
           raise "Testa appium driver not supported for #{automation_name} automation"

data/lib/testa_appium_driver/ios/locator/attributes.rb

@@ -2,10 +2,17 @@ module TestaAppiumDriver
   module Attributes
 
     #noinspection RubyNilAnalysis
-    def attribute(name, *args)
-      elements = execute(*args)
+    def testa_attribute(name, *args)
 
-      if elements.instance_of?(Selenium::WebDriver::Element)
+      if self.instance_of?(::Selenium::WebDriver::Element) || self.instance_of?(::Appium::Core::Element)
+        @driver = get_driver
+        elements = self
+      else
+        elements = execute(*args)
+      end
+
+
+      if elements.instance_of?(::Selenium::WebDriver::Element) || elements.instance_of?(::Appium::Core::Element)
         r = elements.send(:attribute, name.to_s)
         r = TestaAppiumDriver::Bounds.from_ios(r, @driver) if name.to_s == "rect"
       else
@@ -17,65 +24,62 @@ module TestaAppiumDriver
 
 
     def accessibility_container(*args)
-      attribute("accessibilityContainer", *args)
+      testa_attribute("accessibilityContainer", *args)
     end
 
     def accessible?(*args)
-      attribute("accessible", *args).to_s == "true"
+      testa_attribute("accessible", *args).to_s == "true"
     end
 
 
     def class_name(*args)
-      attribute("class", *args)
+      testa_attribute("class", *args)
     end
 
     def enabled?(*args)
-      attribute("enabled", *args).to_s == "true"
+      testa_attribute("enabled", *args).to_s == "true"
     end
 
     def frame(*args)
-      attribute("frame", *args)
+      testa_attribute("frame", *args)
     end
 
     def index(*args)
-      attribute("index", *args)
+      testa_attribute("index", *args)
     end
 
     def label(*args)
-      attribute("label", *args)
+      testa_attribute("label", *args)
     end
 
     def name(*args)
-      attribute("name", *args)
+      testa_attribute("name", *args)
     end
 
 
     def rect(*args)
-      attribute("rect", *args)
+      testa_attribute("rect", *args)
     end
 
     def selected?(*args)
-      attribute("selected", *args).to_s == "true"
+      testa_attribute("selected", *args).to_s == "true"
     end
 
     def type(*args)
-      attribute("type", *args)
+      testa_attribute("type", *args)
     end
 
     def value(*args)
-      attribute("value", *args)
+      testa_attribute("value", *args)
     end
 
     def visible?(*args)
-      attribute("visible", *args).to_s == "true"
+      testa_attribute("visible", *args).to_s == "true"
     end
 
 
     alias_method :bounds, :rect
     alias_method :text, :label
   end
-  #noinspection RubyYardReturnMatch
-  class Locator
-    include TestaAppiumDriver::Attributes
-  end
+
 end