run_loop 2.1.2 → 2.1.3

data/lib/run_loop/sim_control.rb

@@ -294,7 +294,11 @@ module RunLoop
         end
       else
         possible = XCODE_5_SDKS.map do |sdk|
-          File.expand_path("~/Library/Application Support/iPhone Simulator/#{sdk}")
+          File.join(RunLoop::Environment.user_home_directory,
+                    "Library",
+                    "Application Support",
+                    "iPhone Simulator",
+                    sdk)
         end
 
         dirs = (possible + existing).uniq
@@ -646,10 +650,11 @@ module RunLoop
     # The absolute path to the iPhone Simulator Application Support directory.
     # @return [String] absolute path
     def sim_app_support_dir
+      home_dir = RunLoop::Environment.user_home_directory
       if xcode_version_gte_6?
-        File.expand_path('~/Library/Developer/CoreSimulator/Devices')
+        File.join(home_dir, "Library", "Developer", "CoreSimulator", "Devices")
       else
-        File.expand_path('~/Library/Application Support/iPhone Simulator')
+        File.join(home_dir, "Library", "Application Support", "iPhone Simulator")
       end
     end
 

data/lib/run_loop/version.rb

@@ -1,5 +1,5 @@
 module RunLoop
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 
   # A model of a software release version that can be used to compare two versions.
   #

data/lib/run_loop/xcuitest.rb

@@ -3,6 +3,9 @@ module RunLoop
   # @!visibility private
   class XCUITest
 
+    require "run_loop/shell"
+    include RunLoop::Shell
+
     class HTTPError < RuntimeError; end
 
     # @!visibility private
@@ -38,59 +41,64 @@ module RunLoop
         core_sim.install
       end
 
-      xcuitest = RunLoop::XCUITest.new(bundle_id, device)
+      cbx_launcher = XCUITest.detect_cbx_launcher(options, device)
+
+      xcuitest = RunLoop::XCUITest.new(bundle_id, device, cbx_launcher)
       xcuitest.launch
       xcuitest
     end
 
     # @!visibility private
-    def self.xcodebuild_log_file
-      path = File.join(XCUITest.dot_dir, "xcodebuild.log")
-      FileUtils.touch(path) if !File.exist?(path)
-      path
+    #
+    # @param [RunLoop::Device] device the device under test
+    def self.default_cbx_launcher(device)
+      RunLoop::DeviceAgent::XCTestctl.new(device)
+    end
+
+    # @!visibility private
+    # @param [Hash] options the options passed by the user
+    # @param [RunLoop::Device] device the device under test
+    def self.detect_cbx_launcher(options, device)
+      value = options[:cbx_launcher]
+      if value
+        if value == :xcodebuild
+          RunLoop::DeviceAgent::Xcodebuild.new(device)
+        elsif value == :xctestctl
+          RunLoop::DeviceAgent::XCTestctl.new(device)
+        else
+          raise(ArgumentError,
+                "Expected :cbx_launcher => #{value} to be :xcodebuild or :xctestctl")
+        end
+      else
+        XCUITest.default_cbx_launcher(device)
+      end
     end
 
+    attr_reader :bundle_id, :device, :cbx_launcher
+
     # @!visibility private
     #
     # The app with `bundle_id` needs to be installed.
     #
     # @param [String] bundle_id The identifier of the app under test.
     # @param [RunLoop::Device] device The device device.
-    def initialize(bundle_id, device)
+    def initialize(bundle_id, device, cbx_launcher)
       @bundle_id = bundle_id
       @device = device
+      @cbx_launcher = cbx_launcher
     end
 
+    # @!visibility private
     def to_s
-      "#<XCUITest #{url} : #{bundle_id} : #{device}>"
+      "#<XCUITest #{url} : #{bundle_id} : #{device} : #{cbx_launcher}>"
     end
 
+    # @!visibility private
     def inspect
       to_s
     end
 
     # @!visibility private
