calabash-cucumber 0.9.167 → 0.9.168.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b9f317fce7bc0b7b9619b15814d0eeef21a8426d
-  data.tar.gz: e7aa950deff8599ee64a2bc3884f62d3bc4d6b6f
+  metadata.gz: 1a55341596dc97fc2d39a498fd31bff55d587381
+  data.tar.gz: a846aed569db2f5ee058658da45bfcafc1eb8d90
 SHA512:
-  metadata.gz: 2ec474c89f466cb9bbd92d1ebd85f2d38dfec59eddc952b8ad79450dd4694349595d6ce005d2398218f41fb3383509b2aeb19fda91883d103fa0aa1c3ff31125
-  data.tar.gz: 3e6d58a8d8320b250ddf04bae3fc1b26d823b0c048d7365c78ba70fe3f62f43be88e2c936487e74d0499bb45e6466d38c7a1b77dc739c34e3d365ccdface780a
+  metadata.gz: f0e2c46b7c7b16499d9837e830df5eb58aef18af52d288ecd3f37b7f91f45e6571ac476fcb16c328847e1f237e99f4513750e54d78dbae2fb32d91b81358dd28
+  data.tar.gz: dcfd1ad3982aeaa3190b7356ead94529e3ec7d8b2f40502865d1e3d2198d16363115dd0a23d5f4c5166ffa552c8793aeb0dc9e8f497f0b9e1b46cfd7037116a5

data/.gitignore

@@ -11,3 +11,7 @@ vendor
 pkg
 *.gem
 .ruby-version
+
+# yard
+.yardoc
+doc

data/Rakefile

@@ -17,47 +17,37 @@ task :build_server do
       raise <<EOF
       Unable to find calabash server checked out at #{dir}.
       Please checkout as #{dir} or set CALABASH_SERVER_PATH to point
-      to Calabash server (branch 0.9.x).
+      to Calabash server (branch master).
 EOF
     end
 
     FileUtils.cd(dir) do
-      
-      pwd = FileUtils.pwd
-      cmd = "#{pwd}/calabash/gitversioning-before.sh #{pwd}/calabash/LPGitVersionDefines.h"
-      puts cmd
-      `#{cmd}`
-      
-      puts 'Building Server'
-      cmd = 'xcodebuild build -project calabash.xcodeproj -target Framework -configuration Debug -sdk iphonesimulator7.0'
-      puts cmd
-      puts `#{cmd}`
-
-      cmd = "#{pwd}/calabash/gitversioning-after.sh #{pwd}/calabash/LPGitVersionDefines.h"
-      puts cmd
-      `#{cmd}`
-      
+      puts 'INFO: building server...'
+      puts "INFO: $ cd #{File.expand_path(dir)} ; make"
+      `make`
       unless File.exist?(FRAMEWORK)
-        raise 'Unable to build framework'
+        puts 'FAIL:  unable to build calabash.framework'
+        puts "FAIL:  run 'make' in #{File.expand_path(dir)} to diagnose"
+        raise
       end
 
-      puts "Zipping down framework"
+      puts 'INFO:  creating a zip archive of calabash.framework'
 
-      zip_cmd = "zip -q -r #{ZIP_FILE} #{FRAMEWORK}"
-      puts zip_cmd
-      puts `#{zip_cmd}`
+      zip_cmd = "zip -y -q -r #{ZIP_FILE} #{FRAMEWORK}"
+      puts "INFO: $ cd #{File.expand_path(dir)} ; #{zip_cmd}"
+      `#{zip_cmd}`
       framework_zip = File.expand_path(ZIP_FILE)
       unless File.exist?(framework_zip)
+        puts 'FAIL:  unable to create a zip archive of calabash.framework'
+        puts "FAIL:  run '#{zip_cmd}' in #{File.expand_path(dir)} to diagnose"
         raise 'Unable to zip down framework...'
       end
     end
 
-
-
     FileUtils.mkdir_p('staticlib')
     output_path = File.join('staticlib', ZIP_FILE)
     FileUtils.mv(framework_zip,output_path, :force => true)
-    puts "Server built to path #{output_path}"
+    puts "INFO: calabash.framework.zip installed in #{output_path}"
 
   end
 

data/bin/calabash-ios-setup.rb

@@ -7,9 +7,11 @@ def detect_accessibility_support
   dirs = Dir.glob(File.join(File.expand_path("~/Library"),"Application Support","iPhone Simulator","*.*","Library","Preferences"))
   dirs.each do |sim_pref_dir|
     fp = File.expand_path("#{sim_pref_dir}/com.apple.Accessibility.plist")
