wait and wait_true now respect default_wait

Fix #66

Author: bootstraponline

lib/appium_lib/common/helper.rb

@@ -30,7 +30,15 @@ module Appium::Common
   # @param interval [Float] the time in seconds to wait after calling the block
   # @param block [Block] the block to call
   # @return [Object] the result of block.call
-  def wait max_wait=30, interval=0.5, &block
+  def wait max_wait=-1, interval=0.5, &block
+    if max_wait == -1
+      max_wait = begin
+        $driver.default_wait
+        rescue
+      end
+      max_wait ||= 30
+    end
+
     # Rescue Timeout::Error: execution expired
     result = nil
     timeout max_wait do
@@ -52,7 +60,15 @@ def ignore &block
   # @param interval [Float] the time in seconds to wait after calling the block
   # @param block [Block] the block to call
   # @return [Object] the result of block.call
-  def wait_true max_wait=30, interval=0.5, &block
+  def wait_true max_wait=-1, interval=0.5, &block
+    if max_wait == -1
+      max_wait = begin
+        $driver.default_wait
+        rescue
+      end
+      max_wait ||= 30
+    end
+
     # Rescue Timeout::Error: execution expired
     result = nil
     timeout max_wait do