-    def bundle_id
-      @bundle_id
-    end
-
-    # @!visibility private
-    def device
-      @device
-    end
-
-    # @!visibility private
-    def workspace
-      @workspace ||= lambda do
-        path = RunLoop::Environment.send(:cbxws)
-        if path
-          path
-        else
-          raise "TODO: figure out how to distribute the CBX-Runner"
-        end
-      end.call
-    end
-
     def launch
       start = Time.now
       launch_cbx_runner
@@ -123,6 +131,15 @@ module RunLoop
       launch_aut(bundle_id)
     end
 
+    # @!visibility private
+    def runtime
+      options = http_options
+      request = request("device")
+      client = client(options)
+      response = client.get(request)
+      expect_200_response(response)
+    end
+
     # @!visibility private
     def query(mark)
       options = http_options
@@ -134,23 +151,50 @@ module RunLoop
     end
 
     # @!visibility private
-    def tap_mark(mark)
+    def query_for_coordinate(mark)
       body = query(mark)
-      tap_query_result(body)
+      coordinate_from_query_result(body)
     end
 
     # @!visibility private
-    def tap_coordinate(x, y)
-      options = http_options
-      parameters = {
-        :gesture => "touch",
+    def tap_mark(mark)
+      coordinate = query_for_coordinate(mark)
+      tap_coordinate(coordinate[:x], coordinate[:y])
+    end
+
+    # @!visibility private
+    def tap_coordinate(x, y, options)
+      make_coordinate_gesture_request("touch", x, y)
+    end
+
+    # @!visibility private
+    def double_tap(x, y)
+      make_coordinate_gesture_request("double_tap", x, y)
+    end
+
+    # @!visibiity private
+    def coordinate_gesture_parameters(name, x, y, options={})
+      {
+        :gesture => name,
         :specifiers => {
-          :coordinate => {x: x, y: y}
+          :coordinate => [x, y]
         },
-        :options => {}
+        :options => options
       }
-      request = request("gesture", parameters)
-      client(options)
+    end
+
+    # @!visibility private
+    def coordinate_gesture_request(name, x, y, gesture_options={})
+      parameters = coordinate_gesture_parameters(name, x, y, gesture_options)
+      request("gesture", parameters)
+    end
+
+    # @!visibility private
+    def make_coordinate_gesture_request(name, x, y, options={})
+      gesture_options = options.fetch(:gesture_options, {})
+      http_options = options.fetch(:http_options, http_options())
+      request = coordinate_gesture_request(name, x, y, gesture_options)
+      client = client(http_options)
       response = client.post(request)
       expect_200_response(response)
     end
@@ -162,7 +206,7 @@ module RunLoop
         :orientation => orientation
       }
       request = request("rotate_home_button_to", parameters)
-      client(http_options)
+      client = client(http_options)
       response = client.post(request)
       json = expect_200_response(response)
       sleep(sleep_for)
@@ -179,23 +223,46 @@ module RunLoop
         :options => options
       }
 
+      RunLoop.log_debug(%Q[
+Sending request to perform '#{gesture}' with:
+
+#{JSON.pretty_generate(parameters)}
+
+])
       request = request("gesture", parameters)
-      client(http_options)
+      client = client(http_options)
       response = client.post(request)
       expect_200_response(response)
     end
 
     # @!visibility private
-    def tap_query_result(hash)
-      rect = hash["rect"]
+    def coordinate_from_query_result(hash)
+      matches = hash["result"]
+
+      if matches.nil? || matches.empty?
+        raise "Expected #{hash} to contain some results"
+      end
+
+      rect = matches.first["rect"]
       h = rect["height"]
       w = rect["width"]
       x = rect["x"]
       y = rect["y"]
 
-      touchx = x + (h/2)
-      touchy = y + (w/2)
-      tap_coordinate(touchx, touchy)
+      touchx = x + (w/2.0)
+      touchy = y + (h/2.0)
+
+      new_rect = rect.dup
+      new_rect[:center_x] = touchx
+      new_rect[:center_y] = touchy
+
+      RunLoop.log_debug(%Q[Rect from query:
+
+#{JSON.pretty_generate(new_rect)}
+
+])
+      {:x => touchx,
+       :y => touchy}
     end
 
     private
@@ -223,7 +290,7 @@ module RunLoop
               :undef             => :replace,  # Replace anything not defined in ASCII
               :replace           => ""         # Use a blank for those replacements
             }