+    out = `defaults read "#{fp}" AXInspectorEnabled`
+    ax_inspector = out.split("\n")[0]=="0"
     out = `defaults read "#{fp}" ApplicationAccessibilityEnabled`
-
-    if not(File.exists?(fp)) || out.split("\n")[0] == "0"
+    app_acc = out.split("\n")[0]=="0"
+    if not(File.exists?(fp)) || ax_inspector == "0" || app_acc == "0"
         msg("Warn") do
           puts "Accessibility is not enabled for simulator: #{sim_pref_dir}"
           puts "Enabled accessibility as described here:"
@@ -32,6 +34,7 @@ def calabash_setup(args)
   project_name, project_path, xpath = find_project_files(args)
   setup_project(project_name, project_path, xpath)
 
+  calabash_sim_accessibility
   detect_accessibility_support
 
   msg("Setup done") do

data/bin/calabash-ios-sim.rb

@@ -27,11 +27,23 @@ def calabash_sim_reset
 end
 
 def calabash_sim_accessibility
-  dirs = Dir.glob(File.join(File.expand_path("~/Library"), "Application Support", "iPhone Simulator", "*.*", "Library", "Preferences"))
-  dirs.each do |sim_pref_dir|
+  Calabash::Cucumber::SimulatorHelper.stop
+  old = ['5.*','6.*','7.0*'].map do |x|
+    Dir.glob(File.join(File.expand_path("~/Library"), "Application Support", "iPhone Simulator", "7.0*", "Library", "Preferences"))
+  end.flatten
+
+  rest = Dir.glob(File.join(File.expand_path("~/Library"), "Application Support", "iPhone Simulator", "*.*", "Library", "Preferences"))
+  rest = rest - old
+  (old+rest).each do |sim_pref_dir|
     fp = File.expand_path("#{@script_dir}/data/")
-    FileUtils.cp("#{fp}/com.apple.Accessibility.plist", sim_pref_dir)
+    if rest.include?(sim_pref_dir)
+      tgt = 'com.apple.Accessibility-5.1.plist'
+    else
+      tgt = 'com.apple.Accessibility.plist'
+    end
+    FileUtils.cp("#{fp}/#{tgt}", File.join(sim_pref_dir, 'com.apple.Accessibility.plist'))
   end
+
 end
 
 
@@ -125,7 +137,7 @@ end
 
 def calabash_sim_device(args)
   quit_sim
-  options = ["iPad","iPad_Retina", "iPhone", "iPhone_Retina", "iPhone_Retina_4inch"]
+  options = ["iPad", "iPad_Retina", "iPhone", "iPhone_Retina", "iPhone_Retina_4inch"]
   if args.length != 1 or not options.find { |x| x == args[0] }
     print_usage
     puts "Unrecognized args: #{args}"

data/calabash-cucumber.gemspec

@@ -21,12 +21,12 @@ Gem::Specification.new do |s|
   s.add_dependency( "json" )
   s.add_dependency( 'edn')
   s.add_dependency( "CFPropertyList" )
-  s.add_dependency( "sim_launcher", "0.4.6")
+  s.add_dependency( "sim_launcher", "~> 0.4.9")
   s.add_dependency( "slowhandcuke" )
   s.add_dependency( "geocoder", "~>1.1.8")
   s.add_dependency( "httpclient","~> 2.3.3")
   s.add_dependency( "bundler", "~> 1.1")
-  s.add_dependency( "run_loop", "~> 0.1.4" )
+  s.add_dependency( "run_loop", "~> 0.2.0.pre1" )
   s.add_dependency( "awesome_print")
   s.add_dependency( "xamarin-test-cloud", "~> 0.9.27")
 

data/doc/x-platform-testing.md

@@ -131,7 +131,7 @@ class WordPressComPage < Calabash::IBase
 
   def login(user)
      touch("view marked:'Username'")
-     await_keyboard
+     wait_for_keyboard
 
      keyboard_enter_text user[:email]
 

data/lib/calabash-cucumber.rb

@@ -1,7 +1,9 @@
 require 'calabash-cucumber/core'
 require 'calabash-cucumber/tests_helpers'
 require 'calabash-cucumber/keyboard_helpers'
+require 'calabash-cucumber/keychain_helpers'
 require 'calabash-cucumber/wait_helpers'
 require 'calabash-cucumber/operations'
 require 'calabash-cucumber/version'
 require 'calabash-cucumber/date_picker'
+require 'calabash-cucumber/ipad_1x_2x'

data/lib/calabash-cucumber/core.rb

@@ -160,12 +160,36 @@ module Calabash
         views_touched
       end
 
