wda_lib 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d54d671bdf87c1cfdea873faea31960872aac5ab
-  data.tar.gz: af4dcf4df69c48f11beeaad35d0656d76a15cb7a
+  metadata.gz: 7517995dcdb3b10660a1f72b2f928aca7ba1ef0f
+  data.tar.gz: 18612a392b4c51a524f4df05163e2fce9f9cd65e
 SHA512:
-  metadata.gz: 9ffa84e999ff834ffebcc5e9c8f1a97060571cb974ed543d979f1c05f00a4de78458743da50e609ae8589f8495597276acf650d2f3d920f4380600686a5b0fe6
-  data.tar.gz: 1d8d6a97389a0c27907aa2f4d736996752db6a71c7a55bc1a1879bc33df83ff3197c1df3fd183b67708613370ccd4fa75216f651a9265e9f14e784eeb8571aa1
+  metadata.gz: 27167966a5303de42ad65f67b4267a39ecb02298eb98353142a70f025befaa51794019e73228549a54f4fcab754252edc430b2df9b4ca7e3d1181700ba7c63f2
+  data.tar.gz: 40125773e8a05e39eae7e61a42cad5eb5f7842565f1b8e6a5a9d8fb944f8e4ab2e6d86fb0d5521443a06c8af8434c5b4c3159c381bf79da30c3aaa7fd3f7c0ef

data/lib/wda_lib/custom.rb

@@ -7,7 +7,7 @@ class WDA
 
     # Go to home screen
     def homescreen
-      post(@base_url + '/homescreen')
+      post(@base_url + '/wda/homescreen')
     end
 
     # Same as homescreen, go to home screen
@@ -17,21 +17,19 @@ class WDA
 
     # Deactivate application for given time
     def pause(duration)
-      post '/deactivateApp', { duration: duration }
+      post '/wda/deactivateApp', { duration: duration }
     end
 
-    # Timeout(without Session)
+    # Timeouts
     # @param duration [Float] the timeout in milliseconds
     # @return [void]
-    def timeout(duration)
-      post(@base_url + '/timeout', { type: 'xctevent', ms: duration })
+    def timeouts(duration)
+      post '/timeouts', { type: 'xctevent', ms: duration }
     end
 
-    # Timeout(with Session)
-    # @param duration [Float] the timeout in milliseconds
-    # @return [void]
-    def timeout_in_session(duration)
-      post '/timeout', { type: 'xctevent', ms: duration }
+    # Dismiss keyboard
+    def dismiss_keyboard
+      post '/wda/keyboard/dismiss'
     end
 
     def double_tap_homebutton

data/lib/wda_lib/debug.rb

@@ -10,14 +10,20 @@ class WDA
     # When accessible is true, ignore all elements except for the main window for accessibility tree
     # When accessible is false, and visible is true, ignore all invisible elements
     # @return [Hash]
-    def source(session_id = nil, not_fetch_inaccessible = true, not_fetch_invisible = true, timeout = 60)
+    def source(opts = {})
+      response_type = opts.fetch(:response_type, 'xml')
+      response_type = 'json' if opts.empty?
+      session_id = opts.fetch(:session_id, nil)
+      # not_fetch_inaccessible = opts.fetch(:not_fetch_inaccessible, true)
+      # not_fetch_invisible = opts.fetch(:not_fetch_invisible, true)
+      timeout = opts.fetch(:timeout, 60)
       @timeout = timeout.to_i if !timeout.nil?
+      url = '/source' + '?format=' + response_type
+      url = @base_url + '/source' + '?format=' + response_type if session_id.nil?
       begin
-        if session_id.nil?
-          res = post(@base_url + '/source', { accessible: not_fetch_inaccessible, visible: not_fetch_invisible }, @timeout)
-        else
-          res = post('/source', { accessible: not_fetch_inaccessible, visible: not_fetch_invisible }, @timeout)
-        end
+        res = get(url, 
+                  # { accessible: not_fetch_inaccessible, visible: not_fetch_invisible }, 
+                  @timeout)
       rescue
         raise Error::NoSuchElementError, "Can't fetch current screen elements within #{@timeout}s" if res['status'].nil?
       end
@@ -25,18 +31,31 @@ class WDA
       res
     end
 
