wda_lib 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfdde1a94a7e89b876fd905f1db859231e2cd73b
-  data.tar.gz: 37a66250c8f8f125ef8294fbceff4669599e4ac0
+  metadata.gz: e65ae5ada8b0e5e3a5dae6137c2490b1da31d582
+  data.tar.gz: f163d6e1070406d562c4209006dc9ac4bea69ed2
 SHA512:
-  metadata.gz: 1691ebedf044e9e1bb4d2a197ee179c91bb846ebe05d9a3809179fa2d12c8fbe21a15ac9258b4c3828cf2d6037c1a23b7a07a11380abb944ad5c8c49eef157ac
-  data.tar.gz: 77982675f07d2486c1a5e8f261399d8495171b84c6b01091e48ebc5af48b2baa08091ce8213f28da70e35fdc6bad4f69b483cce15127c5715621f4939a9904fd
+  metadata.gz: acd58efc072a5f1b9f91f0ba758e03dbc5b4c2cab1d6901da950f6dfb4d06f8644b48cc92354a3c202dce1f58bb1c93556c0bf9717f24e080bd60fe7f98f6511
+  data.tar.gz: ec0e79215ab2c9dfbc42644b2640ed85919281dc573217e461a8c29dcf0db463b7a87beff45164bd5c0bb4c94736e0a2f0e3d5fa0238a357be843eec00a536fe

data/README.md

@@ -1,6 +1,6 @@
 ### wda_lib
 
