calabash-cucumber 0.9.169.pre5 → 0.9.169.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5720c3a1025782b5d07f6b2283414c8b2e0986a0
-  data.tar.gz: 556933f7a91bcb3a05539d9048daf2360e550512
+  metadata.gz: 35ea078d42c9b70dfbdd979ea489e9f10b28d928
+  data.tar.gz: 075d9e64b5f26ff76fa490291c7f877609d199fd
 SHA512:
-  metadata.gz: bd03a7ed163acfa246b53da1a8ee41a181e968f9e6f5d0594bbeba4480a1901be7939392b04f6088a69f3536ec7f4dc9ec12199339873eeeedd1eb207fbe2e99
-  data.tar.gz: 21367d4e5a072e303f70bb26b75c254906df900c80f4af75d8c76b08780d72e673f1983320ca6f6f98a571ce57311afe851e4d12547ff5ae6344c98606f922ec
+  metadata.gz: 3594493a413ac63b8d0dc459d792638495161b2331b456b2420bcf4b5ac63ed64b4186f4489b2de351ddb3d2a5dc825716f469f8f0646ea090ba57ecb5627e59
+  data.tar.gz: 17d36a67d16b288a5fbc56abe0612ba0090097b950ab254640e3ba7e3b54764a56b6400ed2d8150cae8b107bfa4048a642244562abd61e28e5b40e9e86e0e209

data/calabash-cucumber.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency('json')
   s.add_dependency('edn')
   s.add_dependency('CFPropertyList')
-  s.add_dependency('sim_launcher', '~> 0.4.9')
+  s.add_dependency('sim_launcher', '~> 0.4.10')
   s.add_dependency('slowhandcuke')
   s.add_dependency('geocoder', '~>1.1.8')
   s.add_dependency('httpclient', '~> 2.3.3')

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

@@ -4,13 +4,11 @@
 #                                      #
 #   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                 #
+#   the  methods invoked by            #
+#   CalabashLauncher are overriden.    #
+#   It will automatically ensure       #
+#   running on device, installing apps #
+#   etc.                               #
 #                                      #
 ########################################
 

data/lib/calabash-cucumber/actions/instruments_actions.rb

@@ -13,6 +13,10 @@ class Calabash::Cucumber::InstrumentsActions
     query_action(options, :uia_tap_offset)
   end
 
+  def wait_tap(options)
+    uia_wait_tap(options[:query], options)
+  end
+
   def double_tap(options)
     query_action(options, :uia_double_tap_offset)
   end

data/lib/calabash-cucumber/actions/playback_actions.rb

@@ -13,6 +13,10 @@ class Calabash::Cucumber::PlaybackActions
     playback('touch', options)
   end
 
+  def wait_tap(options)
+    touch(options)
+  end
+
   def double_tap(options)
     playback('double_tap', options)
   end

data/lib/calabash-cucumber/core.rb

@@ -46,6 +46,10 @@ module Calabash
         map(uiquery, :query, *args)
       end
 
+      def q(uiquery, *args)
+        query(uiquery, *args)
+      end
+
       # causes all views matched by the +query+ to briefly change colors making
       # them visually identifiable.
       #
@@ -81,6 +85,16 @@ module Calabash
         query_action_with_options(:touch, uiquery, options)
       end
 
+      def wait_tap(uiquery, options={})
+        _uiquery, options = extract_query_and_options(uiquery, options)
+        launcher.actions.wait_tap(options)
+      end
+
+      def t(uiquery, options={})
+        wait_tap(uiquery, options)
+      end
+
+
       def double_tap(uiquery, options={})
         query_action_with_options(:double_tap, uiquery, options)
       end

data/lib/calabash-cucumber/launcher.rb

@@ -232,23 +232,25 @@ class Calabash::Cucumber::Launcher
         :launch_retries => 5
     }
 
-    #:device_target will be set
+    device_tgt = ENV['DEVICE_TARGET']
+    if run_with_instruments?(args)
+      if simulator_target?
+        args[:device_target] = device_tgt
+        args[:udid] = nil
+      else
+        if detect_connected_device? && (device_tgt.nil? || device_tgt.downcase == 'device')
+          device_tgt = RunLoop::Core.detect_connected_device
+        end
 
-    if run_with_instruments?(args) && !simulator_target?
-      device_tgt = ENV['DEVICE_TARGET']
-      if detect_connected_device? && (device_tgt.nil? || device_tgt.downcase == 'device')
-        device_tgt = RunLoop::Core.detect_connected_device
+        if device_tgt
+          args[:device_target] = args[:udid] = device_tgt
+        end
       end
+    end
 
-      if device_tgt
-        args[:device_target] = args[:udid] = device_tgt
-      else
-        args[:device_target] = 'simulator'
-      end
-    else
+    if args[:device_target].nil?
       args[:device_target] = 'simulator'
     end