-    
+    # Get accessibility tree
+    def accessibility_tree(opts = {})
+      session_id = opts.fetch(:session_id, nil)
+      timeout = opts.fetch(:timeout, 60)
+      @timeout = timeout.to_i if !timeout.nil?
+      url = '/wda/accessibleSource'
+      url = @base_url + '/wda/accessibleSource' if session_id.nil?
+      begin
+        res = get(url, @timeout)
+      rescue
+        raise Error::NoSuchElementError, "Can't fetch current screen accessibility tree within #{@timeout}s" if res['status'].nil?
+      end
+    end       
 
     def get_source
-      get(@base_url + '/source')['value']['tree']['children']
+      response = source
+      response['value']['children']
     end
 
-    def get_window_statusbar
-      get(@base_url + '/source')['value']['tree']['children'][2]
-    end
+    # def get_window_statusbar
+    #   source['value']['children'][-3]
+    # end
 
     def get_window(window_number = 0)
-      get(@base_url + '/source')['value']['tree']['children'][window_number]
+      source['value']['children'][window_number]
     end
 
     # Had issue when there is app shortcut in SIRI search or Today's extention, 

data/lib/wda_lib/element.rb

@@ -57,13 +57,13 @@ class WDA
     # Check if element is accessible?
     # @return is accessible? [Boolean]
     def accessible?
-      client.get('/element/' + eid + '/accessible')['value']
+      client.get('/wda/element/' + eid + '/accessible')['value']
     end
     
     # Check if element is accessibilityContainer?
     # @return is accessibilityContainer? [Boolean]
     def accessible_container?
-      client.get('/element/' + eid + '/accessibilityContainer')['value']
+      client.get('/wda/element/' + eid + '/accessibilityContainer')['value']
     end
 
     # Get type from an element, ex:  type => "Icon"(XCUIElementTypeIcon)
@@ -91,38 +91,56 @@ class WDA
       client.post '/element/' + eid + '/clear'
     end
 
+    # Element swipe
+    # @param direction [String] up, down, left, right
+    # @return element uuid [String]
+    def elswipe(direction)
+      client.post('/wda/element/' + eid + '/swipe', { direction: direction })
+    end
+
+    # Element pinch
+    # @param scale [Double], velocity [Double]
+    # @return element uuid [String]
+    def elswipe(scale, velocity)
+      client.post('/wda/element/' + eid + '/pinch', { scale: scale, velocity: velocity })
+    end
+
     # Double tap on an element with its id
     # @return element uuid [String]
     def double_tap
-      client.post '/uiaElement/' + eid + '/doubleTap'
+      client.post '/wda/element/' + eid + '/doubleTap'
     end
 
     # Two finger tap on an element with its id
     # @return element uuid [String]
     def two_finger_tap
-      client.post '/uiaElement/' + eid + '/twoFingerTap'
+      client.post '/wda/element/' + eid + '/twoFingerTap'
     end
 
     # Touch and hold on for a while finger tap on an element with its id
     # @param duration [Double]
     # @return element uuid [String]
     def touch_hold(duration)
-      client.post '/uiaElement/' + eid + '/touchAndHold', { duration: duration }
+      client.post '/wda/element/' + eid + '/touchAndHold', { duration: duration }
     end
 
     # Scroll on an element with its id
     # @param direction [String] up, down, left, right
     # @return [Hash]
     def scroll(direction = nil)
-      client.post '/uiaElement/' + eid + '/scroll', { direction: direction }
+      client.post '/wda/element/' + eid + '/scroll', { direction: direction }
     end
 
     # Drag on an element with its id and position
-    # @param toX [String], toY [String], duration [Double]
-    def drag_to(toX, toY, duration = 0)
-      fromX = location[:x]
-      fromY = location[:y]
-      client.post '/uiaTarget/' + eid + '/dragfromtoforduration', { fromX: fromX, toX: toX, fromY: fromY, toY: toY, duration: duration }
+    # @param fromX [Double], toX [Double], fromY [Double], toY [Double], duration [Double]
+    def drag_element_from_to(fromX, toX, fromY, toY, duration = 0)
+      client.post '/wda/element/' + eid + '/dragfromtoforduration', { fromX: fromX, toX: toX, fromY: fromY, toY: toY, duration: duration }
+    end
+
+    # Drag from a position to another position
+    # @param fromX [Double], toX [Double], fromY [Double], toY [Double], duration [Double]
+    def drag_from_to(fromX, toX, fromY, toY, duration = 0)
+      client.post '/wda/dragfromtoforduration', { fromX: fromX, toX: toX, fromY: fromY, toY: toY, duration: duration }
     end
 
     # Get element size
