calabash-cucumber 0.9.163.pre6 → 0.9.163.pre7

data/lib/calabash-cucumber/failure_helpers.rb

@@ -0,0 +1,44 @@
+module Calabash
+  module Cucumber
+    module FailureHelpers
+
+      def screenshot(options={:prefix => nil, :name => nil})
+        prefix = options[:prefix]
+        name = options[:name]
+
+        @@screenshot_count ||= 0
+        res = http({:method => :get, :path => 'screenshot'})
+        prefix = prefix || ENV['SCREENSHOT_PATH'] || ""
+        if name.nil?
+          name = "screenshot"
+        else
+          if File.extname(name).downcase == ".png"
+            name = name.split(".png")[0]
+          end
+        end
+
+        path = "#{prefix}#{name}_#{@@screenshot_count}.png"
+        File.open(path, 'wb') do |f|
+          f.write res
+        end
+        @@screenshot_count += 1
+        path
+      end
+
+      def screenshot_embed(options={:prefix => nil, :name => nil, :label => nil})
+        path = screenshot(options)
+        embed(path, "image/png", options[:label] || File.basename(path))
+      end
+
+      def screenshot_and_raise(msg, options={:prefix => nil, :name => nil, :label => nil})
+        screenshot_embed(options)
+        raise(msg)
+      end
+
+      def fail(msg="Error. Check log for details.", options={:prefix => nil, :name => nil, :label => nil})
+        screenshot_and_raise(msg, options)
+      end
+
+    end
+  end
+end

data/lib/calabash-cucumber/http_helpers.rb

@@ -0,0 +1,102 @@
+require 'httpclient'
+
+module Calabash
+  module Cucumber
+    module HTTPHelpers
+
+      CAL_HTTP_RETRY_COUNT=3
+      RETRYABLE_ERRORS = [HTTPClient::TimeoutError,
+                          HTTPClient::KeepAliveDisconnected,
+                          Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ECONNABORTED,
+                          Errno::ETIMEDOUT]
+
+
+      def http(options, data=nil)
+        options[:uri] = url_for(options[:path])
+        options[:method] = options[:method] || :get
+        if data
+          if options[:raw]
+            options[:body] = data
+          else
+            options[:body] = data.to_json
+          end
+        end
+        res = make_http_request(options)
+        res.force_encoding("UTF-8") if res.respond_to?(:force_encoding)
+        res
+      end
+
+
+      def url_for(verb)
+        url = URI.parse(ENV['DEVICE_ENDPOINT']|| "http://localhost:37265")
+        path = url.path
+        if path.end_with? "/"
+          path = "#{path}#{verb}"
+        else
+          path = "#{path}/#{verb}"
+        end
+        url.path = path
+        url
+      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
+          begin
+            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
+            else
+              body = @http.get(options[:uri], options[:body]).body
+            end
+            if options[:debug] || (ENV['DEBUG_HTTP'] == '1' && options[:debug] != false)
+              @http.debug_dev = previous_debug_dev
+            end
+            break
+          rescue Exception => e
+
+            if retryable_errors.include?(e) || retryable_errors.any? { |c| e.is_a?(c) }
+
+              if count < CAL_HTTP_RETRY_COUNT-1
+                if e.is_a?(HTTPClient::TimeoutError)
+                  sleep(3)
+                else
+                  sleep(0.5)
+                end
+                @http.reset_all
+                @http=nil
+                STDOUT.write "Retrying.. #{e.class}: (#{e})\n"
+                STDOUT.flush
+              else
+                puts "Failing... #{e.class}"
+                raise e
+              end
+            else
+              raise e
+            end
+          end
+        end
+
+        body
+      end
+
+      def init_request(url=nil)
+        http = HTTPClient.new
+        http.connect_timeout = 30
+        http.send_timeout = 30
+        http.receive_timeout = 30
+        http
+      end
+
+    end
+  end
+end

data/lib/calabash-cucumber/ios7_operations.rb

@@ -1,6 +1,7 @@
 require 'calabash-cucumber/launcher'
 require 'calabash-cucumber/uia'
-
+require 'calabash-cucumber/actions/instruments_actions'
+require 'calabash-cucumber/actions/playback_actions'
 
 module Calabash
   module Cucumber
@@ -60,42 +61,56 @@ module Calabash
         [to_result]
       end
 
-      private
-      def find_and_normalize_or_raise(ui_query)
-        res = find_or_raise(ui_query)
-        normalize_rect_for_orientation!(res['rect']) if res['rect']
-        res
+      def double_tap_ios7(options)
+        ui_query = options[:query]
+        offset =  options[:offset]
+        if ui_query.nil?
+          uia_double_tap_offset(offset)
+        else
+          el_to_swipe = find_and_normalize_or_raise(ui_query)
+          offset = point_from(el_to_swipe, options)
+          uia_double_tap_offset(offset)
+          [el_to_swipe]
+        end
+      end
+
+      def two_finger_tap_ios7(options)
+        ui_query = options[:query]
+        offset =  options[:offset]
+        if ui_query.nil?
+          uia_two_finger_tap_offset(offset)
+        else
+          el_to_swipe = find_and_normalize_or_raise(ui_query)
+          offset = point_from(el_to_swipe, options)
+          uia_two_finger_tap_offset(offset)
+          [el_to_swipe]
+        end
       end
 