-
     args
   end
 
@@ -309,14 +311,14 @@ class Calabash::Cucumber::Launcher
         args[:app] = File.expand_path(args[:app])
       else
         # args[:app] is not a directory so must be a bundle id
-        if args[:device_target] == 'simulator' ## bundle id set, but simulator target
+        if simulator_target?(args) ## bundle id set, but simulator target
           args[:app] = app_path || detect_app_bundle_from_args(args)
         end
       end
     end
 
     unless args[:app]
-      if args[:device_target]=='simulator'
+      if simulator_target?(args)
         device_xamarin_build_dir = 'iPhoneSimulator'
       else
         device_xamarin_build_dir = 'iPhone'
@@ -333,7 +335,7 @@ class Calabash::Cucumber::Launcher
 
 
     if args[:privacy_settings]
-      if args[:device_target]=='simulator'
+      if simulator_target?(args)
         update_privacy_settings(args[:bundle_id], args[:privacy_settings])
       else
         #Not supported on device
@@ -383,7 +385,7 @@ class Calabash::Cucumber::Launcher
 
   # todo this method should be migrated to the Simulator Launcher
   def detect_app_bundle_from_args(args)
-    if args[:device_target]=='simulator'
+    if simulator_target?(args)
       device_xamarin_build_dir = 'iPhoneSimulator'
     else
       device_xamarin_build_dir = 'iPhone'

data/lib/calabash-cucumber/operations.rb

@@ -63,7 +63,17 @@ module Calabash
         touch("view marked:'#{label}'", *args)
       end
 
-      def tap(label, *args)
+      def tap(hash_or_string, *args)
+        if hash_or_string.is_a?(String)
+          tap_mark(hash_or_string, *args)
+        elsif hash_or_string.respond_to?(:[])
+          wait_tap(hash_or_string[:query], hash_or_string)
+        else
+          raise(ArgumentError, "first parameter to tap must be a string or a hash. Was: #{hash_or_string.class}, #{hash_or_string}")
+        end
+      end
+
+      def tap_mark(label, *args)
         simple_touch(label, *args)
       end
 

data/lib/calabash-cucumber/uia.rb

@@ -19,6 +19,15 @@ module Calabash
         res['results'].first
       end
 
+      def uia_wait_tap(query, options={})
+        res = http({:method => :post, :path => 'uia-tap'}, {:query => query}.merge(options))
+        res = JSON.parse(res)
+        if res['outcome'] != 'SUCCESS'
+          raise "uia-tap action failed because: #{res['reason']}\n#{res['details']}"
+        end
+        res['results'].first
+      end
+
       def uia_query(*queryparts)
         #TODO escape '\n etc in query
         uia_handle_command(:query, queryparts)

data/lib/calabash-cucumber/utils/simulator_accessibility.rb

@@ -1,6 +1,7 @@
 require 'calabash-cucumber/utils/xctools'
 require 'calabash-cucumber/utils/plist_buddy'
 require 'sim_launcher'
+require 'cfpropertylist'
 
 module Calabash
   module Cucumber
@@ -48,7 +49,7 @@ module Calabash
         quit_simulator
         sim_lib_path = File.join(simulator_app_support_dir(), 'Library')
         FileUtils.rm_rf(sim_lib_path)
-        simulator_support_sdk_dirs.each do |dir|
+        existing_simulator_support_sdk_dirs.each do |dir|
           FileUtils.rm_rf(dir)
         end
 
@@ -63,7 +64,7 @@ module Calabash
         counter = 0
         loop do
           break if counter == 80
-          dirs = simulator_support_sdk_dirs
+          dirs = existing_simulator_support_sdk_dirs
           if dirs.count == 0
             sleep(0.2)
           else
@@ -88,13 +89,21 @@ module Calabash
       #     ~/Library/Application Support/iPhone Simulator/Library/7.0.3-64
       #     ~/Library/Application Support/iPhone Simulator/Library/7.1
       #
+      # a simulator is 'possible' if the SDK is available in the Xcode version.
+      #
+      # this method merges (uniquely) the possible and existing SDKs.
+      #
       # this method also hides the AXInspector.
+      #
       # @param [Hash] opts controls the behavior of the method
       # @option opts [Boolean] :verbose controls logging output
       # @return [Boolean] true iff enabling accessibility worked on all sdk
       #  directories
       def enable_accessibility_on_simulators(opts={})
-        results =  simulator_support_sdk_dirs.map do |dir|
+        possible = possible_simulator_support_sdk_dirs
+        existing = existing_simulator_support_sdk_dirs
+        dirs = (possible + existing).uniq
+        results = dirs.map do |dir|
           enable_accessibility_in_sdk_dir(dir, opts)
         end
         results.all? { |elm| elm }