-
-      def scroll_to_row_with_mark(row_id, options={:query => 'tableView',
+      # scrolls to +mark+ in a UITableView
+      #
+      # calls the +:scrollToRowWithMark+ server route
+      #
+      #    scroll_to_row_with_mark(mark, {:scroll_position => :top}) #=> scroll to the top of the item with the given +mark+
+      # scroll_to_row_with_mark(mark, {:scroll_position => :bottom}) #=> scroll to the bottom of the item with the given +mark+
+      #
+      # allowed options
+      #     :query => a query string
+      #         default => 'tableView'
+      #         example => "tableView marked:'hit songs'"
+      #
+      #     :scroll_position => the position to scroll to
+      #         default => :middle
+      #         allowed => {:top | :middle | :bottom}
+      #
+      #     :animate => animate the scrolling
+      #         default => true
+      #         allowed => {true | false}
+      #
+      # raises an exception if the scroll cannot be performed.
+      # * the +mark+ is nil
+      # * the +:query+ finds no table view
+      # * table view does not contain a cell with the given +mark+
+      # * +:scroll_position+ is invalid
+      def scroll_to_row_with_mark(mark, options={:query => 'tableView',
                                                    :scroll_position => :middle,
                                                    :animate => true})
-        if row_id.nil?
-          screenshot_and_raise 'row_id argument cannot be nil'
+        if mark.nil?
+          screenshot_and_raise 'mark argument cannot be nil'
         end
 
         uiquery = options[:query] || 'tableView'
@@ -180,7 +204,7 @@ module Calabash
           args << options[:animate]
         end
 
-        views_touched=map(uiquery, :scrollToRowWithMark, row_id, *args)
+        views_touched=map(uiquery, :scrollToRowWithMark, mark, *args)
         msg = options[:failed_message] || "Unable to scroll: '#{uiquery}' to: #{options}"
         assert_map_results(views_touched, msg)
         views_touched
@@ -237,13 +261,70 @@ module Calabash
         if opts[:failed_message]
           msg = opts[:failed_message]
         else
-          msg = "unable to scroll: '#{uiquery}' to row '#{item}' in section '#{section}'"
+          msg = "unable to scroll: '#{uiquery}' to item '#{item}' in section '#{section}'"
         end
 
         assert_map_results(views_touched, msg)
         views_touched
       end
 
+      # scrolls to +mark+ in a UICollectionView
+      #
+      # calls the +:collectionViewScrollToItemWithMark+ server route
+      #
+      #    scroll_to_collection_view_item_with_mark(mark, {:scroll_position => :top}) #=> scroll to the top of the item with the given +mark+
+      # scroll_to_collection_view_item_with_mark(mark, {:scroll_position => :bottom}) #=> scroll to the bottom of the item with the given +mark+
+      #
+      # allowed options
+      #     :query => a query string
+      #         default => 'collectionView'
+      #         example => "collectionView marked:'hit songs'"
+      #
+      #     :scroll_position => the position to scroll to
+      #         default => :top
+      #         allowed => {:top | :center_vertical | :bottom | :left | :center_horizontal | :right}
+      #
+      #     :animate => animate the scrolling
+      #         default => true
+      #         allowed => {true | false}
+      #
+      #     :failed_message => the message to display on failure
+      #         default => nil - will display a default failure message
+      #         allowed => any string
+      #
+      # raises an exception if the scroll cannot be performed.
+      # * the +mark+ is nil
+      # * the +:query+ finds no collection view
+      # * collection view does not contain a cell with the given +mark+
+      # * +:scroll_position+ is invalid
+      def scroll_to_collection_view_item_with_mark(mark, opts={})
+        default_options = {:query => 'collectionView',
+                           :scroll_position => :top,
+                           :animate => true,
+                           :failed_message => nil}
+        opts = default_options.merge(opts)
+        uiquery = opts[:query]
+
+        if mark.nil?
+          raise 'mark argument cannot be nil'
+        end
+
+        args = []
+        scroll_position = opts[:scroll_position]
+        candidates = [:top, :center_vertical, :bottom, :left, :center_horizontal, :right]
+        unless candidates.include?(scroll_position)
+          raise "scroll_position '#{scroll_position}' is not one of '#{candidates}'"
+        end
+
+        args << scroll_position
+        args << opts[:animate]
+
+        views_touched=map(uiquery, :collectionViewScrollToItemWithMark, mark, *args)
+        msg = opts[:failed_message] || "Unable to scroll: '#{uiquery}' to cell with mark: '#{mark}' with #{opts}"
+        assert_map_results(views_touched, msg)
+        views_touched
+      end
+
       def send_app_to_background(secs)
         launcher.actions.send_app_to_background(secs)
       end

data/lib/calabash-cucumber/device.rb

@@ -18,6 +18,7 @@ module Calabash
       attr_reader :system
       attr_reader :framework_version
       attr_reader :iphone_app_emulated_on_ipad
+      attr_reader :iphone_4in
 
       attr_accessor :udid
 
@@ -30,6 +31,7 @@ module Calabash
         @ios_version = version_data['iOS_version']
         @framework_version = version_data['version']
         @iphone_app_emulated_on_ipad = version_data['iphone_app_emulated_on_ipad']
+        @iphone_4in = version_data['4inch']
       end
 
       def simulator?
@@ -52,12 +54,13 @@ module Calabash
         device_family.eql? GESTALT_IPAD
       end
 
+      def iphone_4in?
+        @iphone_4in
+      end
+
       def iphone_5?
-        if simulator?
-          !simulator_details.scan(GESTALT_IPHONE5).empty?
-        else
-          system.split(/[\D]/).delete_if { |x| x.eql?('') }.first.eql?('5')
-        end
+        _deprecated('0.9.168', "use 'iphone_4in?' instead", :warn)
+        iphone_4in?
       end
 
       def version_hash (version_str)
@@ -85,7 +88,7 @@ module Calabash
 
       def screen_size
         return { :width => 768, :height => 1024 } if ipad?
-        return { :width => 320, :height => 568 } if iphone_5?
+        return { :width => 320, :height => 568 } if iphone_4in?
         { :width => 320, :height => 480 }
       end
 

data/lib/calabash-cucumber/environment_helpers.rb

@@ -72,14 +72,15 @@ module Calabash
       #
       # raises an error if the server cannot be reached
       def iphone_5?
-        _default_device_or_create().iphone_5?
+        _deprecated('0.9.168', "use 'iphone_4in?' instead", :warn)
+        iphone_4in?
       end
 
       # returns +true+ if the target device or simulator is a 4in model
       #
       # raises an error if the server cannot be reached
       def iphone_4in?
-        iphone_5?
+        _default_device_or_create().iphone_4in?
       end
 
       # returns +true+ if the OS major version is 5

data/lib/calabash-cucumber/http_helpers.rb

@@ -40,8 +40,6 @@ module Calabash
       end
 
       def make_http_request(options)
-
-        body = nil
         retryable_errors = options[:retryable_errors] || RETRYABLE_ERRORS
         CAL_HTTP_RETRY_COUNT.times do |count|
           previous_debug_dev = nil
@@ -49,19 +47,16 @@ module Calabash
             if not @http
               @http = init_request(options)
             end
-            #if options[:debug] || (ENV['DEBUG_HTTP'] == '1' && options[:debug] != false)
-            #  previous_debug_dev = @http.debug_dev
-            #  @http.debug_dev = $stdout
-            #end
-            if options[:method] == :post
-              body = @http.post(options[:uri], options[:body]).body
+
+            response = if options[:method] == :post
+              @http.post(options[:uri], options[:body])
             else
-              body = @http.get(options[:uri], options[:body]).body
+              @http.get(options[:uri], options[:body])
             end
-            #if options[:debug] || (ENV['DEBUG_HTTP'] == '1' && options[:debug] != false)
-            #  @http.debug_dev = previous_debug_dev
-            #end
-            break
+
+            raise Errno::ECONNREFUSED if response.status_code == 502
+
+            return response.body
           rescue Exception => e
 
             if retryable_errors.include?(e) || retryable_errors.any? { |c| e.is_a?(c) }
@@ -85,8 +80,6 @@ module Calabash
             end
           end
         end
-
-        body
       end
 
       def init_request(options={})

data/lib/calabash-cucumber/ipad_1x_2x.rb

@@ -0,0 +1,190 @@
+require 'calabash-cucumber/environment_helpers'
+require 'calabash-cucumber/query_helpers'
+require 'calabash-cucumber/http_helpers'
+require 'calabash-cucumber/failure_helpers'
+require 'calabash-cucumber/uia'
+
+module Calabash
+  module Cucumber
+    module IPad
+
+      class Emulation
+        include Calabash::Cucumber::FailureHelpers
+        include Calabash::Cucumber::HTTPHelpers
+        include Calabash::Cucumber::QueryHelpers
+        include Calabash::Cucumber::UIA
+
+        # NOTE to maintainers - when adding a localization, please notice that
+        # the keys and values are semantically reversed.
+        #
+        # you should read the hash as:
+        #
+        #     :emulated_1x #=> what button is showing when the app is emulated at 2X?
+        #     :emulated_2x #=> what button is showing when the app is emulated at 1X?
+        IPAD_1X_2X_BUTTON_LABELS = {
+              :en => {:emulated_1x => '2X',
+                      :emulated_2x => '1X'}
+        }
+
+        attr_reader :scale
+        attr_reader :lang_code
+
+        @button_names_hash = nil
+
+        def initialize (lang_code=:en)
+          @button_names_hash = IPAD_1X_2X_BUTTON_LABELS[lang_code]
+          if @button_names_hash.nil?
+            raise "could not find 1X/2X buttons for language code '#{lang_code}'"
+          end
+
+          @lang_code = lang_code
+          @scale = _internal_ipad_emulation_scale
+        end
+
+        def tap_ipad_scale_button
+          key = @scale
+          name = @button_names_hash[key]
+
+          res = uia_call_windows([:view, {:marked => "#{name}"}], :tap)
+
+          # ':nil' is a very strange success return value...
+          if res.is_a?(Hash) or res != ':nil'
+            screenshot_and_raise "could not touch scale button '#{name}' - '#{res['value']}'"
+          end
+        end
+
+        private
+        def _internal_ipad_emulation_scale
+          hash = @button_names_hash
+          val = nil
+          hash.values.each do |button_name|
+            res = uia_call_windows([:view, {:marked => "#{button_name}"}], :name)
+
+            if res == button_name
+              val = button_name
+              break
+            end
+          end
+
+          if val.nil?
+            raise "could not find iPad scale button with '#{hash.values}'"
+          end
+
+          if val == hash[:emulated_1x]
+            :emulated_1x
+          elsif val == hash[:emulated_2x]
+            :emulated_2x
+          else
+            raise "unrecognized emulation scale '#{val}'"
+          end
+        end
+
+      end
+
+      # ensures that iPhone apps emulated on an iPad are displayed at +scale+.
+      #
+      # starting in iOS 7, iPhone apps emulated on the iPad always launch at 2x.
+      # calabash cannot currently interact with such apps in 2x mode (trust us,
+      # we've tried).
+      #
+      # +scale+ must be one of { +:emulated_1x+ | +:emulated_2x+ }
+      #
+      # is it is recommended that clients call this convenience method:
+      #
+      # +ensure_ipad_emulation_1x+ #=> ensures the app is displayed in 1x mode
+      #
+      # takes these optional arguments
+      #
+      #        :lang_code #=> a language code for matching the name of the 'scale' button
+      # :wait_after_touch #=> how long to wait after the 'scale' button is touched
+      #
+      # the default values are:
+      #
+      #        :lang_code => :en
+      # :wait_after_touch => 0.4
+      #
+      # +IMPORTANT+ if this is not an iphone app emulated on a ipad, then calling
+      # this function has no effect.
+      #
+      # raises an exception if:
+      # * the app was +not+ launched with Instruments i.e. there is no <tt>run_loop</tt>
+      # * an invalid +scale+ is passed
+      # * an unknown language code is passed
+      # * the 'scale' button cannot be touched
+      def ensure_ipad_emulation_scale(scale, opts={})
+        return unless iphone_app_emulated_on_ipad?
+
+        unless uia_available?
+          raise 'this function requires the app be launched with instruments'
+        end
+
+        allowed = [:emulated_1x, :emulated_2x]
+        unless allowed.include?(scale)
+          raise "'#{scale}' is not one of '#{allowed}' allowed args"
+        end
+
+        default_opts = {:lang_code => :en,
+                        :wait_after_touch => 0.4}
+        merged_opts = default_opts.merge(opts)
+
+        obj = Emulation.new(merged_opts[:lang_code])
+
+        actual_scale = obj.scale
+
+        if actual_scale != scale
+          obj.tap_ipad_scale_button
+        end
+
+        sleep(merged_opts[:wait_after_touch])
+
+      end
+
+      # ensures that iPhone apps emulated on an iPad are displayed at +1X+.
+      #
+      # here is an example of how to use this function in your +Before+ launch
+      # hooks:
+      #
+      #    Before do |scenario|
+      #      @calabash_launcher = Calabash::Cucumber::Launcher.new
+      #      unless @calabash_launcher.calabash_no_launch?
+      #        @calabash_launcher.relaunch
+      #        @calabash_launcher.calabash_notify(self)
+      #        # ensure emulated apps are at 1x
+      #        ensure_ipad_emulation_1x
+      #      end
+      #      # do other stuff to prepare the test environment
+      #    end
+      #
+      # takes these optional arguments
+      #
+      #        :lang_code #=> a language code for matching the name of the 'scale' button
+      # :wait_after_touch #=> how long to wait after the 'scale' button is touched
+      #
+      # the default values are:
+      #
+      #        :lang_code => :en
+      # :wait_after_touch => 0.4
+      #
+      # +IMPORTANT+ if this is not an iphone app emulated on a ipad, then calling
+      # this function has no effect.
+      #
+      # raises an exception if:
+      # * the app was +not+ launched with Instruments i.e. there is no <tt>run_loop</tt>
+      # * an unknown language code is passed
+      # * the 'scale' button cannot be touched
+      def ensure_ipad_emulation_1x(opts={})
+        ensure_ipad_emulation_scale(:emulated_1x, opts)
+      end
+
+      private
+      # ensures iPhone apps running on an iPad are emulated at 2X
+      #
+      # you should never need to call this function - calabash cannot interact
+      # with iPhone apps emulated on the iPad in 2x mode.
+      def _ensure_ipad_emulation_2x(opts={})
+        ensure_ipad_emulation_scale(:emulated_2x, opts)
+      end
+
+    end
+  end
+end

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -278,6 +278,7 @@ module Calabash
         _ensure_can_enter_text
         if uia_available?
           text_before = _text_from_first_responder()
+          text_before = text_before.gsub("\n","\\n") if text_before
           uia_type_string(text, text_before)
         else
           text.each_char do |ch|

data/lib/calabash-cucumber/keychain_helpers.rb

@@ -0,0 +1,149 @@
+require 'calabash-cucumber/core'
+
+module Calabash
+  module Cucumber
+    # KeychainHelpers provide a helpers to access the iOS keychain.
+    #
+    # == Simulator Note
+    #
+    # When running on the simulator, the keychain is *not* sandboxed between
+    # applications like it is on a real device. These methods will return
+    # keychain records from *all* applications on the simulator, which may
+    # result in strange behavior if you aren't expecting it.
+    #
+    # @see http://goo.gl/JrFJMM Details about why some operations report
+    #   +FAILURE+ and what can be done on the client side mitigate
+    #
+    # @see https://github.com/soffes/sskeychain SSKeychain
+    module KeychainHelpers
+
+
+      # sends appropriately-configured +GET+ request to the +keychain+ server
+      # endpoint.  do not call this function directly; use one of the helper
+      # functions provided.
+      #
+      # @see keychain_accounts
+      # @see keychain_account_for_service
+      # @return [Array<Hash>] contents of the iOS keychain
+      # @param [Hash] options
+      # @raise [RuntimeError] if http request does not report success
+      def _keychain_get(options={})
+        res = http({:method => :get, :raw => true, :path => 'keychain'}, options)
+        res = JSON.parse(res)
+        if res['outcome'] != 'SUCCESS'
+          raise "get keychain with options '#{options}' failed because: '#{res['reason']}'\n'#{res['details']}'"
+        end
+
+        res['results']
+      end
+
+      # asks the keychain for all of the account records
+      #
+      # The hash keys are defined by the +SSKeychain+ library.
+      #
+      # @see https://github.com/soffes/sskeychain SSKeychain
+      #
+      # The following keys are the most commonly useful:
+      #
+      #     +svce+ #=> the service
+      #     +acct+ #=> the account (often a username)
+      #     +cdat+ #=> the creation date
+      #     +mdat+ #=> the last-modified date
+      #
+      # @raise [RuntimeError] if http request does not report success
+      # @return [Array<Hash>] of all account records saved in the iOS keychain.
+      def keychain_accounts
+        _keychain_get
+      end
+
+      # @return [Array<Hash>] of all account records saved in the iOS keychain
+      # filtered by +service+.
+      #
+      # @see keychain_accounts
+      #
+      # @raise [RuntimeError] if http request does not report success
+      def keychain_accounts_for_service(service)
+        _keychain_get({:service => service})
+      end
+
+      # ask the keychain for an account password
+      #
+      #     *IMPORTANT*
+      #     On the XTC, the password cannot returned as plain text.
+      #     When using this keychain_password in your steps you can condition on
+      #     the XTC environment using +xamarin_test_cloud?+
+      #
+      # @see Calabash::Cucumber::EnvironmentHelpers
+      #
+      # @raise [RuntimeError] if http request does not report success
+      # @raise [RuntimeError] if +service+ and +account+ pair does not contain
+      #   a password
+      #
+      # @return [String,Array<Hash>] password stored in keychain for +service+
+      #   and +account+.  *NB* on the XTC this returns an Array with one Hash
+      def keychain_password(service, account)
+        _keychain_get({:service => service, :account => account}).first
+      end
+
+      # sends appropriately-configured +POST+ request to the +keychain+ server
+      # endpoint.  do not call this function directly; use one of the helper
+      # functions provided.
+      #
+      # @see keychain_clear
+      # @see keychain_clear_accounts_for_service
+      # @see keychain_delete_password
+      # @see keychain_set_password
+      #
+      # @return [nil]
+      # @raise [RuntimeError] if http request does not report success
+      def _keychain_post(options={})
+        raw = http({:method => :post, :path => 'keychain'}, options)
+        res = JSON.parse(raw)
+        if res['outcome'] != 'SUCCESS'
+          raise "post keychain with options '#{options}' failed because: #{res['reason']}\n#{res['details']}"
+        end
+        nil
+      end
+
+      # On the iOS Simulator this clears *all* keychain entries for *all*
+      # applications.
+      #
+      # On a physical device, this will clear all entries for the target
+      # application.
+      #
+      # @return [nil]
+      #
+      # @raise [RuntimeError] if http request does not report success
+      def keychain_clear
+        _keychain_post
+      end
+
+      # Clear all entries in the keychain restricted to a single +service+.
+      #
+      # @return [nil]
+      #
+      # @raise [RuntimeError] if http request does not report success
+      def keychain_clear_accounts_for_service(service)
+        _keychain_post({:service => service})
+      end
+
+      # Delete a single keychain record for the given +service+ and +account+
+      # pair.
+      #
+      # @raise [RuntimeError] if http request does not report success
+      def keychain_delete_password(service, account)
+        _keychain_post(:service => service, :account => account)
+      end
+
+      # Set the password for a given service and account pair.
+      #
+      # @return nil
+      #
+      # @raise [RuntimeError] if http request does not report success
+      def keychain_set_password(service, account, password)
+        _keychain_post(:service => service, :account => account, :password => password)
+      end
+
+    end
+  end
+end

data/lib/calabash-cucumber/launcher.rb

@@ -253,8 +253,12 @@ class Calabash::Cucumber::Launcher
   end
 
   def default_launch_method
-    return :instruments unless sdk_version || use_instruments_env?
+    if RunLoop::Core.above_or_eql_version?('5.1', RunLoop::Core.xcode_version)
+      return use_sim_launcher_env? ? :sim_launcher : :instruments
+    end
+
     return :instruments if sdk_version.start_with?('7') # Only instruments supported for iOS7+
+
     sim_detector = SimLauncher::SdkDetector.new()
     available = sim_detector.available_sdk_versions.reject { |v| v.start_with?('7') }
     if available.include?(sdk_version)
@@ -379,10 +383,11 @@ class Calabash::Cucumber::Launcher
       rescue RunLoop::TimeoutError => e
         last_err = e
         if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
-          puts "retrying run loop..."
+          puts 'retrying run loop...'
         end
       end
     end
+    Calabash::Cucumber::SimulatorHelper.stop
     raise StartError.new(last_err)
   end
 
@@ -499,6 +504,10 @@ class Calabash::Cucumber::Launcher
     ENV['LAUNCH_VIA'] == 'instruments'
   end
 
+  def use_sim_launcher_env?
+    ENV['LAUNCH_VIA'] == 'sim_launcher'
+  end
+
   def reset_between_scenarios?
     ENV['RESET_BETWEEN_SCENARIOS']=="1"
   end

data/lib/calabash-cucumber/operations.rb

@@ -1,6 +1,7 @@
 require 'calabash-cucumber/core'
 require 'calabash-cucumber/tests_helpers'
 require 'calabash-cucumber/keyboard_helpers'
+require 'calabash-cucumber/keychain_helpers'
 require 'calabash-cucumber/wait_helpers'
 require 'calabash-cucumber/launcher'
 require 'net/http'
@@ -9,7 +10,7 @@ require 'json'
 require 'set'
 require 'calabash-cucumber/version'
 require 'calabash-cucumber/date_picker'
-
+require 'calabash-cucumber/ipad_1x_2x'
 
 if not Object.const_defined?(:CALABASH_COUNT)
   #compatability with IRB
@@ -25,7 +26,9 @@ module Calabash
       include Calabash::Cucumber::TestsHelpers
       include Calabash::Cucumber::WaitHelpers
       include Calabash::Cucumber::KeyboardHelpers
+      include Calabash::Cucumber::KeychainHelpers
       include Calabash::Cucumber::DatePicker
+      include Calabash::Cucumber::IPad
 
       def page(clz,*args)
         clz.new(self,*args)

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.167'
-    FRAMEWORK_VERSION = '0.9.167'
+    VERSION = '0.9.168.pre4'
+    FRAMEWORK_VERSION = '0.9.168'
   end
 end

data/lib/calabash-cucumber/wait_helpers.rb

@@ -14,13 +14,16 @@ module Calabash
       CALABASH_CONDITIONS = {:none_animating => "NONE_ANIMATING",
                              :no_network_indicator => "NO_NETWORK_INDICATOR"}
 
-
-      def wait_for(options_or_timeout=
-          {:timeout => 30,
-           :retry_frequency => 0.3,
-           :post_timeout => 0,
-           :timeout_message => 'Timed out waiting...',
-           :screenshot_on_error => true}, &block)
+      # 'post_timeout' is the time to wait after a wait function returns true
+      DEFAULT_OPTS = {
+        :timeout => 30,
+        :retry_frequency => 0.3,
+        :post_timeout => 0,
+        :timeout_message => 'Timed out waiting...',
+        :screenshot_on_error => true
+      }.freeze
+
+      def wait_for(options_or_timeout=DEFAULT_OPTS, &block)
         #note Hash is preferred, number acceptable for backwards compat
         default_timeout = 30
         timeout = options_or_timeout || default_timeout
@@ -99,6 +102,9 @@ module Calabash
       end
       #options for wait_for apply
       def wait_for_elements_do_not_exist(elements_arr, options={})
+        if elements_arr.is_a?(String)
+          elements_arr = [elements_arr]
+        end
         options[:timeout_message] = options[:timeout_message] || "Timeout waiting for no elements matching: #{elements_arr.join(",")}"
         wait_for(options) do
           elements_arr.none? { |q| element_exists(q) }
@@ -192,6 +198,55 @@ module Calabash
         (msg.is_a?(String) ? WaitError.new(msg) : msg)
       end
 
+      # Performs a lambda action until the element (a query string) appears.
+      # The default action is to do nothing.
+      #
+      # Raises an error if no uiquery is specified. Same options as wait_for
+      # which are timeout, retry frequency, post_timeout, timeout_message, and 
+      # screenshot on error.
+      #
+      # Example usage: 
+      # until_element_exists("Button", :action => lambda { swipe("up") })
+      def until_element_exists(uiquery, opts = {})
+        extra_opts = { :until_exists => uiquery, :action => lambda { ; } }
+        opts = DEFAULT_OPTS.merge(extra_opts).merge(opts)
+        wait_poll(opts) do 
+          opts[:action].call
+        end
+      end
+
+      # Performs a lambda action until the element (a query string) disappears.
+      # The default action is to do nothing. 
+      #
+      # Raises an error if no uiquery is specified. Same options as wait_for
+      # which are timeout, retry frequency, post_timeout, timeout_message, and
+      # screenshot on error.
+      #
+      # Example usage: 
+      # until_element_does_not_exist("Button", :action => lambda { swipe("up") })
+      def until_element_does_not_exist(uiquery, opts = {})
+        condition = lambda { element_exists(uiquery) ? false : true }
+        extra_opts = { :until => condition, :action => lambda { ; } }
+        opts = DEFAULT_OPTS.merge(extra_opts).merge(opts)
+        wait_poll(opts) do 
+          opts[:action].call
+        end
+      end
+
+      # Performs a lambda action once the element exists.
+      # The default behavior is to touch the specified element.
+      #
+      # Raises an error if no uiquery is specified. Same options as wait_for
+      # which are timeout, retry frequency, post_timeout, timeout_message, and
+      # 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)
+        wait_for_elements_exist([uiquery], opts)
+        opts[:action].call
+      end
 
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.167
+  version: 0.9.168.pre4
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-14 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -84,16 +84,16 @@ dependencies:
   name: sim_launcher
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.9
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.6
+        version: 0.4.9
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
   requirement: !ruby/object:Gem::Requirement
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.0.pre1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.4
+        version: 0.2.0.pre1
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +240,9 @@ files:
 - lib/calabash-cucumber/http_helpers.rb
 - lib/calabash-cucumber/ibase.rb
 - lib/calabash-cucumber/ios7_operations.rb
+- lib/calabash-cucumber/ipad_1x_2x.rb
 - lib/calabash-cucumber/keyboard_helpers.rb
+- lib/calabash-cucumber/keychain_helpers.rb
 - lib/calabash-cucumber/launch/simulator_helper.rb
 - lib/calabash-cucumber/launcher.rb
 - lib/calabash-cucumber/map.rb
@@ -363,6 +365,7 @@ files:
 - scripts/EmptyAppHack.app/en.lproj/InfoPlist.strings
 - scripts/data/.GlobalPreferences.plist
 - scripts/data/clients.plist
+- scripts/data/com.apple.Accessibility-5.1.plist
 - scripts/data/com.apple.Accessibility.plist
 - scripts/launch.rb
 - scripts/reset_simulator.scpt
@@ -381,9 +384,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3