lib/calabash/ios/conditions.rb in calabash-2.0.0.pre10 vs lib/calabash/ios/conditions.rb in calabash-2.0.0.pre11

@@ -70,10 +70,10 @@
       #  applied to them.  Will be ignored for some conditions e.g.
       #  NO_NETWORK_INDICATOR
       # @return [nil] When the condition is satisfied.
       # @raise [Calabash::Wait::TimeoutError] When the timeout is exceeded.
       def wait_for_condition(condition, timeout, timeout_message, query='*')
-        unless Device.default.condition_route(condition, timeout, query)
+        unless Calabash::Internal.with_default_device(required_os: :ios) {|device| device.condition_route(condition, timeout, query)}
           raise Calabash::Wait::TimeoutError, timeout_message
         end
         true
       end
     end