testautoi 0.9.142 → 0.9.143

data/bin/calabash-ios-build.rb

@@ -48,8 +48,8 @@ def console
   path = ENV['CALABASH_IRBRC']
   unless path
     path = File.expand_path(File.join(@script_dir,".irbrc"))
-    ENV['IRBRC'] = path
   end
+  ENV['IRBRC'] = path
   puts "Running irb..."
   exec("irb")
 end
@@ -93,4 +93,4 @@ def run(options={:build_dir=>"Calabash",
   end
   system(cmd)
   puts "Done..."
-end
+end

data/bin/calabash-ios-setup.rb

@@ -297,7 +297,7 @@ def update(args)
   if args.length > 0
     target = args[0]
     unless UPDATE_TARGETS.include?(target)
-      msg("Error") do
+      msg('Error') do
         puts "Invalid target #{target}. Must be one of: #{UPDATE_TARGETS.join(' ')}"
       end
       exit 1
@@ -305,8 +305,8 @@ def update(args)
 
 
 
-    target_file = "features/support/launch.rb"
-    msg("Question") do
+    target_file = 'features/support/launch.rb'
+    msg('Question') do
       puts "I'm about to update the #{target_file} file."
       puts "Please hit return to confirm that's what you want."
     end
@@ -314,22 +314,29 @@ def update(args)
 
 
     unless File.exist?(target_file)
-      msg("Error") do
+      msg('Error') do
         puts "Unable to find file #{target_file}"
         puts "Please change directory so that #{target_file} exists."
       end
       exit 1
     end
-    new_launch_script = File.join(@script_dir,"launch.rb")
+    new_launch_script = File.join(@script_dir, 'launch.rb')
 
-    FileUtils.cp(new_launch_script, target_file, :verbose => true)
+    FileUtils.cp(new_launch_script, 'features/support/01_launch.rb', :verbose => true)
+    FileUtils.rm(target_file, :force => true, :verbose => true)
 
-    msg("Info") do
+    hooks_file = 'features/support/hooks.rb'
+    if File.exist?(hooks_file)
+      FileUtils.mv(hooks_file, 'features/support/02_pre_stop_hooks.rb', :verbose => true)
+    end
+
+    msg('Info') do
       puts "File copied.\n"
-      puts "Launch on device using environment variable DEVICE_TARGET=device."
+      puts 'Launch on device using environment variable DEVICE_TARGET=device.'
+      puts 'Launch on simulator by default or using environment variable DEVICE_TARGET=simulator.'
     end
   else
-    msg("Error") do
+    msg('Error') do
       puts "update must take one of the following targets: #{UPDATE_TARGETS.join(' ')}"
     end
     exit 1

data/bin/testautoi

@@ -1,9 +1,9 @@
 #!/usr/bin/env ruby
 
+require 'zip/zip'
 require 'fileutils'
 require 'json'
 require 'tmpdir'
-require 'zip/zip'
 require 'uri'
 
 require File.join(File.dirname(__FILE__),"calabash-ios-sim")
@@ -112,6 +112,7 @@ def run(option)
         cmd = "cucumber #{arguments.join(" ")}"
     end
     env = {}
+    env['CALABASH_NO_DEPRECATION'] = '1'
     env["APP_BUNDLE_PATH"] =  File.join(FileUtils.pwd, app_bundle)
     if device_udid == ''
         # Use a Simulator
@@ -164,8 +165,8 @@ def setup
     ask_for_setting("sim_version", "Please enter the version of the Simulator [5.0, 5.1, 6.0, 6.1]", @settings["sim_version"])
     ask_for_setting("sim_device", "Please enter the device of the Simulator [iphone, ipad]", @settings["sim_device"])
 
-    @settings["build_drop_branch_dir"] = "Mobile/iPhone/branch"
-    @settings["build_drop_trunk_dir"] = "Mobile/iPhone/trunk"
+    @settings["build_drop_branch_dir"] = "Mobile/iPhone/branch/Corp"
+    @settings["build_drop_trunk_dir"] = "Mobile/iPhone/trunk/Corp"
     
     open(@settings_file, 'w') do |f|
         f.puts @settings.to_json
@@ -302,10 +303,10 @@ def get_build(version, sim)
         sim = (sim == 'sim')?"Emulator":"Device"
         if version == 'trunk'
             # copy the trunk build
-            release_path = File.join(mount_node, @settings["build_drop_trunk_dir"], "ConcurMobile", sim)
+            release_path = File.join(mount_node, @settings["build_drop_trunk_dir"], "Instrumented", "ConcurMobile-cal", sim)
         else
             # copy the version build
-            release_path = File.join(mount_node, @settings["build_drop_branch_dir"], "iPhone#{version}", "ConcurMobile", sim, "Release")
+            release_path = File.join(mount_node, @settings["build_drop_branch_dir"], "iPhone#{version}", "Instrumented", "ConcurMobile-cal", sim)
         end
         raise "No builds found in #{release_path}" unless File.directory?(release_path)
         build_dir = Dir.entries(release_path).reject{|d|d.start_with?('.')}.sort_by{|c| File.stat(File.join(release_path,c)).ctime}.last 
@@ -519,12 +520,21 @@ def sim_set_pref(key, value)
     pref_files.each do |pref_file|
         plist = CFPropertyList::List.new(:file => pref_file)
         hash = CFPropertyList.native_types(plist.value)
-        hash['KeyboardAutocorrection'] = value
-        plist.value = CFPropertyList.guess(hash)
-        plist.save(pref_file, CFPropertyList::List::FORMAT_BINARY)
+        if value == nil
+            puts "<#{pref_file}> #{key}=#{hash[key]}"
+        else
+            puts "<#{pref_file}> #{key}=#{hash[key]} => #{value}"
+            hash[key] = value
+            plist.value = CFPropertyList.guess(hash)
+            plist.save(pref_file, CFPropertyList::List::FORMAT_BINARY)
+        end
     end
 end
 
+def sim_add_photo(file)
+    
+end
+
 class Device
     def self.call_device_detect(udid = nil)
         udid_arg = (udid == nil) ? "" : "-i #{udid}"
@@ -702,6 +712,9 @@ elsif cmd == 'sim'
     elsif option == 'getbuild'
         version = ARGV.shift
         get_build(version, 'sim')
+    elsif option == 'add'
+        file = ARGV.shift
+        sim_add_photo(file)        
     end
     exit 0
 

data/calabash-cucumber.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{calabash-cucumber drives tests for native iOS apps. You must link your app with calabash-ios-server framework to execute tests.}
   s.files         = `git ls-files`.split("\n").concat(["staticlib/calabash.framework.zip"])
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = "calabash-ios"
+  s.executables   = ["calabash-ios", "testautoi"]
   s.require_paths = ["lib"]
 
   s.add_dependency( "cucumber" )
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency( "location-one", "~>0.0.9")
   s.add_dependency( "httpclient","2.3.2")
   s.add_dependency( "bundler", "~> 1.1")
-  s.add_dependency( "run_loop", "0.0.7" )
+  s.add_dependency( "run_loop", "0.0.9" )
   s.add_dependency( "awesome_print")
 
 end

data/features-skeleton/support/01_launch.rb

@@ -0,0 +1,46 @@
+########################################
+#                                      #
+#       Important Note                 #
+#                                      #
+#   When running calabash-ios tests at #
+#   www.xamarin.com/test-cloud         #
+#   this file will be overwritten by   #
+#   a file which automates             #
+#   app launch on devices.             #
+#                                      #
+#   Don't rely on this file being      #
+#   present when running at            #
+#   Xamarin Test Cloud                 #
+#                                      #
+########################################
+
+require 'calabash-cucumber/launcher'
+
+
+# APP_BUNDLE_PATH = "~/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app"
+# You may uncomment the above to overwrite the APP_BUNDLE_PATH
+# However the recommended approach is to let Calabash find the app itself
+# or set the environment variable APP_BUNDLE_PATH
+
+
+Before do |scenario|
+  @calabash_launcher = Calabash::Cucumber::Launcher.new
+  unless @calabash_launcher.calabash_no_launch?
+    @calabash_launcher.relaunch
+    @calabash_launcher.calabash_notify(self)
+  end
+end
+
+After do |scenario|
+  unless @calabash_launcher.calabash_no_stop?
+    calabash_exit
+    if @calabash_launcher.active?
+      @calabash_launcher.stop
+    end
+  end
+end
+
+at_exit do
+  launcher = Calabash::Cucumber::Launcher.new
+  Calabash::Cucumber::SimulatorHelper.stop unless launcher.calabash_no_stop?
+end

data/features/step_definitions/calabash_steps.rb

@@ -58,8 +58,17 @@ Then /^I (?:press|touch) (?:input|text) field number (\d+)$/ do |index|
   sleep(STEP_PAUSE)  
 end
 
+
 Then /^I (?:press|touch) the "([^\"]*)" (?:input|text) field$/ do |name|
-  touch("textField placeholder:'#{name}'")
+  placeholder_query = "textField placeholder:'#{name}'"
+  marked_query = "textField marked:'#{name}'"
+  if !query(placeholder_query).empty?
+    touch(placeholder_query)
+  elsif !query(marked_query).empty?
+    touch(marked_query)
+  else
+    screenshot_and_raise "could not find text field with placeholder '#{name}' or marked as '#{name}'"
+  end
   sleep(STEP_PAUSE)
 end
 
@@ -202,7 +211,7 @@ Then /^I wait to see a navigation bar titled "([^\"]*)"$/ do |expected_mark|
 end
 
 Then /^I wait for the "([^\"]*)" (?:input|text) field$/ do |placeholder|
-  wait_for(WAIT_TIMEOUT) { element_exists( "textField placeholder:'#{placeholder}'") }
+  wait_for(WAIT_TIMEOUT) { element_exists( "textField placeholder:'#{placeholder}'") || element_exists( "textField marked:'#{placeholder}'") }
 end
 
 Then /^I wait for (\d+) (?:input|text) field(?:s)?$/ do |count|
@@ -412,10 +421,10 @@ Then /^I see (\d+) (?:input|text) field(?:s)?$/ do |count|
 end
 
 Then /^I should see a "([^\"]*)" (?:input|text) field$/ do |expected_mark|
-  res = element_exists("textField placeholder:'#{expected_mark}'") or
+  res = element_exists("textField placeholder:'#{expected_mark}'") ||
           element_exists("textField marked:'#{expected_mark}'")
   unless res
-    screenshot_and_raise "Expected textfield with placeholder or accessibilityLabel: #{txt}"
+    screenshot_and_raise "Expected textfield with placeholder or accessibilityLabel: #{expected_mark}"
   end
 end
 
@@ -423,7 +432,7 @@ Then /^I should not see a "([^\"]*)" (?:input|text) field$/ do |expected_mark|
   res = query("textField placeholder:'#{expected_mark}'")
   res.concat query("textField marked:'#{expected_mark}'")
   unless res.empty?
-    screenshot_and_raise "Expected no textfield with placeholder nor accessibilityLabel: #{txt}, found #{res}"
+    screenshot_and_raise "Expected no textfield with placeholder nor accessibilityLabel: #{expected_mark}, found #{res}"
   end
 end
 

data/lib/calabash-cucumber/core.rb

@@ -21,6 +21,10 @@ module Calabash
         map(uiquery, :query, *args)
       end
 
+      def flash(uiquery, *args)
+        map(uiquery, :flash, *args)
+      end
+
       def server_version
         JSON.parse(http(:path => 'version'))
       end
@@ -49,8 +53,10 @@ module Calabash
       end
 
       def query_all(uiquery, *args)
-        puts "query_all is deprecated. Use the new all/visible feature."
-        puts "see: https://github.com/calabash/calabash-ios/wiki/05-Query-syntax"
+        unless ENV['CALABASH_NO_DEPRECATION'] == '1'
+          puts "query_all is deprecated. Use the new all/visible feature."
+          puts "see: https://github.com/calabash/calabash-ios/wiki/05-Query-syntax"
+        end
         map("all #{uiquery}", :query, *args)
       end
 
@@ -352,9 +358,17 @@ EOF
 
         if data.nil? and os=="ios6"
           recording = recording_name_for(recording_name, "ios5", device)
+          data = load_recording(recording, rec_dir)
+        end
+
+        if data.nil? and device=='ipad'
+          if ENV['FULL_CONSOLE_OUTPUT'] == '1'
+            puts "Unable to find recording for #{os} and #{device}. Trying with #{os} iphone"
+          end
+          recording = recording_name_for(recording_name, os, 'iphone')
+          data = load_recording(recording, rec_dir)
         end
 
-        data = load_recording(recording, rec_dir)
 
         if data.nil?
           screenshot_and_raise "Playback not found: #{recording} (searched for #{recording} in #{Dir.pwd}, #{rec_dir}, #{DATA_PATH}/resources"
@@ -454,7 +468,7 @@ EOF
         # Exiting the app shuts down the HTTP connection and generates ECONNREFUSED,
         # which needs to be suppressed.
         begin
-          http(:path => 'exit', :retryable_errors => RETRYABLE_ERRORS - [Errno::ECONNREFUSED])
+          http({:method =>:post, :path => 'exit', :retryable_errors => RETRYABLE_ERRORS - [Errno::ECONNREFUSED]})
         rescue Errno::ECONNREFUSED
           []
         end
@@ -492,6 +506,10 @@ EOF
         end
       end
 
+      def default_device
+        @calabash_launcher && @calabash_launcher.device
+      end
+
       def send_uia_command(opts ={})
         run_loop = opts[:run_loop] || (@calabash_launcher && @calabash_launcher.active? && @calabash_launcher.run_loop)
         command = opts[:command]

data/lib/calabash-cucumber/device.rb

@@ -0,0 +1,84 @@
+require 'json'
+
+module Calabash
+  module Cucumber
+    # Class device encapsulates information about the device or devices
+    # we are interacting with during a test.
+    # Credit: Due to jmoody's briar: https://github.com/jmoody/briar/blob/master/lib/briar/gestalt.rb
+
+    class Device
+
+      GESTALT_IPHONE = 'iPhone'
+      GESTALT_IPAD = 'iPad'
+      GESTALT_IPHONE5 = 'Retina 4-inch'
+      GESTALT_SIM_SYS = 'x86_64'
+      GESTALT_IPOD = 'iPod'
+
+
+      attr_reader :endpoint
+      attr_reader :device_family
+      attr_reader :simulator_details, :ios_version
+      attr_reader :system
+      attr_reader :framework_version
+
+      attr_accessor :udid
+
+      def initialize (endpoint, version_data)
+        simulator_device = version_data['simulator_device']
+        @endpoint = endpoint
+        @system = version_data['system']
+        @device_family = @system.eql?(GESTALT_SIM_SYS) ? simulator_device : @system.split(/[\d,.]/).first
+        @simulator_details = version_data['simulator']
+        @ios_version = version_data['iOS_version']
+        @framework_version = version_data['version']
+      end
+
+      def simulator?
+        system.eql?(GESTALT_SIM_SYS)
+      end
+
+      def device?
+        not simulator?
+      end
+
+      def iphone?
+        device_family.eql? GESTALT_IPHONE
+      end
+
+      def ipod?
+        device_family.eql? GESTALT_IPOD
+      end
+
+      def ipad?
+        device_family.eql? GESTALT_IPAD
+      end
+
+      def iphone_5?
+        if simulator?
+          simulator_details.split(/[(),]/)[3].eql? GESTALT_IPHONE5
+        else
+          system.split(/[\D]/).delete_if { |x| x.eql?('') }.first.eql?('5')
+        end
+      end
+
+      def version_hash (version_str)
+        tokens = version_str.split(/[,.]/)
+        {:major_version => tokens[0],
+         :minor_version => tokens[1],
+         :bug_version => tokens[2]}
+      end
+
+      def ios_major_version
+        version_hash(ios_version)[:major_version]
+      end
+
+      def ios6?
+        ios_major_version.eql?('6')
+      end
+
+      def ios5?
+        ios_major_version.eql?('5')
+      end
+    end
+  end
+end

data/lib/calabash-cucumber/launch/simulator_helper.rb

@@ -21,7 +21,7 @@ module Calabash
 
       # Load environment variable for showing full console output
       # If not env var set then we use true; i.e. output to console in full
-      FULL_CONSOLE_OUTPUT = ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == 'false' ? false : true
+      FULL_CONSOLE_OUTPUT = ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1' ? true : false
 
       def self.relaunch(path, sdk = nil, version = 'iphone', args = nil)
 
@@ -89,7 +89,7 @@ module Calabash
             msg << "i.e., the directory containing your .xcodeproj file."
             msg << "In Xcode, build your calabash target for simulator."
             msg << "Check that your app can be found in\n #{File.expand_path("~/Library/Developer/Xcode/DerivedData")}"
-            msg << "\n\nOption 2). In features/support/launch.rb set APP_BUNDLE_PATH to"
+            msg << "\n\nOption 2). In features/support/01_launch.rb set APP_BUNDLE_PATH to"
             msg << "the path where Xcode has built your Calabash target."
             msg << "Alternatively you can use the environment variable APP_BUNDLE_PATH.\n"
             raise msg.join("\n")
@@ -101,7 +101,7 @@ module Calabash
 
             msg << "\nThis means that Calabash can't automatically launch iOS simulator."
             msg << "Searched in Xcode 4.x default: #{DEFAULT_DERIVED_DATA_INFO}"
-            msg << "\nIn features/support/launch.rb set APP_BUNDLE_PATH to"
+            msg << "\nIn features/support/01_launch.rb set APP_BUNDLE_PATH to"
             msg << "the path where Xcode has built your Calabash target."
             msg << "Alternatively you can use the environment variable APP_BUNDLE_PATH.\n"
             raise msg.join("\n")
@@ -125,7 +125,7 @@ module Calabash
           puts "Unable to find .app bundle at #{path}. It should be an .app directory."
           dd_dir = derived_data_dir_for_project
           app_bundles = Dir.glob(File.join(dd_dir, "Build", "Products", "*", "*.app"))
-          msg = "Try setting APP_BUNDLE_PATH in features/support/launch.rb to one of:\n\n"
+          msg = "Try setting APP_BUNDLE_PATH in features/support/01_launch.rb to one of:\n\n"
           msg << app_bundles.join("\n")
           raise msg
         elsif path
@@ -140,7 +140,7 @@ module Calabash
             msg << "Please build your app from Xcode"
             msg << "You should build the -cal target."
             msg << ""
-            msg << "Alternatively, specify APP_BUNDLE_PATH in features/support/launch.rb"
+            msg << "Alternatively, specify APP_BUNDLE_PATH in features/support/01_launch.rb"
             msg << "This should point to the location of your built app linked with calabash.\n"
             raise msg.join("\n")
           end
@@ -151,7 +151,7 @@ module Calabash
             msg << "Please build your app from Xcode"
             msg << "You should build your calabash target."
             msg << ""
-            msg << "Alternatively, specify APP_BUNDLE_PATH in features/support/launch.rb"
+            msg << "Alternatively, specify APP_BUNDLE_PATH in features/support/01_launch.rb"
             msg << "This should point to the location of your built app linked with calabash.\n"
             raise msg.join("\n")
           end
@@ -160,7 +160,7 @@ module Calabash
 
           puts "APP_BUNDLE_PATH=#{preferred_dir || sim_dirs[0]}\n\n"
           puts "Please verify!"
-          puts "If this is wrong please set it as APP_BUNDLE_PATH in features/support/launch.rb\n"
+          puts "If this is wrong please set it as APP_BUNDLE_PATH in features/support/01_launch.rb\n"
           puts("-"*37)
           bundle_path = sim_dirs[0]
         end
@@ -198,11 +198,6 @@ module Calabash
                 until connected
                   begin
                     connected = (ping_app == '405')
-                    if ENV['POST_START_BREAK']
-                      puts "Environment var POST_START_BREAK is deprecated and should no longer be necessary."
-                      post_connect_sleep = (ENV['POST_START_BREAK'] || "2").to_f
-                      sleep(post_connect_sleep) unless post_connect_sleep <= 0
-                    end
                     if connected
                       server_version = get_version
                       if server_version
@@ -246,8 +241,7 @@ module Calabash
 
       def self.launch(app_bundle_path, sdk, version, args = nil)
         simulator = SimLauncher::Simulator.new
-        simulator.quit_simulator
-        simulator.launch_ios_app(app_bundle_path, sdk, version) #, args wait for update to sim launcher
+        simulator.launch_ios_app(app_bundle_path, sdk, version)
         simulator
       end
 

data/lib/calabash-cucumber/launcher.rb

@@ -1,12 +1,13 @@
 require 'calabash-cucumber/launch/simulator_helper'
 require 'sim_launcher'
+require 'calabash-cucumber/device'
 require 'run_loop'
 
 
 class Calabash::Cucumber::Launcher
   attr_accessor :run_loop
   attr_accessor :device_target
-  attr_accessor :ios_version
+  attr_accessor :device
 
   def initialize(device_target=:simulator)
     self.device_target = device_target
@@ -16,7 +17,11 @@ class Calabash::Cucumber::Launcher
   end
 
   def calabash_no_stop?
-    ENV['NO_LAUNCH']=="1" or ENV['NO_STOP']=="1"
+    calabash_no_launch? or ENV['NO_STOP']=="1"
+  end
+
+  def calabash_no_launch?
+    ENV['NO_LAUNCH']=='1'
   end
 
   def device_target?
@@ -32,15 +37,23 @@ class Calabash::Cucumber::Launcher
   end
 
   def ios_major_version
-    v = ios_version
-    (v && v.split('.')[0])
+    return nil if device.nil? or device.ios_version.nil?
+    device.ios_major_version
+  end
+
+  def ios_version
+    return nil if device.nil?
+    device.ios_version
   end
 
 
-  def reset_app_jail(sdk, app_path)
+  def reset_app_jail(sdk=nil, path=nil)
     return if device_target?
 
-    app = File.basename(app_path)
+    sdk = sdk || ENV['SDK_VERSION'] || SimLauncher::SdkDetector.new().latest_sdk_version
+    path = path || Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path)
+
+    app = File.basename(path)
     bundle = `find "#{ENV['HOME']}/Library/Application Support/iPhone Simulator/#{sdk}/Applications/" -type d -depth 2 -name "#{app}" | head -n 1`
     return if bundle.empty? # Assuming we're already clean
 
@@ -130,9 +143,7 @@ class Calabash::Cucumber::Launcher
 
     if status=='200'
       version_body = JSON.parse(res.body)
-      if version_body['iOS_version']
-        self.ios_version = version_body['iOS_version']
-      end
+      self.device = Calabash::Cucumber::Device.new(url, version_body)
     end
 
     status

data/lib/calabash-cucumber/operations.rb

@@ -56,7 +56,9 @@ module Calabash
         query(uiquery, :accessibilityLabel)
       end
 
-
+      def identifier(uiquery)
+        query(uiquery, :accessibilityIdentifier)
+      end
 
       def simple_touch(label, *args)
         touch("view marked:'#{label}'", *args)
@@ -71,6 +73,10 @@ module Calabash
       end
 
       def set_text(uiquery, txt)
+        unless ENV['CALABASH_NO_DEPRECATION'] == '1'
+          puts 'set_text is deprecated, please use keyboard_enter_text'
+          puts 'https://github.com/calabash/calabash-ios/wiki/03.5-Calabash-iOS-Ruby-API'
+        end
         text_fields_modified = map(uiquery, :setText, txt)
         screenshot_and_raise "could not find text field #{uiquery}" if text_fields_modified.empty?
         text_fields_modified

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.142'
-    FRAMEWORK_VERSION = '0.9.141'
+    VERSION = '0.9.143'
+    FRAMEWORK_VERSION = '0.9.143'
   end
 end

data/lib/calabash-cucumber/wait_helpers.rb

@@ -82,21 +82,25 @@ module Calabash
       end
 
       def wait_for_condition(options = {})
-        options[:timeout] = options[:timeout] || 10
+        options[:timeout] = options[:timeout] || 30
         options[:query] = options[:query] || "view"
+        if options.has_key?(:condition)
+          opt_condition = options[:condition]
+          if opt_condition.is_a?(Symbol)
+            target_condition = CALABASH_CONDITIONS[opt_condition]
+          elsif opt_condition.is_a?(String)
+            target_condition = options[:condition]
+          end
+          options[:condition] = target_condition
+        end
         options[:condition] = options[:condition] || CALABASH_CONDITIONS[:none_animating]
         options[:post_timeout] = options[:post_timeout] || 0.1
-        options[:frequency] = options[:frequency] || 0.2
-        options[:retry_frequency] = options[:retry_frequency] || 0.2
+        options[:frequency] = options[:frequency] || 0.3
+        options[:retry_frequency] = options[:retry_frequency] || 0.3
         options[:count] = options[:count] || 2
         options[:timeout_message] = options[:timeout_message] || "Timeout waiting for condition (#{options[:condition]})"
         options[:screenshot_on_error] = options[:screenshot_on_error] || true
 
-        if options[:condition] == CALABASH_CONDITIONS[:none_animating]
-          #puts "Waiting for none-animating has been found unreliable."
-          #puts "You are advised not to use it until this is resolved."
-          #puts "Test will continue..."
-        end
         begin
           Timeout::timeout(options[:timeout],WaitError) do
             loop do
@@ -116,11 +120,15 @@ module Calabash
       end
 
       def wait_for_none_animating(options = {})
-        #sleep(0.3)
         options[:condition] = CALABASH_CONDITIONS[:none_animating]
         wait_for_condition(options)
       end
 
+      def wait_for_no_network_indicator(options = {})
+        options[:condition] = CALABASH_CONDITIONS[:no_network_indicator]
+        wait_for_condition(options)
+      end
+
       #may be called with a string (query) or an array of strings
       def wait_for_transition(done_queries, check_options={},animation_options={})
         done_queries = [*done_queries]

data/scripts/launch.rb

@@ -3,47 +3,38 @@
 #       Important Note                 #
 #                                      #
 #   When running calabash-ios tests at #
-#   www.lesspainful.com                #
+#   www.xamarin.com/test-cloud         #
 #   this file will be overwritten by   #
 #   a file which automates             #
 #   app launch on devices.             #
 #                                      #
 #   Don't rely on this file being      #
 #   present when running at            #
-#   www.lesspainful.com.               #
-#                                      #
-#  Only put stuff here to automate     #
-#  iOS Simulator.                      #
-#                                      #
-#  You can put your app bundle path    #
-#  for automating simulator app start: #
-#  Uncomment APP_BUNDLE_PATH =..       #
+#   Xamarin Test Cloud                 #
 #                                      #
 ########################################
 
 require 'calabash-cucumber/launcher'
 
-# Uncomment and replace ?? appropriately
-# This should point to your Simulator build
-# which includes calabash framework
-# this is usually the Calabash build configuration
-# of your production target.
-#APP_BUNDLE_PATH = "~/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app"
-#
 
+# APP_BUNDLE_PATH = "~/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app"
+# You may uncomment the above to overwrite the APP_BUNDLE_PATH
+# However the recommended approach is to let Calabash find the app itself
+# or set the environment variable APP_BUNDLE_PATH
 
 Before do |scenario|
   @calabash_launcher = Calabash::Cucumber::Launcher.new
-  @calabash_launcher.relaunch
-  @calabash_launcher.calabash_notify(self)
+  unless @calabash_launcher.calabash_no_launch?
+    @calabash_launcher.relaunch
+    @calabash_launcher.calabash_notify(self)
+  end
 end
 
 After do |scenario|
   unless @calabash_launcher.calabash_no_stop?
+    calabash_exit
     if @calabash_launcher.active?
       @calabash_launcher.stop
-    else
-      Calabash::Cucumber::SimulatorHelper.stop
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testautoi
 version: !ruby/object:Gem::Version
-  version: 0.9.142
+  version: 0.9.143
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-17 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.7
+        version: 0.0.9
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -220,14 +220,15 @@ files:
 - features-skeleton/my_first.feature
 - features-skeleton/step_definitions/calabash_steps.rb
 - features-skeleton/step_definitions/my_first_steps.rb
+- features-skeleton/support/01_launch.rb
+- features-skeleton/support/02_pre_stop_hooks.rb
 - features-skeleton/support/env.rb
-- features-skeleton/support/hooks.rb
-- features-skeleton/support/launch.rb
 - features/step_definitions/calabash_steps.rb
 - lib/calabash-cucumber.rb
 - lib/calabash-cucumber/calabash_steps.rb
 - lib/calabash-cucumber/core.rb
 - lib/calabash-cucumber/cucumber.rb
+- lib/calabash-cucumber/device.rb
 - lib/calabash-cucumber/ibase.rb
 - lib/calabash-cucumber/keyboard_helpers.rb
 - lib/calabash-cucumber/launch/simulator_helper.rb
@@ -348,4 +349,3 @@ specification_version: 3
 summary: Summary
 test_files:
 - features/step_definitions/calabash_steps.rb
-has_rdoc: 

data/features-skeleton/support/launch.rb

@@ -1,77 +0,0 @@
-########################################
-#                                      #
-#       Important Note                 #
-#                                      #
-#   When running calabash-ios tests at #
-#   www.lesspainful.com                #
-#   this file will be overwritten by   #
-#   a file which automates             #
-#   app launch on devices.             #
-#                                      #
-#   Don't rely on this file being      #
-#   present when running at            #
-#   www.lesspainful.com.               #
-#                                      #
-#  Only put stuff here to automate     #
-#  iOS Simulator.                      #
-#                                      #
-#  You can put your app bundle path    #
-#  for automating simulator app start: #
-#  Uncomment APP_BUNDLE_PATH =..       #
-#                                      #
-########################################
-
-require 'calabash-cucumber/launch/simulator_helper'
-require 'sim_launcher'
-
-# Uncomment and replace ?? appropriately
-# This should point to your Simulator build
-# which includes calabash framework
-# this is usually the Calabash build configuration
-# of your production target.
-#APP_BUNDLE_PATH = "~/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app"
-#
-
-def reset_app_jail(sdk, app_path)
-  app = File.basename(app_path)
-  bundle = `find "#{ENV['HOME']}/Library/Application Support/iPhone Simulator/#{sdk}/Applications/" -type d -depth 2 -name "#{app}" | head -n 1`
-  return if bundle.empty? # Assuming we're already clean
-
-  sandbox = File.dirname(bundle)
-  ['Library', 'Documents', 'tmp'].each do |dir|
-    FileUtils.rm_rf(File.join(sandbox, dir))
-  end
-end
-
-def relaunch(args=nil)
-  if ENV['NO_LAUNCH']!="1"
-    sdk = ENV['SDK_VERSION'] || SimLauncher::SdkDetector.new().latest_sdk_version
-    path = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path)
-    if ENV['RESET_BETWEEN_SCENARIOS']=="1"
-      reset_app_jail(sdk, path)
-    end
-
-    Calabash::Cucumber::SimulatorHelper.relaunch(path,sdk,ENV['DEVICE'] || 'iphone', args)
-  end
-end
-
-def app_path
-  ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH)
-end
-
-def calabash_notify
-  if self.respond_to?(:on_launch)
-    self.on_launch
-  end
-end
-
-Before do |scenario|
-  relaunch
-  calabash_notify
-end
-
-at_exit do
-  if ENV['NO_LAUNCH']!="1" and ENV['NO_STOP']!="1"
-    Calabash::Cucumber::SimulatorHelper.stop
-  end
-end