wda_lib 0.0.3 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e65ae5ada8b0e5e3a5dae6137c2490b1da31d582
-  data.tar.gz: f163d6e1070406d562c4209006dc9ac4bea69ed2
+  metadata.gz: 0b70066b286241a28e6880b8f7c67de48cfebbe7
+  data.tar.gz: 31fe50980434ba902e28bf7b507494eb0c2c80f6
 SHA512:
-  metadata.gz: acd58efc072a5f1b9f91f0ba758e03dbc5b4c2cab1d6901da950f6dfb4d06f8644b48cc92354a3c202dce1f58bb1c93556c0bf9717f24e080bd60fe7f98f6511
-  data.tar.gz: ec0e79215ab2c9dfbc42644b2640ed85919281dc573217e461a8c29dcf0db463b7a87beff45164bd5c0bb4c94736e0a2f0e3d5fa0238a357be843eec00a536fe
+  metadata.gz: d9c3c3ece0bd6f0af1d98d1ca1ef40399fc22e5d620f71d39d5ba7ac9506816971b98e80691fe69142e3a9ee92b5d6174ae3600cf24634b5caa6b35042639cd7
+  data.tar.gz: bd91aba742025e6a976eaffdb36a0e3e82759e464c9aa1ac65a36ff6867516b53f1ed0d8ba96d4eb9117fae90753afcbbeefbea7c13a56b0a0a0acd8df0f409b

data/.gitignore

