wda_lib 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96669d22fb7d6d40b173f8e7c76095bada487c73
-  data.tar.gz: b640ca7a9881a66925011548b5954fbb2453af00
+  metadata.gz: a0fefbb0acdf03d03f94d931270dba23ca8d5220
+  data.tar.gz: 297c4a2d95fcd048f2bf55c0e42cd4e3cc1f926c
 SHA512:
-  metadata.gz: b9a06e066dff08665084c0b063fcf9ae1c7ee48f25614b3e1e1a154d40f611b4923819c197c68fa48d509d13565353c7738678d0bfff23ad62dfcda18d17f2df
-  data.tar.gz: f794756fa93caa0657c0c0af2349999ca19ad2382771a96dadb752696cb8823eaf0c9c96ccec024dc4375af658e44b7d0b21eee52eab81ca41b71b8eb8264f5b
+  metadata.gz: ba2fd6a51b7f68708efd90a1b052f8bf9b2650a425fb3e1e9c8a7cb300ee5fe97f0924085d09df2f4a6b9de5f7ad00120076a66adee364c145424d02153f15e3
+  data.tar.gz: deebfd7fe5067363cd3298e0d1bdfc654d91599beef073ddfad5ea70d24733492f895f0a44d81c8ff3a4ac705c29fa121a2d7557e8829fc791e1a2025d2887e5

data/lib/wda_lib/element.rb

@@ -44,7 +44,7 @@ class WDA
     # @param id [String] Element uuid
     # @return text [String]
     def text
-      client.get '/element/' + eid + '/text'
+      client.get('/element/' + eid + '/text')['value']
     end
 
     # Check if element is displayed?

data/lib/wda_lib/error.rb

@@ -0,0 +1,7 @@
+class WDA
+  module Error
+    class WdaError < StandardError; end
+    class NoSuchElementError < WdaError; end
+    class TimeoutError < WdaError; end
+  end
+end

data/lib/wda_lib/find_element.rb

@@ -6,33 +6,72 @@ class WDA
     # @param type [String, Symbol], value [Stirng]
     # @return [Hash]
     def find(type, value)
-      element = post('/element', { using: stringlize(type), value: value })
-      fail "Can't find #{value} with type #{type}" if element['status'] !=0 
-      Element.new self, element['value']
+      wait = Wait.new(:timeout => @timeout) # seconds
+
+      begin
+        wait.until {
+          @element = post('/element', { using: stringlize(type), value: value }) 
+          @element['status'] == 0
+        }
+      ensure
+        raise Error::NoSuchElementError, "Can't find '#{value}' with type '#{type}'" if @element['status'] != 0 
+      end
+
+      Element.new self, @element['value']
     end
 
     # Find all elements with given type and value, return in an Array
     # @param type [String, Symbol], value [Stirng]
     # @return [Array]
     def finds(type, value)
-      elements = post('/elements', { using: stringlize(type), value: value })['value']
-      elements.map { |element| Element.new self, element }
+      wait = Wait.new(:timeout => @timeout) # seconds
+      
+      begin
+        wait.until { 
+          @elements = post('/elements', { using: stringlize(type), value: value })['value']
+          @elements.length != 0
+        }
+      ensure
+        raise Error::NoSuchElementError, "Can't find '#{value}' with type '#{type}'" if @elements.length == 0 
+      end
+
+      @elements.map { |element| Element.new self, element }
     end
 
     # Find child element by given type and value, return first found element
     # @param id [String] parent element id, type [String, Symbol], value [Stirng]
     # @return [Object] found element
     def find_subl_element(id, type, value)
-      element = post('/element/' + id + '/element', { using: type, value: value })
-      Element.new self, element['ELEMENT']
+      wait = Wait.new(:timeout => @timeout) # seconds
+      begin
+        wait.until {
+          @element = post('/element/' + id + '/element', { using: stringlize(type), value: value })
+          @element['status'] == 0
+        }
+      ensure
+        raise Error::NoSuchElementError, "Can't find '#{value}' with type '#{type}'" if @element['status'] != 0 
+      end
+
+      Element.new self, @element['value']
     end
 
     # Find children elements by given type and value, return elements array
     # @param id [String] parent element id, type [String, Symbol], value [Stirng]
     # @return [Array<Element>]
     def find_subl_elements(id, type, value)
