lib/calabash/wait.rb in calabash-1.9.9.pre1 vs lib/calabash/wait.rb in calabash-1.9.9.pre2

@@ -438,11 +438,14 @@
       raise exception_type, message
     end
 
     # @!visibility private
     def parse_query_list(queries)
-      queries = [queries] unless queries.is_a?(Array)
-      queries_dup = queries.map{|query| "\"#{query}\""}
+      unless queries.is_a?(Array)
+        queries = [queries]
+      end
+
+      queries_dup = queries.map{|query| "\"#{Query.new(query).send(:formatted_as_string)}\""}
 
       if queries_dup.length == 0
         ''
       elsif queries_dup.length == 1
         queries_dup.first