-      def find_or_raise(ui_query)
-        results = query(ui_query)
-        if results.empty?
-          screenshot_and_raise "Unable to find element matching query #{ui_query}"
+      def flick_ios7(options, delta)
+        ui_query = options[:query]
+        offset =  options[:offset]
+        if ui_query.nil?
+          uia_flick_offset(offset, add_offset(offset, delta))
         else
-          results.first
+          el_to_swipe = find_and_normalize_or_raise(ui_query)
+          offset = point_from(el_to_swipe, options)
+          uia_flick_offset(offset, add_offset(offset, delta))
+          [el_to_swipe]
         end
       end
 
-      def normalize_rect_for_orientation!(rect)
-        orientation = status_bar_orientation().to_sym
-        launcher = Calabash::Cucumber::Launcher.launcher
-        screen_size = launcher.device.screen_size
-        case orientation
-          when :right
-            cx = rect['center_x']
-            rect['center_x'] = rect['center_y']
-            rect['center_y'] = screen_size[:width] - cx
-          when :left
-            cx = rect['center_x']
-            rect['center_x'] = screen_size[:height] - rect['center_y']
-            rect['center_y'] = cx
-          when :up
-            cy = rect['center_y']
-            cx = rect['center_x']
-            rect['center_y'] = screen_size[:height] - cy
-            rect['center_x'] = screen_size[:width]  - cx
-          else
-            # no-op by design.
+      def touch_hold_ios7(options)
+        ui_query = options[:query]
+        offset =  options[:offset]
+        duration = options[:duration] || 4
+        if ui_query.nil?
+          uia_touch_hold_offset(duration, offset)
+        else
+          el_to_swipe = find_and_normalize_or_raise(ui_query)
+          offset = point_from(el_to_swipe, options)
+          uia_touch_hold_offset(duration, offset)
+          [el_to_swipe]
         end
       end
 

data/lib/calabash-cucumber/keyboard_helpers.rb

@@ -1,21 +1,23 @@
+require 'calabash-cucumber/core'
 require 'calabash-cucumber/tests_helpers'
+require 'calabash-cucumber/playback_helpers'
 
 module Calabash
   module Cucumber
     module KeyboardHelpers
-      include Calabash::Cucumber::Core
       include Calabash::Cucumber::TestsHelpers
+      include Calabash::Cucumber::PlaybackHelpers
 
       KEYPLANE_NAMES = {
-          :small_letters => "small-letters",
-          :capital_letters => "capital-letters",
-          :numbers_and_punctuation => "numbers-and-punctuation",
-          :first_alternate => "first-alternate",
-          :numbers_and_punctuation_alternate => "numbers-and-punctuation-alternate"
+          :small_letters => 'small-letters',
+          :capital_letters => 'capital-letters',
+          :numbers_and_punctuation => 'numbers-and-punctuation',
+          :first_alternate => 'first-alternate',
+          :numbers_and_punctuation_alternate => 'numbers-and-punctuation-alternate'
       }
 
 