-      elements = post('/element/' + id + '/elements', { using: type, value: value })
-      elements.map { |element| Element.new self, element['ELEMENT'] }
+      wait = Wait.new(:timeout => @timeout) # seconds
+      
+      begin
+        wait.until { 
+          @result = post('/element/' + id + '/elements', { using: stringlize(type), value: value })
+          @elements = @result['value']
+          @result['status'] != 7
+        }
+      ensure
+        raise Error::NoSuchElementError, "Can't find '#{value}' with type '#{type}'" if @result['status'] != 0 
+      end
+
+      @elements.map { |element| Element.new self, element }
     end
 
     # Search with given name
@@ -355,10 +394,14 @@ class WDA
       if instring.is_a? Symbol
         instring.to_s.gsub('_', ' ')
       elsif instring.is_a? String
-        return instring
+        return instring.gsub('_', ' ')
       else 
         fail 'Xpath searching type should be a String'
       end
+    end 
+
+    def set_timeout(second)
+      @timeout = second
     end
   end
 end

data/lib/wda_lib/version.rb

@@ -1,3 +1,3 @@
 class WDA
-  VERSION = '0.0.15'
+  VERSION = '0.0.16'
 end

data/lib/wda_lib/wait.rb

@@ -0,0 +1,75 @@
+# 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.
+
+class WDA
+  class Wait
+    DEFAULT_TIMEOUT  = 10
+    DEFAULT_INTERVAL = 2
+    
+    #
+    # Create a new Wait instance
+    #
+    # @param [Hash] opts Options for this instance
+    # @option opts [Numeric] :timeout (10) Seconds to wait before timing out.
+    # @option opts [Numeric] :interval (2) Seconds to sleep between polls.
+    # @option opts [String] :message Exception mesage if timed out.
+    # @option opts [Array, Exception] :ignore Exceptions to ignore while polling (default: Error::NoSuchElementError)
+    #
+
+    def initialize(opts = {})
+      @timeout  = opts.fetch(:timeout, DEFAULT_TIMEOUT)
+      @interval = opts.fetch(:interval, DEFAULT_INTERVAL)
+      @message  = opts[:message]
+      @ignored  = Array(opts[:ignore] || Error::NoSuchElementError)
+    end
+
+    #
+    # Wait until the given block returns a true value.
+    #
+    # @raise [Error::TimeOutError]
+    # @return [Object] the result of the block
+    #
+
+    def until
+      end_time = Time.now + @timeout
+      last_error = nil
+
+      until Time.now > end_time
+        begin
+          result = yield
+          return result if result
+        rescue *@ignored => last_error
+          # swallowed
+        end
+
+        sleep @interval
+      end
+
+      msg = if @message
+              @message.dup
+            else
+              "timed out after #{@timeout} seconds"
+            end
+
+      msg << " (#{last_error.message})" if last_error
+
+      raise Error::TimeoutError, msg
+    end
+  end 
+end 

data/lib/wda_lib.rb

@@ -21,11 +21,13 @@ class WDA
   include ::WDA::Session
   include ::WDA::TouchID
   include ::WDA::Type
+  include ::WDA::Error
+
 
   Point     = Struct.new(:x, :y)
   Dimension = Struct.new(:width, :height)
 
-  attr_accessor :session_id, :http, :bundle_id, :caps, :device, :driver
+  attr_accessor :session_id, :http, :bundle_id, :caps, :device, :driver, :timeout
   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
@@ -50,6 +52,7 @@ class WDA
     @url = @base_url
     @server_host = parsed_url.host
     @server_port = parsed_url.port
+    @timeout = 10
     status
     window_size
     capabilities(opts)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wda_lib
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - MIN Yi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-11-25 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -100,6 +100,7 @@ files:
 - lib/wda_lib/custom.rb
 - lib/wda_lib/debug.rb
 - lib/wda_lib/element.rb
+- lib/wda_lib/error.rb
 - lib/wda_lib/find_element.rb
 - lib/wda_lib/orientation.rb
 - lib/wda_lib/screenshot.rb
@@ -107,6 +108,7 @@ files:
 - lib/wda_lib/touch_id.rb
 - lib/wda_lib/type.rb
 - lib/wda_lib/version.rb
+- lib/wda_lib/wait.rb
 - wda_lib.gemspec
 homepage: https://github.com/znly/wda
 licenses: