wda_lib 0.0.16 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0fefbb0acdf03d03f94d931270dba23ca8d5220
-  data.tar.gz: 297c4a2d95fcd048f2bf55c0e42cd4e3cc1f926c
+  metadata.gz: e7bd726e001942bb862ef2a84530479e09931b7a
+  data.tar.gz: 9995494131ba577468193824c67a0a038391fd9e
 SHA512:
-  metadata.gz: ba2fd6a51b7f68708efd90a1b052f8bf9b2650a425fb3e1e9c8a7cb300ee5fe97f0924085d09df2f4a6b9de5f7ad00120076a66adee364c145424d02153f15e3
-  data.tar.gz: deebfd7fe5067363cd3298e0d1bdfc654d91599beef073ddfad5ea70d24733492f895f0a44d81c8ff3a4ac705c29fa121a2d7557e8829fc791e1a2025d2887e5
+  metadata.gz: 340e97cdc8d0cabfbd4fc5c2432fbb0422b6e2de21406571098be320ddb3aa0bea6501eba7247cd598ea166e5ab4b4cabf60d523a705e888a61f0bbedd4867fa
+  data.tar.gz: 72404538b6fb11a977ec3a9f4299b94b6f67f7fefcfd54aa6bd6b951c71ac766bfe84a82e487005f63a1c2e935c8014f66c5c23a404296c23fd6043c734219b2

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /*.gem
 test.rb
+Rakefile

data/Gemfile

@@ -1,2 +1,4 @@
 source 'https://rubygems.org'
+gem 'awesome_print'
+gem 'pry'
 gemspec

data/LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2016 Zenly SAS
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -21,19 +21,19 @@ A simple test to show all actions on WDA IntegrationApp
 
 
 ## Options
-
-#####Update: I have to disable selenium-webdriver gem since wda_lib was using selenium-webdriver 3.0 beta which has conflict with Appium's one(2.x), I did try to downgrade for wda_lib, but doesn't work currently, need more time to give a try to find a way to handle it. 
-This lib is also providing access of selenium-webdriver method find_element and find_elements.
+This lib is also providing access of selenium-webdriver methods, for example find_element and find_elements.
 You can do:
 
 ```ruby
-element = app.find_element(:link_text, 'label=Attributes')
+element = app.driver.find_element(:link_text, 'label=xxxx')
 ```
 
 Then you can use all methods for selenium element object:
 ```
 element.click
 element.name
+element.label
+element.tag_name
 element.size
 element.rect
 element.location
@@ -62,4 +62,9 @@ Welcome to get your contributions, to help improving the lib.
 2. Create your feature branch (`git checkout -b my-new-feature`)
 3. Commit your changes (`git commit -am 'Added some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
-5. Create new Pull Request
+5. Create new Pull Request
+
+## Contact Information
+
+Author: Yi MIN
+E-mail: yi@zen.ly

data/lib/selenium_patch/bridge_patch.rb

@@ -0,0 +1,115 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
+# Patch or add methods for Bridge. Called by Element instance or Bridge instance
+require 'pry'
+
+Selenium::WebDriver::Remote::Bridge.class_eval do
+
+  # Patch Bridge create_session method
+  def create_session(desired_capabilities)
+    @session_id = desired_capabilities[:session_id]
+    if !desired_capabilities[:session_valid]
+      resp = raw_execute :new_session, {}, {desiredCapabilities: desired_capabilities}
+      desired_capabilities[:session_id] = resp['session_id']
+      desired_capabilities[:session_valid] = true 
+      @session_id = resp['session_id']
+    end
+    return desired_capabilities
+  end
+
+  # # Add status method
+  # def session_status
+  #   execute :session_status
+  # end
+
+  # Add element_rect method
+  def element_rect(element)
+    data = execute :get_element_rect, id: element
+    return data
+  end
+
+  # Add element_scroll method
+  def scroll_element(element, direction)
+    execute :scroll_element, {id: element}, {direction: direction}
+  end
+
+  def element_location(element)
+    data = execute :get_element_rect, id: element
+
+    Selenium::WebDriver::Point.new data['x'], data['y']
+  end
+
+  def element_size(element)
+    data = execute :get_element_rect, id: element
+
+    Selenium::WebDriver::Dimension.new data['width'], data['height']
+  end
+
+  # # Patch Bridge element_attribute method
+  # def element_attribute(element, name)
+  #   execute :get_element_attribute, id: element['ELEMENT'], name: name
+  # end
+
+  # # Add get_page_source method with accept_type to Bridge 
+  # def source(accept_type)
+  #   if accept_type == 'json'
+  #     execute :get_page_source_json
+  #   elsif accept_type == 'xml'
+  #     execute :get_page_source_xml
+  #   else
+  #     raise "Unknown source type. Only 'xml' and 'json' source types are supported."
+  #   end
+  # end
+
+  # # Add missing bindings
+  # # https://github.com/facebook/WebDriverAgent/blob/master/WebDriverAgentLib/Commands/FBElementCommands.m
+  # # Add tap_element method
+  # def tap_element(element)
+  #   execute :click_element, id: element['ELEMENT']
+  # end
+
+  # # Add double_tap_element method
+  # def double_tap_element(element)
+  #   execute :double_click_element, id: element['ELEMENT']
+  # end
+
+  # # Add two_finger_tap_element method
+  # def two_finger_tap_element(element)
+  #    execute :two_finger_click_element, id: element['ELEMENT']
+  # end
+
+  # # Add touch_and_hold_element method
+  # def touch_and_hold_element(element)
+  #   execute :touch_and_hold, id: element['ELEMENT']
+  # end
+
+
+  # # Add drag_from_to_for_duration method
+  # def drag_from_to_for_duration(element, toX, toY, duration = 0)
+  #   el_location = element_location(element)
+  #   fromX = el_location[:x]
+  #   fromY = el_location[:y]
+  #   execute :drag_from_to_for_duration, {id: element['ELEMENT']}, { fromX: fromX, toX: toX, fromY: fromY, toY: toY, duration: duration }
+  # end
+
+  # # Add single tap method
+  # def tap(x,y, element = nil)
+  #   if element.nil?
+  #     execute :tap, {id: 0}, { x: x, y: y }
+  #   else
+  #     execute :tap, {id: element['ELEMENT']}, { x: x, y: y }
+  #   end 
+  # end
+    
+  # # Add double tap method
+  # def double_tap(x,y)
+  #   execute :double_tap, {}, { x: x, y: y }  
+  # end
+
+  # def touch_and_hold(x, y)
+  #   execute :touch_and_hold, {}, { x: x, y: y }  
+  # end
+
+end

data/lib/selenium_patch/commands_patch.rb

@@ -0,0 +1,34 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
+
+module Selenium
+  module WebDriver
+    module Remote
+      class Bridge
+        #
+        # http://www.w3.org/TR/2015/WD-webdriver-20150918/#list-of-endpoints
+        #
+        unfrozen_COMMANDS = COMMANDS.dup
+        unfrozen_COMMANDS.merge!({
+                                  get_page_source_json: [:get, 'source/json'.freeze],
+                                  get_page_source_xml: [:get, 'source/xml'.freeze],
+                                  session_status: [:get, 'status'.freeze],
+                                  get_element_rect: [:get, 'session/:session_id/element/:id/rect'.freeze],
+                                  is_element_accessible: [:get, 'session/:session_id/element/:id/accessible'.freeze],
+                                  element_accessibility_container: [:get, 'session/:session_id/element/:id/accessibilityContainer'.freeze],
+                                  double_click_element: [:post, 'session/:session_id/element/:id/doubleTap'.freeze],
+                                  two_finger_click_element: [:post, 'session/:session_id/element/:id/twoFingerTap'.freeze],
+                                  touch_and_hold_element: [:post, 'session/:session_id/element/:id/touchAndHold'.freeze],
+                                  scroll_element: [:post, 'session/:session_id/uiaElement/:id/scroll'.freeze],
+                                  drag_from_to_for_duration: [:post, 'session/:session_id/uiaTarget/:uuid/dragfromtoforduration'.freeze],
+                                  tap: [:post, 'session/:session_id/doubleTap/:id'.freeze],
+                                  tap_and_hold: [:post, 'session/:session_id/touchAndHold'.freeze],
+                                  double_tap: [:post, 'session/:session_id/doubleTap'.freeze]
+                                })
+        COMMANDS = unfrozen_COMMANDS.freeze
+      end
+    end # Remote
+  end # WebDriver
+end # Selenium

data/lib/selenium_patch/element_patch.rb

@@ -1,16 +1,21 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
+
 # require 'selenium-webdriver'
 
 # Patch or add methods for Element instance
 Selenium::WebDriver::Element.class_eval do 
-  def eid
-    @id['ELEMENT']
+  def id
+    ref
   end
 
   # Scroll on an element with its id
   # @param id [String], direction [String] up, down, left, right
   # @return {}
   def scroll(direction)
-    bridge.element_scroll @id, direction
+    bridge.element_scroll self, direction
   end
 
   # Get wdRect by id
@@ -22,23 +27,23 @@ Selenium::WebDriver::Element.class_eval do
 
   # Get element type attribute
   # @return [String] example: "XCUIElementTypePageIndicator", "XCUIElementTypeButton"
-  def type
+  def tag_name
     bridge.element_tag_name @id
   end
 
   # Get element value attribute
   def value
-    bridge.element_attribute @id, 'value'
+    bridge.element_attribute self, 'value'
   end
 
   # Get element name attribute
   def name
-    bridge.element_attribute @id, 'name'
+    bridge.element_attribute self, 'name'
   end
 
   # Get element name attribute
   def label
-    bridge.element_attribute @id, 'label'
+    bridge.element_attribute self, 'label'
   end
 
   # Get the value of a the given attribute of the element.
@@ -47,7 +52,7 @@ Selenium::WebDriver::Element.class_eval do
   # @return [String,nil]
   #   attribute value
   def attribute(name)
-    bridge.element_attribute @id, name
+    bridge.element_attribute self, name
   end
 
 end

data/lib/wda_lib/alert.rb

@@ -1,3 +1,7 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
 class WDA
   module Alert
 

data/lib/wda_lib/custom.rb

@@ -1,3 +1,7 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
 class WDA
   module Custome
 
@@ -17,16 +21,16 @@ class WDA
     end
 
     # Timeout(without Session)
-    # @param duraiton [Float] the timeout in milliseconds
+    # @param duration [Float] the timeout in milliseconds
     # @return [void]
-    def timeout(duraiton)
+    def timeout(duration)
       post(@base_url + '/timeout', { type: 'xctevent', ms: duration })
     end
 
     # Timeout(with Session)
     # @param duration [Float] the timeout in milliseconds
     # @return [void]
-    def timeout_in_session(duraiton)
+    def timeout_in_session(duration)
       post '/timeout', { type: 'xctevent', ms: duration }
     end
 

data/lib/wda_lib/debug.rb

@@ -1,8 +1,12 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
 class WDA
   module Debug
     
     # Get all elements on current screen
-    # @param session [String], accessible [Boolean], visible [Boolean]
+    # @param session_id [String], accessible [Boolean], visible [Boolean]
     # 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]
@@ -28,13 +32,12 @@ class WDA
 
     # Had issue when there is app shortcut in SIRI search or Today's extention, 
     # having duplication app text, have to find the visibile one
+    # Try to find app on current screen, if can't find, click home button to get first page of springboard
     def find_app(app_name)
-      max = 1
+      max = 0
       app_found = false
       app = nil
-      homescreen
       while !app_found && max < 10 do 
-        max += 1
         icons(app_name).each do |e| 
           app = e
           if e.displayed?
@@ -43,7 +46,9 @@ class WDA
           end
         end
         break if app_found
+        homescreen if max == 1 # Get back to first page if first try failed
         swipe(@win_x*4/5, 10, @win_y/2, @win_y/2)
+        max += 1
       end
 
       app.nil?? (fail "Can't find app :#{app_name}") : app

data/lib/wda_lib/element.rb

@@ -1,3 +1,7 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
 class WDA
   class Element
 
@@ -20,112 +24,101 @@ class WDA
     end
 
     # Check if element is enabled?
-    # @param id [String] Element uuid
-    # @return isEnabled? [Boolean]
+    # @return is isEnabled? [Boolean]
     def enabled?
       client.get('/element/' + eid + '/enabled')['value']
     end
 
     # Get wdRect by id
-    # @param id [String] Element uuid
-    # @return wdRect 
+    # @return is wdRect 
     def rect
       client.get('/element/' + eid + '/rect')['value']
     end
 
     # Get attribute value
-    # @param id [String], name [String]
-    # @return attributeValue [String]
+    # @param name [String]
+    # @return is attributeValue [String]
     def attribute(name)
       client.get '/element/' + eid + '/attribute/' + name
     end
 
     # Get text from an element(StaticText or Button)
-    # @param id [String] Element uuid
-    # @return text [String]
+    # @return is text [String]
     def text
       client.get('/element/' + eid + '/text')['value']
     end
 
     # Check if element is displayed?
-    # @param id [String] Element uuid
-    # @return isVisible? [Boolean]
+    # @return is isVisible? [Boolean]
     def displayed?
       client.get('/element/' + eid + '/displayed')['value']
     end
     
     # Check if element is accessible?
-    # @param id [String] Element uuid
     # @return is accessible? [Boolean]
     def accessible?
       client.get('/element/' + eid + '/accessible')['value']
     end
     
     # Check if element is accessibilityContainer?
-    # @param id [String] Element uuid
     # @return is accessibilityContainer? [Boolean]
     def accessible_container?
       client.get('/element/' + eid + '/accessibilityContainer')['value']
     end
 
     # Get type from an element, ex:  type => "Icon"(XCUIElementTypeIcon)
-    # @param id [String] Element uuid
-    # @return type [String]
+    # @return is type [String]
     def type
       client.get('/element/' + eid + '/name')['value']
     end
 
     # Set value to an element
-    # @param id [String] Element uuid, value [String]
+    # @param value [String]
     # @return element uuid [String]
     def send_keys(value)
       client.post '/element/' + eid + '/value', { value: value.chars }
     end
 
     # Tap on an element with its id
-    # @param id [String] Element uuid
     # @return element uuid [String]
     def click
       client.post '/element/' + eid + '/click'
     end
 
     # Clearing text of an given element
-    # @param id [String] Element uuid
     # @return element uuid [String]
     def clear
       client.post '/element/' + eid + '/clear'
     end
 
     # Double tap on an element with its id
-    # @param id [String] Element uuid
     # @return element uuid [String]
     def double_tap
       client.post '/uiaElement/' + eid + '/doubleTap'
     end
 
     # Two finger tap on an element with its id
-    # @param id [String] Element uuid
     # @return element uuid [String]
     def two_finger_tap
       client.post '/uiaElement/' + eid + '/twoFingerTap'
     end
 
     # Touch and hold on for a while finger tap on an element with its id
-    # @param id [String], duration [Double]
+    # @param duration [Double]
     # @return element uuid [String]
     def touch_hold(duration)
       client.post '/uiaElement/' + eid + '/touchAndHold', { duration: duration }
     end
 
     # Scroll on an element with its id
-    # @param id [String], direction [String] up, down, left, right
+    # @param direction [String] up, down, left, right
     # @return [Hash]
     def scroll(direction = nil)
       client.post '/uiaElement/' + eid + '/scroll', { direction: direction }
     end
 
     # Drag on an element with its id and position
-    # @param to* [String], duration [Double]
+    # @param toX [String], toY [String], duration [Double]
     def drag_to(toX, toY, duration = 0)
       fromX = location[:x]
       fromY = location[:y]
@@ -155,13 +148,13 @@ class WDA
   end
 
   # Swipe on an element with its id and position
-  # @param [Integer]
+  # @param fromX [Integer], toX [Integer], fromY [Integer], toY [Integer]
   def swipe(fromX, toX, fromY, toY)
     post '/uiaTarget/0/dragfromtoforduration', { fromX: fromX, toX: toX, fromY: fromY, toY: toY, duration: 0 }
   end
 
   # Tap on a given positon
-  # @param id [String], x, y [Integer]
+  # @param x [Integer], y [Integer]
   def tap_on(x, y)
     post '/tap/0', { x: x, y: y }
   end
@@ -180,5 +173,4 @@ class WDA
     Dimension.new(win_size['width'], win_size['height'])
   end
 
-end
-
+end

data/lib/wda_lib/error.rb

@@ -1,7 +1,11 @@
+#
+# Created by Yi MIN
+# Copyright © 2016 Zenly. All rights reserved.
+#
 class WDA
   module Error
     class WdaError < StandardError; end
     class NoSuchElementError < WdaError; end
     class TimeoutError < WdaError; end
   end
-end
+end

data/lib/wda_lib/find_element.rb

@@ -1,3 +1,7 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
 class WDA
   module FindElement
     ### Searching for elements
@@ -76,49 +80,49 @@ class WDA
 
     # Search with given name
     # @param value [String]
-    # @retrun [Hash]
+    # @return [Hash]
     def name(value)
       find :name, value
     end
 
     # Search all element with given name
     # @param value [String]
-    # @retrun [Array]
+    # @return [Array]
     def names(value)
       finds :name, value
     end
 
     # Search with given id
     # @param value [String]
-    # @retrun [Hash]
+    # @return [Hash]
     def id(value)
       find :id, value
     end
 
     # Search all element with given id
     # @param value [String]
-    # @retrun [Array]
+    # @return [Array]
     def ids(value)
       finds :id, value
     end
 
     # Search with given accessibility_id
     # @param value [String]
-    # @retrun [Hash]
+    # @return [Hash]
     def accessibility_id(value)
       find :accessibility_id, value
     end
 
     # Search all element with given accessibility_id
     # @param value [String]
-    # @retrun [Array]
+    # @return [Array]
     def accessibility_ids(value)
       finds :accessibility_id, value
     end
 
     # Search with given value (Complete value)
     # @param value [String]
-    # @retrun [Hash]
+    # @return [Hash]
     def text(value)
       find :link_text, "label=#{value}"
     end
@@ -132,7 +136,7 @@ class WDA
 
     # Search with given partial value (partial link text)
     # @param value [String]
-    # @retrun [Hash]
+    # @return [Hash]
     def partial_text(value)
       find :partial_link_text, "label=#{value}"
     end
@@ -178,7 +182,7 @@ class WDA
     end
 
     # Search predicate string, return first found element
-    # @param value [String] 'isWDVisible=1'
+    # @param predicate_value [String] 'isWDVisible=1'
     # example: 'isWDAccessible=1', 'isWDEnabled=0'
     # @return [Hash]
     def predicate_text(predicate_value)
@@ -186,7 +190,7 @@ class WDA
     end
 
     # Search with predicate string
-    # @param value [String] 'isWDVisible=1'
+    # @param predicate_value [String] 'isWDVisible=1'
     # example: 'isWDAccessible=1', 'isWDEnabled=0', 'isWDAccessibilityContainer=1'
     # @return [Array]
     def predicate_texts(predicate_value)
@@ -404,5 +408,4 @@ class WDA
       @timeout = second
     end
   end
-end
-
+end

data/lib/wda_lib/orientation.rb

@@ -1,3 +1,7 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
 class WDA
   module Orientation
     def orientation
@@ -16,6 +20,4 @@ class WDA
       post @base_url + '/rotation'
     end
   end
-end
-
-
+end

data/lib/wda_lib/screenshot.rb

@@ -1,3 +1,7 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
 require 'base64'
 
 class WDA

data/lib/wda_lib/session.rb

@@ -1,3 +1,7 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
 class WDA
   module Session
 
@@ -11,8 +15,8 @@ class WDA
     end
 
     # Update current running sessionId to @session_id
-    # @param session_response [object] : http GET session response body
-    # @return session_reponse [object]
+    # @param status_response [object] : http GET session response body
+    # @return [object]
     def update_status(status_response)
       @session_valid = true
       @session_id = status_response['sessionId']
@@ -37,14 +41,14 @@ class WDA
         end
       else
         @session_id = response['sessionId']
-        @caps[:desiredCapabilities][:session_id] = @session_id
-        @caps[:desiredCapabilities][:session_valid] = true
+        @caps[:desired_capabilities][:session_id] = @session_id
+        @caps[:desired_capabilities][:session_valid] = true
         @url = @base_url + "/session/#{@session_id}"
       end
       response
     end
 
-    # Post desiredCapabilities to wda server to create a session
+    # 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]
     def launch_app(app_name_or_id)
@@ -54,9 +58,9 @@ class WDA
         @session_id = nil      # Prepare to create new session 
         @session_valid = false # Prepare to create new session 
         post(@base_url + '/session', { desiredCapabilities: { bundleId: app_name_or_id }})
-        ## Temporarily disabled
-        # capabilities
-        # @driver = Selenium::WebDriver::Driver.for(:remote, :url => @base_url,  :desired_capabilities => @caps[:desiredCapabilities])
+        # Temporarily disabled
+        capabilities
+        @driver = Selenium::WebDriver::Driver.for(:remote, :url => @base_url,  :desired_capabilities => @caps[:desired_capabilities])
       else 
         app_name = app_name_or_id
         find_app(app_name).click
@@ -76,7 +80,7 @@ class WDA
     end
 
     # Exit current app by delete session with given session_id
-    # @params session_id [String]
+    # @param session_id [String]
     # @return delete session response [Json]
     def quit(session_id = nil)
       (session_id.nil?)? sessionId = @session_id : sessionId = session_id

data/lib/wda_lib/touch_id.rb

@@ -1,3 +1,7 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
 class WDA
   module TouchID
 
@@ -12,4 +16,4 @@ class WDA
       post(@base_url + '/Simulator/touch_id', { match: 0 }.to_json)
     end
   end
-end
+end

data/lib/wda_lib/type.rb

@@ -1,3 +1,7 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
 class WDA
   module Type
     def match(type)
@@ -88,4 +92,4 @@ class WDA
       types.select{|t|t.downcase == type.downcase}.first
     end
   end
-end
+end

data/lib/wda_lib/version.rb

@@ -1,3 +1,7 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
 class WDA
-  VERSION = '0.0.16'
-end
+  VERSION = '0.0.19'
+end

data/lib/wda_lib.rb

@@ -1,3 +1,7 @@
+#
+# Created by Yi MIN<yi@zen.ly>
+# Copyright © 2016 Zenly. All rights reserved.
+#
 Dir[File.dirname(__FILE__) + '/wda_lib/*.rb'].each {|file| require file }
 require 'json'
 require 'httparty'
@@ -43,9 +47,15 @@ class WDA
   # Start wda client
   # opts = { caps: { bundleId: @bundle_id }, device_url: 'http://x.x.x.x:8100' }
   # WDA.new(opts).start_session
-  def initialize(opts = {})
+  def initialize(opt)
     # fail 'opts should be a hash' unless opts.is_a? Hash
-    # fail 'bundleId should be provided' if opts[:bundleId].nil?
+    # fail 'bundleId should be provided' if opts[:bundle_id].nil?
+    if opt.is_a? String
+      url = opt
+      opts = {:device_url => url}
+    else
+      opts = opt
+    end
     url = opts[:device_url] || BASE_URL
     parsed_url = URI.parse(url)
     @base_url = parsed_url.scheme + '://' + parsed_url.host + ':' + parsed_url.port.to_s
@@ -53,28 +63,34 @@ class WDA
     @server_host = parsed_url.host
     @server_port = parsed_url.port
     @timeout = 10
+    @listener = opts.fetch :listener, nil
     status
     window_size
-    capabilities(opts)
-
-    ## Temporarily disabled
-    # @driver = Selenium::WebDriver::Driver.for(:remote, :url => @base_url,  :desired_capabilities => @caps[:desiredCapabilities])
+    p 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
   # @param opts [Hash]
   # @return attribute caps [Hash]
-  def capabilities(opts = {})
-    @bundle_id = opts[:bundleId] if !opts[:bundleId].nil?
-    selenium_capabilities = Selenium::WebDriver::Remote::W3CCapabilities.new( 
-                              browser_name: 'iphone', 
+  def capabilities(opts = {}) 
+    @bundle_id = opts[:bundle_id] if !opts[:bundle_id].nil?
+    selenium_capabilities = Selenium::WebDriver::Remote::Capabilities.new( 
                               platform_name: @platform_name, 
                               platform_version: @platform_version,
                               session_id: @session_id,
                               session_valid: @session_valid,
-                              bundleId: @bundle_id
+                              bundleId: @bundle_id,
+                              javascript_enabled: true,
+                              takes_screenshot: true,
+                              css_selectors_enabled: true
                             )
-    @caps = { desiredCapabilities: selenium_capabilities }
+    @caps = { desired_capabilities: selenium_capabilities }
   end
 
   # HTTP methods for dealing with all supported motheds in FB WDA

data/wda_lib.gemspec

@@ -17,11 +17,11 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.homepage    =
     'https://github.com/znly/wda'
-  s.license       = 'MIT'
+  s.license       = 'Apache-2.0'
 
   s.add_development_dependency "rake", "~> 10.0"
   s.add_development_dependency "rspec", "~> 3.5"
   s.add_dependency "bundler", "~> 1.12"
   s.add_dependency "httparty", "~> 0.14"
-  s.add_dependency "selenium-webdriver", "~> 2.50"
+  s.add_dependency "selenium-webdriver", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wda_lib
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.19
 platform: ruby
 authors:
 - MIN Yi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-28 00:00:00.000000000 Z
+date: 2017-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.50'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.50'
+        version: '3.0'
 description: A simple ruby lib of binding methods for WebDriverAgent
 email: yi@zen.ly
 executables: []
@@ -89,12 +89,13 @@ files:
 - ".gitignore"
 - ".rspec"
 - Gemfile
+- LICENSE
 - README.md
 - example/multiple_devices.rb
 - example/single_device.rb
-- lib/selenium_patch/commands.rb
+- lib/selenium_patch/bridge_patch.rb
+- lib/selenium_patch/commands_patch.rb
 - lib/selenium_patch/element_patch.rb
-- lib/selenium_patch/w3c_bridge_patch.rb
 - lib/wda_lib.rb
 - lib/wda_lib/alert.rb
 - lib/wda_lib/custom.rb
@@ -112,7 +113,7 @@ files:
 - wda_lib.gemspec
 homepage: https://github.com/znly/wda
 licenses:
-- MIT
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []

data/lib/selenium_patch/commands.rb

@@ -1,136 +0,0 @@
-# encoding: utf-8
-#
-# Licensed to the Software Freedom Conservancy (SFC) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The SFC licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-module Selenium
-  module WebDriver
-    module Remote
-      class W3CBridge
-        #
-        # http://www.w3.org/TR/2015/WD-webdriver-20150918/#list-of-endpoints
-        #
-
-        #
-        # session handling
-        #
-
-        command :newSession, :post, 'session'
-        command :deleteSession, :delete, 'session/:session_id'
-
-        #
-        # basic driver
-        #
-
-        command :get, :post, 'session/:session_id/url'
-        command :getCurrentUrl, :get, 'session/:session_id/url'
-        command :back, :post, 'session/:session_id/back'
-        command :forward, :post, 'session/:session_id/forward'
-        command :refresh, :post, 'session/:session_id/refresh'
-        command :getTitle, :get, 'session/:session_id/title'
-
-        #
-        # window and Frame handling
-        #
-
-        command :getWindowHandle, :get, 'session/:session_id/window'
-        command :closeWindow, :delete, 'session/:session_id/window'
-        command :switchToWindow, :post, 'session/:session_id/window'
-        command :getWindowHandles, :get, 'session/:session_id/window/handles'
-        command :fullscreenWindow, :post, 'session/:session_id/window/fullscreen'
-        command :maximizeWindow, :post, 'session/:session_id/window/maximize'
-        command :setWindowSize, :post, 'session/:session_id/window/size'
-        command :getWindowSize, :get, 'session/:session_id/window/size'
-        command :switchToFrame, :post, 'session/:session_id/frame'
-        command :switchToParentFrame, :post, 'session/:session_id/frame/parent'
-
-        #
-        # element
-        #
-
-        command :findElement, :post, 'session/:session_id/element'
-        command :findElements, :post, 'session/:session_id/elements'
-        command :findChildElement, :post, 'session/:session_id/element/:id/element'
-        command :findChildElements, :post, 'session/:session_id/element/:id/elements'
-        command :getActiveElement, :get, 'session/:session_id/element/active'
-        command :isElementSelected, :get, 'session/:session_id/element/:id/selected'
-        command :getElementAttribute, :get, 'session/:session_id/element/:id/attribute/:name'
-        command :getElementProperty, :get, 'session/:session_id/element/:id/property/:name'
-        command :getElementCssValue, :get, 'session/:session_id/element/:id/css/:property_name'
-        command :getElementText, :get, 'session/:session_id/element/:id/text'
-        command :getElementTagName, :get, 'session/:session_id/element/:id/name'
-        command :getElementRect, :get, 'session/:session_id/element/:id/rect'
-        command :isElementEnabled, :get, 'session/:session_id/element/:id/enabled'
-
-        #
-        # document handling
-        #
-
-        command :getPageSource, :get, '/session/:session_id/source'
-        command :executeScript, :post, 'session/:session_id/execute/sync'
-        command :executeAsyncScript, :post, 'session/:session_id/execute/async'
-
-        #
-        # cookies
-        #
-
-        command :getAllCookies, :get, 'session/:session_id/cookie'
-        command :getCookie, :get, 'session/:session_id/cookie/:name'
-        command :addCookie, :post, 'session/:session_id/cookie'
-        command :deleteCookie, :delete, 'session/:session_id/cookie/:name'
-
-        #
-        # timeouts
-        #
-
-        command :setTimeout, :post, 'session/:session_id/timeouts'
-
-        #
-        # actions
-        #
-
-        command :actions, :post, 'session/:session_id/actions'
-
-        #
-        # Element Operations
-        #
-
-        command :elementClick, :post, 'session/:session_id/element/:id/click'
-        command :elementTap, :post, 'session/:session_id/element/:id/tap'
-        command :elementClear, :post, 'session/:session_id/element/:id/clear'
-        command :elementSendKeys, :post, 'session/:session_id/element/:id/value'
-        command :elementScroll, :post, 'session/:session_id/uiaElement/:id/scroll'
-
-        #
-        # alerts
-        #
-
-        command :dismissAlert, :post, 'session/:session_id/alert/dismiss'
-        command :acceptAlert, :post, 'session/:session_id/alert/accept'
-        command :getAlertText, :get, 'session/:session_id/alert/text'
-        command :sendAlertText, :post, 'session/:session_id/alert/text'
-
-        #
-        # screenshot
-        #
-
-        command :takeScreenshot, :get, 'session/:session_id/screenshot'
-        command :takeElementScreenshot, :get, 'session/:session_id/element/:id/screenshot'
-      end
-    end # Remote
-  end # WebDriver
-end # Selenium

data/lib/selenium_patch/w3c_bridge_patch.rb

@@ -1,31 +0,0 @@
-# Patch or add methods for Bridge. Called by Element instance or Bridge instance
-
-Selenium::WebDriver::Remote::W3CBridge.class_eval do
-  # Patch W3CBridge create_session method
-  def create_session(desired_capabilities)
-    @session_id = desired_capabilities[:session_id]
-    if !desired_capabilities[:session_valid]
-      resp = raw_execute :newSession, {}, {desiredCapabilities: desired_capabilities}
-      desired_capabilities[:session_id] = resp['sessionId']
-      desired_capabilities[:session_valid] = true 
-      @session_id = resp['sessionId']
-    end
-    return desired_capabilities
-  end
-
-  # Add element_scroll method
-  def element_scroll(element, direction)
-    execute :elementScroll, {id: element.values.first}, {direction: direction}
-  end
-
-  # Add element_rect method
-  def element_rect(element)
-    data = execute :getElementRect, id: element['ELEMENT']
-    return data
-  end
-
-  # Patch W3CBridge element_attribute method
-  def element_attribute(element, name)
-    execute :getElementAttribute, id: element['ELEMENT'], name: name
-  end
-end