-      IOS7_SUPPORTED_CHARS = {
+      UIA_SUPPORTED_CHARS = {
           'Dictation' => nil,
           'Shift' => nil,
           'Delete' => '\b',
@@ -32,11 +34,11 @@ module Calabash
       # 'Return'
       def keyboard_enter_char(chr, should_screenshot=true)
         #map(nil, :keyboard, load_playback_data("touch_done"), chr)
-        if ios7?
+        if uia?
           if chr.length == 1
             uia_type_string chr
           else
-            code = IOS7_SUPPORTED_CHARS[chr]
+            code = UIA_SUPPORTED_CHARS[chr]
             if code
               uia_type_string code
             else
@@ -46,7 +48,7 @@ module Calabash
           res = {'results' => []}
         else
           res = http({:method => :post, :path => 'keyboard'},
-                     {:key => chr, :events => load_playback_data("touch_done")})
+                     {:key => chr, :events => load_playback_data('touch_done')})
           res = JSON.parse(res)
           if res['outcome'] != 'SUCCESS'
             msg = "Keyboard enter failed failed because: #{res['reason']}\n#{res['details']}"
@@ -68,10 +70,10 @@ module Calabash
       end
 
       def done
-        if ios7?
+        if uia?
           uia_type_string '\n'
         else
-          keyboard_enter_char "Return"
+          keyboard_enter_char 'Return'
         end
 
       end
@@ -122,13 +124,21 @@ module Calabash
       end
 
       def await_keyboard
-        wait_for_elements_exist(["view:'UIKBKeyplaneView'"])
-        sleep(0.3)
+        #deprecated inconsistent wait naming
+        # use wait_for_keyboard
+        wait_for_keyboard
+      end
+
+      #noinspection RubyLiteralArrayInspection
+      def wait_for_keyboard
+        wait_for_elements_exist(["view:'UIKBKeyplaneView'"], :timeout_message => 'No visible keyboard')
+        sleep(0.5)
       end
 
       def keyboard_enter_text(text)
-        fail("No visible keyboard") if element_does_not_exist("view:'UIKBKeyplaneView'")
-        if ios7?
+        wait_for_keyboard if element_does_not_exist("view:'UIKBKeyplaneView'")
+
+        if uia?
           uia_type_string(text)
         else
           text.each_char do |ch|

data/lib/calabash-cucumber/launcher.rb

@@ -1,6 +1,8 @@
 require 'calabash-cucumber/launch/simulator_helper'
 require 'sim_launcher'
 require 'calabash-cucumber/device'
+require 'calabash-cucumber/actions/instruments_actions'
+require 'calabash-cucumber/actions/playback_actions'
 require 'run_loop'
 require 'cfpropertylist'
 
@@ -10,6 +12,7 @@ class Calabash::Cucumber::Launcher
 
   attr_accessor :run_loop
   attr_accessor :device
+  attr_accessor :actions
   attr_accessor :launch_args
 
   @@launcher = nil
@@ -29,6 +32,12 @@ class Calabash::Cucumber::Launcher
   class CalabashLauncherTimeoutErr < Timeout::Error
   end
 
+
+  def actions
+    attach if @actions.nil?
+    @actions
+  end
+
   def self.attach
     l = launcher
     return l if l && l.active?
@@ -36,15 +45,32 @@ class Calabash::Cucumber::Launcher
 
   end
 
-  def attach
+  def attach(max_retry=1, timeout=10)
     pids_str = `ps x -o pid,command | grep -v grep | grep "instruments" | awk '{printf "%s,", $1}'`
     pids = pids_str.split(',').map { |pid| pid.to_i }
     pid = pids.first
     rl = {}
-    rl[:pid] = pid if pid
+    if pid
+      rl[:pid] = pid
+      self.actions= Calabash::Cucumber::InstrumentsActions.new
+    else
+      self.actions= Calabash::Cucumber::PlaybackActions.new
+    end
 
     self.run_loop= rl
-    ensure_connectivity
+
+    ensure_connectivity(max_retry, timeout)
+
+    major = self.device.ios_major_version
+    if major.to_i >= 7 && self.actions.is_a?(Calabash::Cucumber::PlaybackActions)
+      puts "\n\n WARNING \n\n"
+      puts 'Warning Trying to connect to simulator that was not launched by Calabash/instruments.'
+      puts 'To fix this you must let Calabash or instruments launch the app'
+      puts 'Continuing... query et al will work.'
+      puts "\n\n WARNING \n\n"
+      puts "Please read: https://github.com/calabash/calabash-ios/wiki/A0-UIAutomation---instruments-problems"
+    end
+
 
     self
   end
@@ -52,7 +78,7 @@ class Calabash::Cucumber::Launcher
   def self.instruments?
     l = launcher_if_used
     return false unless l
-    l.active?
+    l.instruments?
   end
 
   def self.launcher
@@ -67,6 +93,8 @@ class Calabash::Cucumber::Launcher
     @@launcher = self
   end
 
+
+
   def ios_major_version
     return nil if device.nil? or device.ios_version.nil?
     device.ios_major_version
@@ -280,10 +308,12 @@ class Calabash::Cucumber::Launcher
 
     if run_with_instruments?(args)
       self.run_loop = new_run_loop(args)
+      self.actions= Calabash::Cucumber::InstrumentsActions.new
     else
       # run with sim launcher
       sdk = sdk_version || SimLauncher::SdkDetector.new().available_sdk_versions.reverse.find { |x| !x.start_with?('7') }
       path = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path)
+      self.actions= Calabash::Cucumber::PlaybackActions.new
       Calabash::Cucumber::SimulatorHelper.relaunch(path, sdk, args[:device].to_s, args)
     end
     self.launch_args = args
@@ -353,10 +383,10 @@ class Calabash::Cucumber::Launcher
     raise StartError.new(last_err)
   end
 
-  def ensure_connectivity
+  def ensure_connectivity(max_retry=10, timeout=30)
     begin
-      max_retry_count = (ENV['MAX_CONNECT_RETRY'] || 10).to_i
-      timeout = (ENV['CONNECT_TIMEOUT'] || 30).to_i
+      max_retry_count = (ENV['MAX_CONNECT_RETRY'] || max_retry).to_i
+      timeout = (ENV['CONNECT_TIMEOUT'] || timeout).to_i
       retry_count = 0
       connected = false
       if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
@@ -414,7 +444,7 @@ class Calabash::Cucumber::Launcher
   end
 
   def stop
-    RunLoop.stop(run_loop)
+    RunLoop.stop(run_loop) if run_loop && run_loop[:pid]
   end
 
   def calabash_notify(world)
@@ -486,6 +516,10 @@ class Calabash::Cucumber::Launcher
     not run_loop.nil?
   end
 
+  def instruments?
+    !!(active? && run_loop[:pid])
+  end
+
   def inspect
     msg = ["#{self.class}: Launch Method #{launch_args && launch_args[:launch_method]}"]
     if run_with_instruments?(self.launch_args) && self.run_loop