@@ -6,4 +6,4 @@
 /doc/
 /pkg/
 /*.gem
-
+test.rb

data/README.md

@@ -11,11 +11,11 @@ gem install wda_lib
 ## Usage example
 
 A simple test to show all actions on WDA IntegrationApp
-[Single devices](../blob/master/example/single_device.rb)
+[Single devices](../master/example/single_device.rb)
 
 ## Example of multiple devices
 
-[Multiple devices](../blob/master/example/multiple_devices.rb)
+[Multiple devices](../master/example/multiple_devices.rb)
 
 
 ## Options

data/example/multiple_devices.rb

@@ -7,7 +7,8 @@ thread_iphone = Thread.new{
   start_time = Time.now
   app = WDA.new(device_url: 'http://192.168.1.2:8100/')
   app.x
-  app.homescreen
+  app.status
+  sleep 0.5
   app.launch_app('com.facebook.IntegrationApp')
   app.find(:xpath, "//XCUIElementTypeButton[@name='Scrolling']").click
   app.text('ScrollView').click
@@ -27,7 +28,8 @@ thread_simulator = Thread.new{
   start_time = Time.now
   sim = WDA.new
   sim.x
-  sim.homescreen
+  sim.status
+  sleep 0.5
   sim.launch_app('com.facebook.IntegrationApp')
   sim.find(:xpath, "//XCUIElementTypeButton[@name='Scrolling']").click
   sim.text('ScrollView').click

data/example/single_device.rb

@@ -4,13 +4,11 @@ app = WDA.new  # Default devive url: http://localhost:8100
 
 app.x
 
-app.homescreen
-
-app.launch_app('com.facebook.IntegrationApp')
-
 app.status
 
-app.session
+sleep 0.5
+
+app.launch_app('com.facebook.IntegrationApp')
 
 app.button('Alerts')
 

data/lib/wda_lib/debug.rb

@@ -22,14 +22,30 @@ class WDA
       get(@base_url + '/source')['value']['tree']['children'][window_number]
     end
 
+    # Had issue when there is app shortcut in SIRI search or Today's extention, 
+    # having duplication app text, have to find the visibile one
     def find_app(app_name)
       max = 1
-      homescreen if !text(app_name).displayed? && max <= 5
-      while !text(app_name).displayed? do 
-        swipe(@win_x-50, 10, @win_y/2, @win_y/2)
+      app_found = false
+      app = nil
+      homescreen
+      while !app_found do 
+        swipe(@win_x*4/5, 10, @win_y/2, @win_y/2)
         max += 1
+        texts(app_name).each do |e| 
+          app = e
+          if e.displayed?
+            app_found = true
+            break
+          end
+        end
+      end
+
+      if app.nil?
+        fail "Can't find app :#{app_name}"
+      else
+        app
       end
-      text(app_name)
     end
 
   end

data/lib/wda_lib/element.rb

@@ -68,11 +68,11 @@ class WDA
       client.get('/element/' + eid + '/accessibilityContainer')['value']
     end
 
-    # Get type from an element
+    # Get type from an element, ex:  type => "Icon"(XCUIElementTypeIcon)
     # @param id [String] Element uuid
     # @return type [String]
-    def name
-      client.get '/element/' + eid + '/name'
+    def type
+      client.get('/element/' + eid + '/name')['value']
     end
 
     # Set value to an element

data/lib/wda_lib/find_element.rb

@@ -35,6 +35,48 @@ class WDA
       elements.map { |element| Element.new self, element['ELEMENT'] }
     end
 
+    # Search with given name
+    # @param value [String]
+    # @retrun [Hash]
+    def name(value)
+      find :name, value
+    end
+
+    # Search all element with given name
+    # @param value [String]
+    # @retrun [Array]
+    def names(value)
+      finds :name, value
+    end
+
+    # Search with given id
+    # @param value [String]
+    # @retrun [Hash]
+    def id(value)
+      find :id, value
+    end
+
+    # Search all element with given id
+    # @param value [String]
+    # @retrun [Array]
+    def ids(value)
+      finds :id, value
+    end
+
+    # Search with given accessibility_id
+    # @param value [String]
+    # @retrun [Hash]
+    def accessibility_id(value)
+      find :accessibility_id, value
+    end
+
+    # Search all element with given accessibility_id
+    # @param value [String]
+    # @retrun [Array]
+    def accessibility_ids(value)
+      finds :accessibility_id, value
+    end
+
     # Search with given value (Complete value)
     # @param value [String]
     # @retrun [Hash]
@@ -64,10 +106,17 @@ class WDA
     end
 
     # Search with class name
-    # @param class_name [String] XCUIElementType*, class name in XCUITest, ex: names('Button') to search XCUIElementTypeButton 
+    # @param value [String] XCUIElementType*, class name in XCUITest, ex: class_names('Button') to search XCUIElementTypeButton 
+    # @return [Hash] found XCUIElementType* elements
+    def class_name(value)
+      find :class_name, match(value)
+    end
+    
+    # Search with class name
+    # @param value [String] XCUIElementType*, class name in XCUITest, ex: class_names('Button') to search XCUIElementTypeButton 
     # @return [Array] contains all XCUIElementType* elements
-    def names(class_name)
-      finds :class_name, match(class_name)
+    def class_names(value)
+      finds :class_name, match(value)
     end
 
     # Search with xpath
@@ -105,29 +154,35 @@ class WDA
       finds :predicate_string, predicate_value 
     end
 
-
     # @return element's visible cells [Array]
     def visible_cell(id)
       get '/uiaElement/' + id + '/getVisibleCells'
     end
 
-
     # Find button by given index or value
     # @param value [String, Integer] 
     # If value is integer then return the button at that index
     # If value is string then return the first button which contains given value
-    # @return [Button]
+    # @return [Hash, Element]
     def button(value = 0)
       if value.is_a? Numeric
         finds(:xpath, "//XCUIElementTypeButton")[value]
       else
         find(:xpath, "//XCUIElementTypeButton[@name='#{value}']")
       end
-    end 
+    end
 
-    # @return [Hash] All buttons
-    def buttons
-      finds(:xpath, "//XCUIElementTypeButton")
+    # Find buttons by given index or value
+    # @param value [String, Integer] 
+    # If value is integer then return the button at that index
+    # If value is string then return the all button which contains given value
+    # @return [Array] All found buttons
+    def buttons(value = nil)
+      if value.nil?
+        finds(:xpath, "//XCUIElementTypeButton")
+      else
+        finds(:xpath, "//XCUIElementTypeButton[@name='#{value}']")
+      end
     end
 
     # Find the first Button
@@ -211,6 +266,32 @@ class WDA
       finds(:xpath, "//XCUIElementTypeStaticText")
     end
 
+    # Find icon by given index or value
+    # @param value [String, Integer] 
+    # If value is integer then return the icon at that index
+    # If value is string then return the first icon which contains given value
+    # @return [Hash, Element]
+    def icon(value = 0)
+      if value.is_a? Numeric
+        finds(:xpath, "//XCUIElementTypeIcon")[value]
+      else
+        find :xpath,  "//XCUIElementTypeIcon[@name='#{value}']"
+      end
+    end
+
+    # Find icons by given index or value
+    # @param value [String, Integer] 
+    # If value is integer then return the icon at that index
+    # If value is string then return the all icons which contains given value
+    # @return [Array] All found icons
+    def icons(value = nil)
+      if value.nil?
+        finds(:xpath, "//XCUIElementTypeIcon")
+      else
+        finds :xpath,  "//XCUIElementTypeIcon[@name='#{value}']"
+      end
+    end
+
     ########### This is calling selenium find_element* methods##########
     # Find element with given type and value, return first found element
     # @param args [*args]

data/lib/wda_lib/session.rb

@@ -5,6 +5,8 @@ class WDA
     # @return [Obj]
     def status
       @status = get(@base_url + '/status')
+      @platform_name = @status['value']['os']['name']
+      @platform_version = @status['value']['os']['version']
       update_status(@status)
     end
 

data/lib/wda_lib/version.rb

@@ -1,3 +1,3 @@
 class WDA
-  VERSION = '0.0.3'
+  VERSION = '0.0.6'
 end

data/lib/wda_lib.rb

@@ -51,6 +51,7 @@ class WDA
     @url = @base_url
     @server_host = parsed_url.host
     @server_port = parsed_url.port
+    healthcheck
     status
     window_size
     capabilities(opts)
@@ -77,11 +78,8 @@ class WDA
   # @param session_response [object] : http GET session response body
   # @return session_reponse [object]
   def update_status(status_response)
-    @session_id = status_response['sessionId']
     @session_valid = true
     @session_id = status_response['sessionId']
-    @platform_name = status_response['value']['os']['name']
-    @platform_version = status_response['value']['os']['version']
     @url = @base_url + "/session/#{@session_id}"
     capabilities
     status_response

data/wda_lib.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |s|
   s.name        = 'wda_lib'
   s.version     = WDA::VERSION
   s.authors     = ["MIN Yi"]
-  s.email       = 'minsparky@gmail.com'
+  s.email       = 'yi@zen.ly'
 
   s.summary     = "A simple ruby lib of binding methods for WebDriverAgent"
   s.description = "A simple ruby lib of binding methods for WebDriverAgent"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wda_lib
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.6
 platform: ruby
 authors:
 - MIN Yi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-11-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.0.0.beta3.1
 description: A simple ruby lib of binding methods for WebDriverAgent
-email: minsparky@gmail.com
+email: yi@zen.ly
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -127,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A simple ruby lib of binding methods for WebDriverAgent