Release/2.2.3

CHANGELOG.md

@@ -1,5 +1,59 @@
 ## Change Log
 
+### 2.2.3
+
+* Update to DeviceAgent stack to 1.0.3 #572
+* CODE\_SIGN\_IDENTITY is not longer required #570
+* Increase DeviceAgent timeouts #569
+* DA:Client: launch AUT with args and environment #567
+* run-loop simctl tail shows all simulator logs #566
+* App: fix TrueType font extension to avoid otool failures #565
+* Added pt-BR translations for permissions alerts #563 @oscartanner
+* Support Xcode 8.2 #561
+* Turns enter text input parameter to string for numeric keyboards #560
+* Gem: patch awesome\_print for BasicObject #559
+
+#### DeviceAgent 1.0.3
+
+Built from tag [1.0.3](https://github.com/calabash/DeviceAgent.iOS/releases/tag/1.0.3)
+
+* Add iTunes and Apple Music SpringBoard alerts #183
+* Add UITextView to TestApp #181
+* Use Testmanagerd `XCT_sendString` to enter text except on i386/armv7 devices #178
+* Fixes if statement in querying delete key for clear text #177
+* Add GET environment and arguments #176
+* Update SpringBoard alert definitions for iOS 10 #175
+* clear\_text should tap keyboard delete key #170
+
+DeviceAgent now dismisses the following US English SpringBoard alerts:
+
+* Sign In to iTunes
+* Access Apple Music And Your Media
+* Health Access
+* Enable Dictation
+* pt\_BR localizations - thanks @oscartanner
+
+#### iOSDeviceManager 1.0.3
+
+Built from tag [1.0.3](https://github.com/calabash/iOSDeviceManager/releases/tag/1.0.3)
+
+Includes [facebook/FBSimulatorControl 0.2.2 @
+f0cc887](https://github.com/calabash/FBSimulatorControl/commit/f0cc8874a9fc1474e278db7571f8c35b9f88a354).
+
+The corresponding calabash/FBSimulatorControl tag is
+[fb-0.2.2-at-f0cc887](https://github.com/calabash/FBSimulatorControl/releases/tag/fb-0.2.2-at-f0cc887-iOSDeviceManager-1.0.3)
+
+* Match array-based entitlements with * and <TEAM ID>. #95
+* FB Frameworks 0.2.2 with Sierra + Xcode >= 8.1 support #94
+* Fix timeout by using mach\_absolute\_time() #93
+* Fix ShasumProvider generating strings with missing characters. #92
+* Upload files to application's data container #91
+* Update to Facebook frameworks to 0.2.2 #89
+* Use CocoaLumberjack provided by FBSimulatorControl #85
+* Fix cannot find XCTBootstrap.framework compile time errors #83
+* Simplify how we get the common name for a certificate #82
+* Use CommonCrypto to get SHA1 instead of shelling out #80
+
 ### 2.2.2
 
 The DeviceAgent stack contains fixes for:
@@ -16,7 +70,7 @@ The DeviceAgent stack contains fixes for:
 * DeviceAgent::Client: add support for query("\*") and query("all \*") #550
 * DeviceAgent::Client: enter text without keyboard check #548
 
-#### DeviceAgent 1.0.1
+#### DeviceAgent 1.0.2
 
 **20fbc23ece073e5beea611a4aafae436ad78e54b**
 

Rakefile

@@ -203,12 +203,43 @@ target = #{target}
     end
   end
 
+  def ensure_valid_core_simulator_service
+    max_tries = 3
+    valid = false
+    3.times do |try|
+      valid = valid_core_simulator_service?
+      break if valid
+      log_info("Invalid CoreSimulator service for active Xcode: try #{try + 1} of #{max_tries}")
+    end
+    if valid
+      log_info("CoreSimulatorService is valid")
+    else
+      puts "CoreSimulatorService is invalid, try running again."
+      exit 1
+    end
+  end
+
+  def valid_core_simulator_service?
+    require "run_loop/shell"
+    args = ["xcrun", "simctl", "help"]
+
+    begin
+      hash = RunLoop::Shell.run_shell_command(args)
+      hash[:exit_status] == 0 &&
+        !hash[:out][/Failed to locate a valid instance of CoreSimulatorService/]
+    rescue RunLoop::Shell::Error => _
+      false
+    end
+  end
+
   task :build do
     banner("Building")
 
     # Memoize base target directory
     device_agent_dir
 
+    ensure_valid_core_simulator_service
+
     env = {"DEVICEAGENT_PATH" => device_agent,
            "FBSIMCONTROL_PATH" => fbsimctl}
     Dir.chdir(ios_device_manager) do

lib/run_loop/app.rb

@@ -369,7 +369,7 @@ def core_data_asset?(file)
     def font?(file)
       extension = File.extname(file)
 
-      extension == ".tff" || extension == ".otf"
+      extension == ".ttf" || extension == ".otf"
     end
   end
 end

lib/run_loop/cli/simctl.rb

@@ -10,19 +10,22 @@ class Simctl < Thor
 
       desc 'tail', 'Tail the log file of the booted simulator'
       def tail
-        tail_booted
+        tail_simulator_logs
       end
 
       no_commands do
-        def tail_booted
-          device = booted_device
-          if device.nil?
-            version = xcode.version
-            puts "No simulator for active Xcode (version #{version}) is booted."
-          else
-            log_file = device.simulator_log_file_path
-            exec('tail', *["-n", "5000", '-F', log_file])
-          end
+        def tail_simulator_logs
+          paths = simctl.simulators.map do |simulator|
+            log_file_path = simulator.simulator_log_file_path
+            if log_file_path && File.exist?(log_file_path)
+              log_file_path
+            else
+              nil
+            end
+          end.compact
+
+          args = ["-n", "1000", "-F"] + paths
+          exec("tail", *args)
         end
       end
 

lib/run_loop/core.rb

@@ -320,7 +320,9 @@ def self.include_calabash_script?(options)
     #  version.
     def self.default_simulator(xcode=RunLoop::Xcode.new)
 
-      if xcode.version_gte_81?
+      if xcode.version_gte_82?
+        "iPhone 7 (10.2)"
+      elsif xcode.version_gte_81?
         "iPhone 7 (10.1)"
       elsif xcode.version_gte_8?
         "iPhone 7 (10.0)"

lib/run_loop/device_agent/bin/CLI.json

@@ -28,6 +28,33 @@
             "default" : true
         }        
     },
+  "upload" : {
+    "-b" : {
+      "longFlag" : "--bundle-identifier",
+      "optionName" : "bundle-id",
+      "info" : "bundle identifier (e.g. com.my.app)",
+      "required" : true
+      },
+    "-d" : {
+      "longFlag" : "--device-id",
+      "optionName" : "device-identifier",
+      "info" : "iOS Simulator GUID or 40-digit physical device ID",
+      "required" : true
+    },
+    "-f" : {
+      "longFlag" : "--filepath",
+      "optionName" : "filepath",
+      "info" : "absolute path to file to be uploaded",
+      "required" : true
+    },
+    "-o" : {
+      "longFlag" : "--overwrite",
+      "optionName" : "overwrite",
+      "info" : "overwrite file if already in app container",
+      "required" : false,
+      "default" : false
+    }
+  },
     "is_installed" : {
         "-b" : {
             "longFlag" : "--bundle-identifier",

lib/run_loop/device_agent/client.rb

@@ -29,15 +29,16 @@ class HTTPError < RuntimeError; end
       # For example:
       #
       # RunLoop::DeviceAgent::Client::DEFAULTS[:http_timeout] = 60
+      # RunLoop::DeviceAgent::Client::DEFAULTS[:device_agent_install_timeout] = 120
       DEFAULTS = {
         :port => 27753,
         :simulator_ip => "127.0.0.1",
-        :http_timeout => (RunLoop::Environment.ci? || RunLoop::Environment.xtc?) ? 120 : 10,
+        :http_timeout => (RunLoop::Environment.ci? || RunLoop::Environment.xtc?) ? 120 : 20,
         :route_version => "1.0",
 
         # Ignored in the XTC.
         # This key is subject to removal or changes
-        :device_agent_install_timeout => RunLoop::Environment.ci? ? 120 : 60,
+        :device_agent_install_timeout => RunLoop::Environment.ci? ? 120 : 90,
         # This value must always be false on the XTC.
         # This is should only be used by gem maintainers or very advanced users.
         :shutdown_device_agent_before_launch => false
@@ -106,33 +107,20 @@ def self.run(options={})
           code_sign_identity = RunLoop::Environment::code_sign_identity
         end
 
-        if device.physical_device? && cbx_launcher.name == :ios_device_manager
-          if !code_sign_identity
-            raise RuntimeError, %Q[
-Targeting a physical devices requires a code signing identity.
-
-Rerun your test with:
-
-$ CODE_SIGN_IDENTITY="iPhone Developer: Your Name (ABCDEF1234)" cucumber
-
-To see the valid code signing identities on your device run:
-
-$ xcrun security find-identity -v -p codesigning
-
-]
-          end
-        end
-
         install_timeout = options.fetch(:device_agent_install_timeout,
                                                      DEFAULTS[:device_agent_install_timeout])
         shutdown_before_launch = options.fetch(:shutdown_device_agent_before_launch,
                                                DEFAULTS[:shutdown_device_agent_before_launch])
+        aut_args = options.fetch(:args, [])
+        aut_env = options.fetch(:env, {})
 
         launcher_options = {
             code_sign_identity: code_sign_identity,
             device_agent_install_timeout: install_timeout,
             shutdown_device_agent_before_launch: shutdown_before_launch,
-            dylib_injection_details: dylib_injection_details
+            dylib_injection_details: dylib_injection_details,
+            aut_args: aut_args,
+            aut_env: aut_env
         }
 
         xcuitest = RunLoop::DeviceAgent::Client.new(bundle_id, device,
@@ -307,10 +295,6 @@ def device_info
         expect_300_response(response)
       end
 
-      # TODO Legacy API; remove once this branch is merged:
-      # https://github.com/calabash/DeviceAgent.iOS/pull/133
-      alias_method :runtime, :device_info
-
       # @!visibility private
       def server_version
         options = http_options
@@ -362,7 +346,7 @@ def enter_text(string)
         parameters = {
           :gesture => "enter_text",
           :options => {
-            :string => string
+            :string => string.to_s
           }
         }
         request = request("gesture", parameters)
@@ -382,7 +366,7 @@ def enter_text_without_keyboard_check(string)
         parameters = {
           :gesture => "enter_text",
           :options => {
-            :string => string
+            :string => string.to_s
           }
         }
         request = request("gesture", parameters)
@@ -802,6 +786,8 @@ def wait_for_text_in_view(text, uiquery, options={})
         merged_options = WAIT_DEFAULTS.merge(options)
         result = wait_for_view(uiquery, merged_options)
 
+        # This is not quite right.  It is possible to get a false positive.
+        # If result does not have "value" or "label" and the text is nil
         candidates = [result["value"],
                       result["label"]]
         match = candidates.any? do |elm|
@@ -1250,7 +1236,7 @@ def launch_cbx_runner
 
 To diagnose the problem tail the launcher log file:
 
-$ tail -1000 -F #{cbx_launcher.class.log_file}
+$ tail -1000 -F #{cbx_launcher_log_file}
 
 ]
         end
@@ -1294,9 +1280,19 @@ def launch_aut(bundle_id = @bundle_id)
 
         retries = 5
 
+        # Launch arguments and environment arguments cannot be nil
+        # The public interface Client.run has a guard against this, but
+        # internal callers to do not.
+        aut_args = launcher_options.fetch(:aut_args, [])
+        aut_env = launcher_options.fetch(:aut_env, {})
         begin
           client = http_client(http_options)
-          request = request("session", {:bundleID => bundle_id})
+          request = request("session",
+                            {
+                              :bundleID => bundle_id,
+                              :launchArgs => aut_args,
+                              :environment => aut_env
+                            })
           response = client.post(request)
           RunLoop.log_debug("Launched #{bundle_id} on #{device}")
           RunLoop.log_debug("#{response.body}")
@@ -1421,6 +1417,17 @@ def orientation_for_position_symbol(position)
         end
       end
 
+      # @!visibility private
+      def cbx_launcher_log_file
+        if cbx_launcher.name == :ios_device_manager
+          # The location of the iOSDeviceManager logs has changed
+          File.join(RunLoop::Environment.user_home_directory,
+                    ".calabash", "iOSDeviceManager", "logs", "current.log")
+        else
+          cbx_launcher.class.log_file
+        end
+      end
+
       # @!visibility private
       # Private method.  Do not call.
       # Flattens the result of `tree`.