@@ -107,13 +116,14 @@ module Calabash
       #
       # WARNING:  this will quit the simulator
       #
-      #   path = '~/Library/Application Support/iPhone Simulator/Library/6.1'
+      #   path = '/6.1'
       #   enable_accessibility_in_sdk_dir(path)
       #
       # this method also hides the AXInspector.
       #
-      # if the Library/Preferences/com.apple.Accessibility.plist does not exist,
-      # this method returns false.
+      # if the Library/Preferences/com.apple.Accessibility.plist does not exist
+      # this method will create a Library/Preferences/com.apple.Accessibility.plist
+      # that (oddly) the Simulator will _not_ overwrite.
       #
       # @see enable_accessibility_on_simulators for the public API.
       #
@@ -128,72 +138,47 @@ module Calabash
         default_opts = {:verbose => false}
         merged = default_opts.merge(opts)
 
-        plist_path = File.expand_path("#{sim_app_support_sdk_dir}/Library/Preferences/com.apple.Accessibility.plist")
+        quit_simulator
 
         verbose = merged[:verbose]
-
         sdk = File.basename(sim_app_support_sdk_dir)
         msgs = ["cannot enable accessibility for #{sdk} SDK"]
-        unless File.exists?(plist_path)
-          if verbose
-            msgs << "expected plist to exist at #{plist_path}"
-            calabash_warn(msgs.join("\n"))
-          end
-          return false
-        end
 
-        quit_simulator
+        plist_path = File.expand_path("#{sim_app_support_sdk_dir}/Library/Preferences/com.apple.Accessibility.plist")
 
         hash = accessibility_properties_hash()
 
-        unless plist_set(hash[:access_enabled], 'bool', 'true', plist_path)
-          if verbose
-            msgs << "could not set '#{hash[:access_enabled]}' to YES"
-            calabash_warn(msgs.join("\n"))
+        if File.exist?(plist_path)
+          res = hash.map do |hash_key, settings|
+            success = plist_set(settings[:key], settings[:type], settings[:value], plist_path)
+            unless success
+              if verbose
+                if settings[:type] == 'bool'
+                  value = settings[:value] ? 'YES' : 'NO'
+                else
+                  value = settings[:value]
+                end
+                msgs << "could not set #{hash_key} => '#{settings[:key]}' to #{value}"
+                calabash_warn(msgs.join("\n"))
+              end
+            end
+            success
           end
-          return false
+          res.all? { |elm| elm }
+        else
+          FileUtils.mkdir_p("#{sim_app_support_sdk_dir}/Library/Preferences")
+          plist = CFPropertyList::List.new
+          data = {}
+          # CFPropertyList gem is super wonky
+          # it matches Boolean to a string type with 'true/false' values
+          # - stick with PlistBuddy
+          # hash.each do |_, settings|
+          #   data[settings[:key]] = settings[:value]
+          # end
+          plist.value = CFPropertyList.guess(data)
+          plist.save(plist_path, CFPropertyList::List::FORMAT_BINARY)
+          enable_accessibility_in_sdk_dir(sim_app_support_sdk_dir)
         end
-
-        unless plist_set(hash[:app_access_enabled], 'bool', 'true', plist_path)
-          if verbose
-            msgs << "could not set '#{hash[:app_access_enabled]}' to YES"
-            calabash_warn(msgs.join("\n"))
-          end
-          return false
-        end
-
-        unless plist_set(hash[:automation_enabled], 'bool', 'true', plist_path)
-          if verbose
-            msgs << "could not set '#{hash[:automation_enabled]}' to YES"
-            calabash_warn(msgs.join("\n"))
-          end
-          return false
-        end
-
-        unless plist_set(hash[:inspector_showing], 'bool', 'false', plist_path)
-          if verbose
-            msgs << "could not set '#{hash[:inspector_showing]}' to NO"
-            calabash_warn(msgs.join("\n"))
-          end
-          return false
-        end
-
-        unless plist_set(hash[:inspector_full_size], 'bool', 'false', plist_path)
-          if verbose
-            msgs << "could not set '#{hash[:inspector_full_size]}' to NO"
-            calabash_warn(msgs.join("\n"))
-          end
-          return false
-        end
-
-        res = plist_set(hash[:inspector_frame], 'string', '{{270, -13}, {276, 166}}', plist_path)
-        unless res
-          if verbose
-            msgs << "could not set '#{hash[:inspector_frame]}'"
-            calabash_warn(msgs.join("\n"))
-          end
-        end
-        res
       end
 
 