-A simple ruby lib of binding methods for WebDriverAgent
+A simple ruby lib of binding methods for [WebDriverAgent](https://github.com/facebook/WebDriverAgent)
 
 ## Install
 
@@ -9,134 +9,14 @@ gem install wda_lib
 ```
 
 ## Usage example
-A simple test to show all actions on WDA IntegrationApp
-
-```ruby
-require 'wda_lib'
-
-app = WDA.new
-
-app.x
-
-app.homescreen
-
-app.launch_app('com.facebook.IntegrationApp')
-
-app.status
-
-app.session
-
-app.button('Alerts')
-
-app.button('Alerts').ref
-
-app.button('Alerts').name
-
-app.button('Alerts').click
-
-app.partial_texts('Create')[1].click
-
-app.alert_text
-
-app.accept_alert
-
-app.button('Back').click
-
-app.partial_text('Attri').click
-
-app.xpath_search('StaticText', 'label', 'Label')
-
-app.xpath_search('Button', 'name', 'Second')[0].click
-
-app.textfield('Value').click
-
-app.textfield('Value').send_keys('test')
-
-app.textfield('Valuetest').clear
-
-location = app.textfield('Value2').location
 
-app.tap_on(location[:x], location[:y])
-
-app.keys('Type more keys')
-
-app.button('Back').click
-
-sleep 1
-
-app.find(:xpath, "//XCUIElementTypeButton[@name='Scrolling']").click
-
-app.text('ScrollView').click
-
-app.text('7').scroll('down')
-
-app.text('7').scroll('down')
-
-app.text('7').scroll('up')
-
-app.swipe(180, 180, 330, 100)
-
-app.swipe(180, 180, 100, 330)
-
-app.button('Back').click
-
-app.button('Back').click
-
-app.x
-
-```
+A simple test to show all actions on WDA IntegrationApp
+[Single devices](../blob/master/example/single_device.rb)
 
 ## Example of multiple devices
 
-```ruby
-iphone_testing = true
-simulator_testing = true
-
-thread_iphone = Thread.new{
-  start_time = Time.now
-  app = WDA.new(device_url: 'http://192.168.1.56:8100/')
-  app.x
-  app.homescreen
-  app.launch_app('com.facebook.IntegrationApp')
-  app.find(:xpath, "//XCUIElementTypeButton[@name='Scrolling']").click
-  app.text('ScrollView').click
-  app.text('7').scroll('down')
-  app.text('7').scroll('down')
-  app.text('7').scroll('up')
-  app.swipe(180, 180, 330, 100)
-  app.swipe(180, 180, 100, 330)
-  app.button('Back').click
-  app.x
-  end_time = Time.now  
-  p "Testing time: #{end_time-start_time}"
-  iphone_testing = false
-}
-
-thread_simulator = Thread.new{
-  start_time = Time.now
-  sim = WDA.new
-  sim.x
-  sim.homescreen
-  sim.launch_app('com.facebook.IntegrationApp')
-  sim.find(:xpath, "//XCUIElementTypeButton[@name='Scrolling']").click
-  sim.text('ScrollView').click
-  sim.text('7').scroll('down')
-  sim.text('7').scroll('down')
-  sim.text('7').scroll('up')
-  sim.swipe(180, 180, 330, 100)
-  sim.swipe(180, 180, 100, 330)
-  sim.button('Back').click
-  sim.x
-  end_time = Time.now  
-  p "Testing time: #{end_time-start_time}"
-  simulator_testing = false
-}
-
-while iphone_testing || simulator_testing do 
-  sleep 5 
-end
+[Multiple devices](../blob/master/example/multiple_devices.rb)
 
-```
 
 ## Options
 
@@ -156,6 +36,17 @@ element.rect
 element.location
 ```
 
+## Doc
+
+Use yard to generate locale documentations.
+```ruby
+yard doc
+
+yard server
+```
+
+Open [wda doc](http://localhost:8808) in your browser. 
+
 ## TODO
 
 Add more tests...

data/example/multiple_devices.rb

@@ -0,0 +1,48 @@
+require 'wda_lib'
+
+iphone_testing = true
+simulator_testing = true
+
+thread_iphone = Thread.new{
+  start_time = Time.now
+  app = WDA.new(device_url: 'http://192.168.1.2:8100/')
+  app.x
+  app.homescreen
+  app.launch_app('com.facebook.IntegrationApp')
+  app.find(:xpath, "//XCUIElementTypeButton[@name='Scrolling']").click
+  app.text('ScrollView').click
+  app.text('7').scroll('down')
+  app.text('7').scroll('down')
+  app.text('7').scroll('up')
+  app.swipe(180, 180, 330, 100)
+  app.swipe(180, 180, 100, 330)
+  app.button('Back').click
+  app.x
+  end_time = Time.now  
+  p "Testing time: #{end_time-start_time}"
+  iphone_testing = false
+}
+
+thread_simulator = Thread.new{
+  start_time = Time.now
+  sim = WDA.new
+  sim.x
+  sim.homescreen
+  sim.launch_app('com.facebook.IntegrationApp')
+  sim.find(:xpath, "//XCUIElementTypeButton[@name='Scrolling']").click
+  sim.text('ScrollView').click
+  sim.text('7').scroll('down')
+  sim.text('7').scroll('down')
+  sim.text('7').scroll('up')
+  sim.swipe(180, 180, 330, 100)
+  sim.swipe(180, 180, 100, 330)
+  sim.button('Back').click
+  sim.x
+  end_time = Time.now  
+  p "Testing time: #{end_time-start_time}"
+  simulator_testing = false
+}
+
+while iphone_testing || simulator_testing do 
+  sleep 5 
+end

data/example/single_device.rb

@@ -0,0 +1,72 @@
+require 'wda_lib'
+
+app = WDA.new  # Default devive url: http://localhost:8100
+
+app.x
+
+app.homescreen
+
+app.launch_app('com.facebook.IntegrationApp')
+
+app.status
+
+app.session
+
+app.button('Alerts')
+
+app.button('Alerts').ref
+
+app.button('Alerts').name
+
+app.button('Alerts').click
+
+app.partial_texts('Create')[1].click
+
+app.alert_text
+
+app.accept_alert
+
+app.button('Back').click
+
+app.partial_text('Attri').click
+
+app.xpath_search('StaticText', 'label', 'Label')
+
+app.xpath_search('Button', 'name', 'Second')[0].click
+
+app.textfield('Value').click
+
+app.textfield('Value').send_keys('test')
+
+app.textfield('Valuetest').clear
+
+location = app.textfield('Value2').location
+
+app.tap_on(location[:x], location[:y])
+
+app.keys('Type more keys')
+
+app.button('Back').click
+
+sleep 1
+
+app.find(:xpath, "//XCUIElementTypeButton[@name='Scrolling']").click
+
+app.text('ScrollView').click
+
+app.text('7').scroll('down')
+
+app.text('7').scroll('down')
+
+app.text('7').scroll('up')
+
+app.swipe(180, 180, 330, 100)
+
+app.swipe(180, 180, 100, 330)
+
+app.button('Back').click
+
+app.button('Back').click
+
+app.x
+

data/lib/wda_lib/debug.rb

@@ -22,5 +22,15 @@ class WDA
       get(@base_url + '/source')['value']['tree']['children'][window_number]
     end
 
+    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)
+        max += 1
+      end
+      text(app_name)
+    end
+
   end
 end

data/lib/wda_lib/element.rb

@@ -23,7 +23,7 @@ class WDA
     # @param id [String] Element uuid
     # @return isEnabled? [Boolean]
     def enabled?
-      client.get '/element/' + eid + '/enabled'
+      client.get('/element/' + eid + '/enabled')['value']
     end
 
     # Get wdRect by id
@@ -51,24 +51,23 @@ class WDA
     # @param id [String] Element uuid
     # @return isVisible? [Boolean]
     def displayed?
-      client.get '/element/' + eid + '/displayed'
+      client.get('/element/' + eid + '/displayed')['value']
     end
     
     # Check if element is accessible?
     # @param id [String] Element uuid
-    # @return is accessible? [String]
+    # @return is accessible? [Boolean]
     def accessible?
-      client.get '/element/' + eid + '/accessible'
+      client.get('/element/' + eid + '/accessible')['value']
     end
     
     # Check if element is accessibilityContainer?
     # @param id [String] Element uuid
-    # @return is accessibilityContainer? [String]
+    # @return is accessibilityContainer? [Boolean]
     def accessible_container?
-      client.get '/element/' + eid + '/accessibilityContainer'
+      client.get('/element/' + eid + '/accessibilityContainer')['value']
     end
 
-
     # Get type from an element
     # @param id [String] Element uuid
     # @return type [String]
@@ -176,6 +175,8 @@ class WDA
   # @return width, height
   def window_size
     win_size = get('/window/size')['value']
+    @win_x = win_size['width']
+    @win_y = win_size['height']
     Dimension.new(win_size['width'], win_size['height'])
   end
 

data/lib/wda_lib/find_element.rb

@@ -64,10 +64,10 @@ class WDA
     end
 
     # Search with class name
-    # @param class_name [String] XCUIElementType*, class name in XCUITest, ex: XCUIElementTypeButton
+    # @param class_name [String] XCUIElementType*, class name in XCUITest, ex: names('Button') to search XCUIElementTypeButton 
     # @return [Array] contains all XCUIElementType* elements
-    def name(class_name)
-      finds :class_name, class_name
+    def names(class_name)
+      finds :class_name, match(class_name)
     end
 
     # Search with xpath

data/lib/wda_lib/session.rb

@@ -45,7 +45,7 @@ class WDA
         status
       else 
         app_name = app_name_or_id
-        # TODO find app icon with given app name, click it
+        find_app(app_name).click
       end
       self
     end

data/lib/wda_lib/version.rb

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

data/lib/wda_lib.rb

@@ -27,7 +27,7 @@ class WDA
   Dimension = Struct.new(:width, :height)
 
   attr_accessor :session_id, :http, :bundle_id, :caps, :device, :driver
-  attr_reader :base_url, :server_host, :server_port, :url, :window_w, :window_h
+  attr_reader :base_url, :server_host, :server_port, :url, :window_w, :window_h, :win_x, :win_y
 
   # Get base_url from XCTRunner logs: ServerURLHere->http://x.x.x.x:8100<-ServerURLHere
   # Default base_url 'http://localhost:8100' for running XCTRunner on simulator
@@ -52,6 +52,7 @@ class WDA
     @server_host = parsed_url.host
     @server_port = parsed_url.port
     status
+    window_size
     capabilities(opts)
     @driver = Selenium::WebDriver::Driver.for(:remote, :url => @base_url,  :desired_capabilities => @caps[:desiredCapabilities])
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wda_lib
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - MIN Yi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-06 00:00:00.000000000 Z
+date: 2016-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -89,6 +89,8 @@ files:
 - ".gitignore"
 - ".rspec"
 - README.md
+- example/multiple_devices.rb
+- example/single_device.rb
 - lib/selenium_patch/commands.rb
 - lib/selenium_patch/element_patch.rb
 - lib/selenium_patch/w3c_bridge_patch.rb