lib/calabash-android/wait_helpers.rb in calabash-android-0.5.0.pre2 vs lib/calabash-android/wait_helpers.rb in calabash-android-0.5.0

@@ -98,11 +98,11 @@
           elements_arr.all? { |q| element_exists(q) }
         end
       end
 
       #options for wait_for apply
-      def wait_for_element_do_not_exist(uiquery, options={})
+      def wait_for_element_does_not_exist(uiquery, options={})
         wait_for_elements_do_not_exist([uiquery], options)
       end
 
       #options for wait_for apply
       def wait_for_elements_do_not_exist(elements_arr, options={})
@@ -174,11 +174,11 @@
       # screenshot on error.
       #
       # Example usage: when_element_exists("Button", :timeout => 10)
       def when_element_exists(uiquery, opts = {})
         action = { :action => lambda { touch uiquery } }
-        opts = DEFAULT_OPTS.merge(action).merge(opts)
+        opts = action.merge(opts)
         wait_for_elements_exist([uiquery], opts)
 
         if opts[:action].parameters.length == 0
           opts[:action].call
         else
@@ -189,10 +189,10 @@
       def wait_for_text(text, options={})
         wait_for_element_exists("* {text CONTAINS[c] '#{text}'}", options)
       end
 
       def wait_for_text_to_disappear(text, options={})
-        wait_for_element_do_not_exist("* {text CONTAINS[c] '#{text}'}", options)
+        wait_for_element_does_not_exist("* {text CONTAINS[c] '#{text}'}", options)
       end
 
       def wait_for_activity(activity_name, options={})
         wait_for(options) do
           perform_action('get_activity_name')['message'] == activity_name