-            encoded = device_name.encode(Encoding.find("ASCII"), encoding_options)
+            encoded = device_name.encode(::Encoding.find("ASCII"), encoding_options)
             "http://#{encoded}.local:27753/"
           end
         end
@@ -296,14 +363,6 @@ module RunLoop
         response = client.post(request)
         body = response.body
         RunLoop.log_debug("CBX-Runner says, \"#{body}\"")
-        5.times do
-          begin
-            health
-            sleep(1.0)
-          rescue => _
-            break
-          end
-        end
         body
       rescue => e
         RunLoop.log_debug("CBX-Runner shutdown error: #{e}")
@@ -323,65 +382,22 @@ module RunLoop
       body
     end
 
-    # @!visibility private
-    def xcodebuild
-      env = {
-        "COMMAND_LINE_BUILD" => "1"
-      }
-
-      args = [
-        "xcrun",
-        "xcodebuild",
-        "-scheme", "CBXAppStub",
-        "-workspace", workspace,
-        "-config", "Debug",
-        "-destination",
-        "id=#{device.udid}",
-        "clean",
-        "test"
-      ]
-
-      log_file = XCUITest.xcodebuild_log_file
-
-      options = {
-        :out => log_file,
-        :err => log_file
-      }
-
-      command = "#{env.map.each { |k, v| "#{k}=#{v}" }.join(" ")} #{args.join(" ")}"
-      RunLoop.log_unix_cmd("#{command} >& #{log_file}")
-
-      pid = Process.spawn(env, *args, options)
-      Process.detach(pid)
-      pid
-    end
-
     # @!visibility private
     def launch_cbx_runner
-      # Fail fast if CBXWS is not defined.
-      # WIP - we will distribute the workspace somehow.
-      workspace
-
       shutdown
 
-      # Temp measure; we need to manage the xcodebuild pids.
-      system("pkill xcodebuild")
-
-      if device.simulator?
-        # quits the simulator
-        sim = CoreSimulator.new(device, "")
-        sim.launch_simulator
-      else
-        # anything special about physical devices?
-      end
+      options = {:log_cmd => true}
+      exec(["pkill", "xctestctl"], options)
+      exec(["pkill", "testmanagerd"], options)
+      exec(["pkill", "xcodebuild"], options)
 
       start = Time.now
-      pid = xcodebuild
-      RunLoop.log_debug("Waiting for CBX-Runner to build...")
+      RunLoop.log_debug("Waiting for CBX-Runner to launch...")
+      pid = cbx_launcher.launch
       health
+      RunLoop.log_debug("Took #{Time.now - start} launch and respond to /health")
 
-      RunLoop.log_debug("Took #{Time.now - start} seconds to build and launch")
-      pid.to_i
+      pid
     end
 
     # @!visibility private
@@ -423,26 +439,28 @@ Something went wrong.
     # @!visibility private
     def expect_200_response(response)
       body = response_body_to_hash(response)
-      return body if response.status_code < 300
+      if response.status_code < 300 && !body["error"]
+        return body
+      end
 