@@ -156,13 +174,26 @@ class WDA
   # Tap on a given positon
   # @param x [Integer], y [Integer]
   def tap_on(x, y)
-    post '/tap/0', { x: x, y: y }
+    post '/wda/tap/0', { x: x, y: y }
+  end
+
+  # Double tap on a given positon
+  # @param x [Integer], y [Integer]
+  def double_tap(x, y)
+    post '/wda/doubleTap', { x: x, y: y }
+  end
+
+  # Touch and hold on for a while
+  # @param x [Double], y [Double], duration [Double]
+  # @return element uuid [String]
+  def touch_hold(x, y, duration)
+    client.post '/wda/touchAndHold', { x: x, y: y, duration: duration }
   end
 
   # Type text to textfield
   # @param value [String] 
   def keys(value)
-    post '/keys', { value: value.chars }
+    post '/wda/keys', { value: value.chars }
   end
 
   # @return width, height

data/lib/wda_lib/find_element.rb

@@ -199,7 +199,7 @@ class WDA
 
     # @return element's visible cells [Array]
     def visible_cell(id)
-      get '/uiaElement/' + id + '/getVisibleCells'
+      get '/wda/element/' + id + '/getVisibleCells'
     end
 
     # Find button by given index or value

data/lib/wda_lib/orientation.rb

@@ -5,19 +5,19 @@
 class WDA
   module Orientation
     def orientation
-      get @base_url + '/orientation'
+      get '/orientation'
     end
 
     def set_orientation
-      post @base_url + '/orientation'
+      post '/orientation'
     end
 
     def get_rotation
-      get @base_url + '/rotation'
+      get '/rotation'
     end
 
     def set_rotation
-      post @base_url + '/rotation'
+      post '/rotation'
     end
   end
 end

data/lib/wda_lib/session.rb

@@ -48,6 +48,13 @@ class WDA
       response
     end
 
+    # Post url to wda server to open a url in browser and create a session
+    # @return [self]
+    def open_url(url)
+      post('/url', { url: url })
+      status
+    end
+
     # Post desired_capabilities to wda server to create a session
     # This is not realy needed since we can find and click app icon to start app
     # @return [self]
@@ -84,7 +91,6 @@ class WDA
     # @return delete session response [Json]
     def quit(session_id = nil)
       (session_id.nil?)? sessionId = @session_id : sessionId = session_id
-      @base_url + '/session/' + sessionId
       delete(@base_url + '/session/' + sessionId)
       status
     end
@@ -95,8 +101,9 @@ class WDA
     end
 
     # Healthcheck
+    # This api does also get back to homescreen
     def healthcheck
-      response = get(@base_url + '/healthcheck')
+      response = get(@base_url + '/wda/healthcheck')
       update_status(response)
     end
   end

data/lib/wda_lib/touch_id.rb

@@ -8,12 +8,12 @@ class WDA
     # Touch ID
     # Match TouchID
     def match_touchid
-      post(@base_url + '/simulator/touch_id', { match: 1 }.to_json)
+      post(@base_url + '/wda/touch_id', { match: 1 }.to_json)
     end
 
     # Do not match TouchID
     def unmatch_touchid
-      post(@base_url + '/Simulator/touch_id', { match: 0 }.to_json)
+      post(@base_url + '/wda/touch_id', { match: 0 }.to_json)
     end
   end
 end

data/lib/wda_lib/version.rb

@@ -3,5 +3,5 @@
 # Copyright © 2016 Zenly. All rights reserved.
 #
 class WDA
-  VERSION = '0.2.3'
+  VERSION = '0.3.0'
 end

data/lib/wda_lib.rb

@@ -67,12 +67,6 @@ class WDA
     status
     window_size
     capabilities(opts)
-    @http_client ||= Selenium::WebDriver::Remote::Http::Default.new(open_timeout: 999_999, read_timeout: 999_999)
-    @driver = Selenium::WebDriver.for(:remote, 
-                                      http_client: @http_client,
-                                      :url => @base_url,  
-                                      :desired_capabilities => @caps[:desired_capabilities],
-                                      :listener => @listener)
   end
 
   # Build desired_capabilities with options

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wda_lib
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - MIN Yi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.1
 signing_key: 
 specification_version: 4
 summary: A simple ruby lib of binding methods for WebDriverAgent