@@ -204,29 +189,50 @@ module Calabash
       def accessibility_properties_hash
         {
               # this is required
-              :access_enabled => 'AccessibilityEnabled',
+              :access_enabled => {:key => 'AccessibilityEnabled',
+                                  :value => 'true',
+                                  :type => 'bool'},
               # i _think_ this is legacy
-              :app_access_enabled => 'ApplicationAccessibilityEnabled',
+              :app_access_enabled => {:key => 'ApplicationAccessibilityEnabled',
+                                      :value => 'true',
+                                      :type => 'bool'},
 
               # i don't know what this does
-              :automation_enabled => 'AutomationEnabled',
+              :automation_enabled => {:key => 'AutomationEnabled',
+                                      :value => 'true',
+                                      :type => 'bool'},
 
               # determines if the Accessibility Inspector is showing
-              :inspector_showing => 'AXInspectorEnabled',
+              :inspector_showing => {:key => 'AXInspectorEnabled',
+                                     :value => 'false',
+                                     :type => 'bool'},
+
               # controls if the Accessibility Inspector is expanded or not expanded
-              :inspector_full_size => 'AXInspector.enabled',
+              :inspector_full_size => {:key => 'AXInspector.enabled',
+                                       :value => 'false',
+                                       :type => 'bool'},
+
               # controls the frame of the Accessibility Inspector
               # this is a 'string' => {{0, 0}, {276, 166}}
-              :inspector_frame => 'AXInspector.frame'
+              :inspector_frame => {:key => 'AXInspector.frame',
+                                   :value => '{{270, -13}, {276, 166}}',
+                                   :type => 'string'}
         }
       end
 
-      # the absolute path the the iPhone Simulator Application Support directory
+      # the absolute path to the iPhone Simulator Application Support directory
       # @return [String] absolute path
       def simulator_app_support_dir
         File.expand_path('~/Library/Application Support/iPhone Simulator')
       end
 
+      # the absolute path to the SDK's com.apple.Accessibility.plist file
+      # @param [String] sdk_dir base path the SDK directory
+      # @return [String] an absolute path
+      def plist_path_with_sdk_dir(sdk_dir)
+        File.expand_path("#{sdk_dir}/Library/Preferences/com.apple.Accessibility.plist")
+      end
+
       # returns a list of absolute paths the existing simulator directories.
       #
       # a simulator 'exists' if has an Application Support directory. for
@@ -238,13 +244,63 @@ module Calabash
       #     ~/Library/Application Support/iPhone Simulator/Library/7.1
       #
       # @return[Array<String>] a list of absolute paths to simulator directories
-      def simulator_support_sdk_dirs
+      def existing_simulator_support_sdk_dirs
         sim_app_support_path = simulator_app_support_dir()
         Dir.glob("#{sim_app_support_path}/*").select { |path|
           path =~ /(\d)\.(\d)\.?(\d)?(-64)?/
         }
       end
 
+      # returns a list of possible SDKs per Xcode version
+      #
+      # it is not enough to ask for the available sdks because of the new 64-bit
+      # variants that started to appear Xcode 5 and the potential for patch level
+      # versions.
+      #
+      # unfortunately, this method will need be maintained per Xcode version.
+      #
+      # @return [Array<String>] ex. ['6.1', '7.1', '7.0.3', '7.0.3-64']
+      def possible_simulator_sdks
+        sdk_detector = SimLauncher::SdkDetector.new
+        available = sdk_detector.available_sdk_versions
+        instruments_version = instruments(:version)
+
+        # in Xcode 5.1* SDK 7.0 ==> 7.0.3
+        if (instruments_version == '5.1' or instruments_version == '5.1.1') and available.include?('7.0')
+          available << '7.0.3'
+          available << '7.0.3-64'
+        end
+
+        if instruments_version == '5.1.1' and available.include?('7.1')
+          available << '7.1'
+          available << '7.1-64'
+        end
+
+        gem_compat_xcode_versions = ['5.1', '5.1.1']
+        unless gem_compat_xcode_versions.include?(instruments_version)
+          msg = ["expected Xcode instruments version to be '5.1' or '5.1.1'",
+                 "but found version '#{instruments_version}'",
+                 "Gem needs a manual update for Xcode #{instruments_version}!"].join("\n")
+          calabash_warn(msg)
+        end
+
+        # in Xcode 5.1* SDK 7.0 ==> 7.0.3 so we should not include '7.0'
+        # if the user's support directory already contains a 7.0 and 7.0-64 dir
+        # we will detect it by reading from disk.
+        (available - ['7.0']).uniq.sort
+      end
+
+      # return absolute paths to possible simulator support sdk dirs
+      #
+      # these directories may or may not exist
+      # @return [Array<String>] an array of absolute paths
+      def possible_simulator_support_sdk_dirs
+        base_dir = simulator_app_support_dir
+        possible_simulator_sdks.map { |sdk|
+          "#{base_dir}/#{sdk}"
+        }
+      end
+
     end
   end
 end