-      raise RunLoop::XCUITest::HTTPError,
-        %Q[Expected status code < 200, found #{response.status_code}.
+      if response.status_code > 300
+        raise RunLoop::XCUITest::HTTPError,
+          %Q[Expected status code < 300, found #{response.status_code}.
 
 Server replied with:
 
 #{body}
+
 ]
-    end
+      else
+        raise RunLoop::XCUITest::HTTPError,
+						%Q[Expected JSON response with no error, but found
 
-    # @!visibility private
-    def self.dot_dir
-      path = File.join(RunLoop::DotDir.directory, "xcuitest")
+#{body["error"]}
 
-      if !File.exist?(path)
-        FileUtils.mkdir_p(path)
-      end
+]
 
-      path
+      end
     end
 
     # @!visibility private

data/scripts/lib/log.js

@@ -17,7 +17,7 @@ var Log = (function () {
 
     return {
         result: function (status, data) {
-            log_json({"status": status, "value": data, "index":_actualIndex})
+            log_json({"status": status, "value": data, "index":_actualIndex});
         },
         output: function (msg) {
             log_json({"output": msg,"last_index":_actualIndex});

data/scripts/lib/on_alert.js

@@ -5,9 +5,9 @@ function findAlertTitle(alert) {
     var title = alert.name();
     var staticTexts;
 
-    if (title == null) {
+    if (title === null) {
         staticTexts = alert.staticTexts();
-        if (staticTexts != null && staticTexts.length > 0) {
+        if (staticTexts !== null && staticTexts.length > 0) {
 
             title = staticText[0].name();
         }
@@ -49,31 +49,85 @@ function englishLocalizations() {
 
 function danishLocalizations() {
   return [
-    // Location
     ["Tillad", /bruge din lokalitet, når du bruger appen/],
     ["Tillad", /også når du ikke bruger appen/],
-    ["OK", /vil bruge din aktuelle placering/]
+    ["OK", /vil bruge din aktuelle placering/],
+    ["OK", /vil bruge dine kontakter/],
+    ["OK", /vil bruge mikrofonen/],
+    ["OK", /vil bruge din kalender/],
+    ["OK", /vil bruge dine påmindelser/],
+    ["OK", /vil bruge dine fotos/],
+    ["OK", /ønsker adgang til Twitter-konti/],
+    ["OK", /vil bruge din fysiske aktivitet og din træningsaktivitet/],
+    ["OK", /vil bruge kameraet/],
+    ["OK", /vil gerne sende dig meddelelser/]
   ];
 }
 
-function spanishLocalizations() {
+function euSpanishLocalizations() {
+  return [
+    ["Permitir", /acceder a tu ubicación mientras utilizas la aplicación/],
+    ["Permitir", /acceder a tu ubicación aunque no estés utilizando la aplicación/],
+    ["OK", /quiere acceder a tus contactos/],
+    ["OK", /quiere acceder a tu calendario/],
+    ["OK", /quiere acceder a tus recordatorios/],
+    ["OK", /quiere acceder a tus fotos/],
+    ["OK", /quiere obtener acceso a cuentas Twitter/],
+    ["OK", /quiere acceder al micrófono/],
+    ["OK", /desea acceder a tu actividad física y deportiva/],
+    ["OK", /quiere acceder a la cámara/],
+    ["OK", /quiere enviarte notificaciones/]
+  ];
+}
+
+function es419SpanishLocalizations() {
   return [
-    // APNS
-    ["OK", /enviarle notificaiones/]
+    ["Permitir", /acceda a tu ubicación mientras la app está en uso/],
+    ["Permitir", /acceda a tu ubicación incluso cuando la app no está en uso/],
+    ["OK", /quiere acceder a tu condición y actividad física/]
   ];
 }
 
+function spanishLocalizations() {
+  return [].concat(
+    euSpanishLocalizations(),
+    es419SpanishLocalizations()
+  );
+}
+
 function germanLocalizations() {
   return [
-    // Location
-    ["Ja", /Darf (?:.)+ Ihren aktuellen Ort verwenden/]
+    ["Ja", /Darf (?:.)+ Ihren aktuellen Ort verwenden/],
+    ["Erlauben", /auf Ihren Standort zugreifen, wenn Sie die App benutzen/],
+    ["Erlauben", /auch auf Ihren Standort zugreifen, wenn Sie die App nicht benutzen/],
+    ["Erlauben", /auf Ihren Standort zugreifen, selbst wenn Sie die App nicht benutzen/],
+    ["Ja", /auf Ihre Kontakte zugreifen/],
+    ["Ja", /auf Ihren Kalender zugreifen/],
+    ["Ja", /auf Ihre Erinnerungen zugreifen/],
+    ["Ja", /auf Ihre Fotos zugreifen/],
+    ["Erlauben", /möchte auf Twitter-Accounts zugreifen/],
+    ["Ja", /auf das Mikrofon zugreifen/],
+    ["Ja", /möchte auf Ihre Bewegungs- und Fitnessdaten zugreifen/],
+    ["Ja", /auf Ihre Kamera zugreifen/],
+    ["OK", /Ihnen Mitteilungen senden/]
   ];
 }
 
 function dutchLocalizations() {
   return [
-    // APNS
-    ["OK", /wil u berichten stuern/]
+    ["Sta toe", /tot uw locatie toestaan terwijl u de app gebruikt/],
+    ["Sta toe", /toegang tot uw locatie toestaan terwijl u de app gebruikt/],
+    ["Sta toe", /ook toegang tot uw locatie toestaan, zelfs als u de app niet gebruikt/],
+    ["Sta toe", /toegang tot uw locatie toestaan, zelfs als u de app niet gebruikt/],
+    ["OK", /wil toegang tot uw contacten/],
+    ["OK", /wil toegang tot uw agenda/],
+    ["OK", /wil toegang tot uw herinneringen/],
+    ["OK", /wil toegang tot uw foto's/],
+    ["OK", /wil toegang tot Twitter-accounts/],
+    ["OK", /wil toegang tot de microfoon/],
+    ["OK", /wil toegang tot uw bewegings- en fitnessactiviteit/],
+    ["OK", /wil toegang tot de camera/],
+    ["OK", /wil u berichten sturen/]
   ];
 }
 
@@ -89,13 +143,15 @@ function frenchLocalizations() {
     ["OK", /vous envoyer des notifications/],
     ["Autoriser", /à accéder à vos données de localisation lorsque vous utilisez l’app/],
     ["Autoriser", /à accéder à vos données de localisation même lorsque vous n’utilisez pas l’app/],
+    ["Autoriser", /à accéder aussi à vos données de localisation lorsque vous n’utilisez pas l’app/],
     ["OK", /souhaite accéder à vos contacts/],
     ["OK", /souhaite accéder à votre calendrier/],
     ["OK", /souhaite accéder à vos rappels/],
     ["OK", /souhaite accéder à vos mouvements et vos activités physiques/],
     ["OK", /souhaite accéder à vos photos/],
     ["OK", /souhaite accéder à l’appareil photo/],
-    ["OK", /souhaite accéder aux comptes Twitter/]
+    ["OK", /souhaite accéder aux comptes Twitter/],
+    ["OK", /souhaite accéder au micro/]
   ];
 }
 
@@ -117,13 +173,42 @@ function isPrivacyAlert(alert) {
 
   var title = findAlertTitle(alert);
 
-  // Comment this out if you are capturing regexes.  See comment below.
-  Log.output({"output":"alert: " + title}, true);
+  // Comment this out when capturing new regexes. See the comment below.
+  Log.output({"alert":title});
 
   // When debugging or trying to capture the regexes for a new
-  // localization, uncomment these lines and comment out the line above.
-  // var buttonNames = findAlertButtonNames(alert);
-  // Log.output({"output":"alert: " + title + "," + buttonNames}, true);
+  // localization, uncomment the logging below.
+  //
+  // Notes:
+  // * Microphone alerts only appear on physical devices.
+  // * You have to click through the Health alert; it is completely blocking -
+  //   tests will not proceed.
+  // * Generating bluetooth alerts is NYI.
+  // * In general, there will be a different alert on device for using location
+  //   in background mode.
+  // * Alerts vary by iOS.
+  // * To reset notifications on devices:
+  //   General > Settings > Reset > Reset Location + Privacy
+  //   - These are the last table rows
+  //   - APNS permissions are reset once a day.
+  // * On devices, set the device language in Settings.
+  //
+  // Use the Permission.app.
+  //
+  // * Alert text is printed at the end of every test.
+  // * Alert text is written to a file in Permissions/tmp.
+  //
+  // Examples:
+  //
+  // # Simulator running Mexican Spanish
+  // $ APP_LANG="es-MX" APP_LOCALE="es_MX" be cucumber -t @supported
+  //
+  // # Device running Dutch
+  // $ APP_LANG="nl" APP_LOCALE="nl" be cucumber -t @supported -p macmini
+
+  // This is very slow, so only do this if you are trying to capture regexes.
+  //var buttonNames = findAlertButtonNames(alert);
+  //Log.output({"alert":{"title":title, "buttons":buttonNames, "capture":"YES"}});
 
   var answer;
   var expression;