testautoi 0.9.143 → 0.9.144

data/bin/testautoi

@@ -120,11 +120,24 @@ def run(option)
         #calabash_sim_location(['on', app_bundle_id])
         if option == 'console'
             Calabash::Cucumber::SimulatorHelper.relaunch(env["APP_BUNDLE_PATH"], @settings["sim_version"], @settings["sim_device"])
-        else
-            ENV["SDK_VERSION"] = @settings["sim_version"]
-            ENV["DEVICE"] = @settings["sim_device"]
         end
+        # For Calabash
+        env["DEVICE"] = @settings["sim_device"]
+        env["SDK_VERSION"] = @settings["sim_version"]
+        # For Test Automation
+        env["DEVICE_ID"] = ""
+        env["DEVICE_CLASS"] = @settings["sim_device"]                
+        env["DEVICE_VERSION"] = ENV["SDK_VERSION"]
+        env["DEVICE_TYPE"] = @settings["sim_device"]
+        env["DEVICE_SN"] = ""
     else
+        # Use a device
+        dev = Device.new(device_udid)
+        env["DEVICE_ID"] = device_udid
+        env["DEVICE_CLASS"] = dev.device_class
+        env["DEVICE_VERSION"] = dev.product_version
+        env["DEVICE_TYPE"] = dev.product_type
+        env["DEVICE_SN"] = dev.serial_number
         env["NO_LAUNCH"] = "1"
         get_device_ip
         if ENV["CLEAN_INSTALL"] == "1"
@@ -289,11 +302,11 @@ def get_build(version, sim)
     mount_node = smb_connect(@settings["build_drop_location"], 
                              @settings["build_drop_username"], 
                              @settings["build_drop_password"])
-    if ARGV.first == 'list'
+    if version == 'list'
         # list build versions
         branch_path = File.join(mount_node, @settings["build_drop_branch_dir"])
         Dir.entries(branch_path).sort_by{|c| File.stat(File.join(branch_path,c)).ctime}.each do |d|
-            m = d.match(/^iPhone(\S+)$/)
+            m = d.match(/^(?:iPhone|iOSCorp)(\S+)$/)
             if m != nil
                 puts m[1]
             end
@@ -307,6 +320,9 @@ def get_build(version, sim)
         else
             # copy the version build
             release_path = File.join(mount_node, @settings["build_drop_branch_dir"], "iPhone#{version}", "Instrumented", "ConcurMobile-cal", sim)
+            if not File.directory?(release_path)
+                release_path = File.join(mount_node, @settings["build_drop_branch_dir"], "iOSCorp#{version}", "Instrumented", "ConcurMobile-cal", sim)
+            end
         end
         raise "No builds found in #{release_path}" unless File.directory?(release_path)
         build_dir = Dir.entries(release_path).reject{|d|d.start_with?('.')}.sort_by{|c| File.stat(File.join(release_path,c)).ctime}.last 
@@ -691,6 +707,15 @@ elsif cmd == 'devices'
     list_devices
     exit 0
 
+elsif cmd == 'device'
+    read_settings
+    option = ARGV.shift
+    if option == 'info'
+        udid = @settings["device_udid"].to_s
+        device_info(udid) if udid != ''
+    end
+    exit 0
+
 elsif cmd == 'sim'
     option = ARGV.shift
     read_settings

data/calabash-cucumber.gemspec

@@ -16,15 +16,16 @@ Gem::Specification.new do |s|
   s.executables   = ["calabash-ios", "testautoi"]
   s.require_paths = ["lib"]
 
-  s.add_dependency( "cucumber" )
+  s.add_dependency( "cucumber", "~> 1.3.0" )
+  s.add_dependency( "calabash-common", "~> 0.0.1" )
   s.add_dependency( "json" )
   s.add_dependency( "CFPropertyList" )
   s.add_dependency( "sim_launcher", "0.4.6")
   s.add_dependency( "slowhandcuke" )
-  s.add_dependency( "location-one", "~>0.0.9")
-  s.add_dependency( "httpclient","2.3.2")
+  s.add_dependency( "location-one", "~>0.0.10")
+  s.add_dependency( "httpclient","~> 2.3.3")
   s.add_dependency( "bundler", "~> 1.1")
-  s.add_dependency( "run_loop", "0.0.9" )
+  s.add_dependency( "run_loop", "~> 0.0.11" )
   s.add_dependency( "awesome_print")
 
 end

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

@@ -42,5 +42,7 @@ end
 
 at_exit do
   launcher = Calabash::Cucumber::Launcher.new
-  Calabash::Cucumber::SimulatorHelper.stop unless launcher.calabash_no_stop?
+  if launcher.simulator_target?
+    Calabash::Cucumber::SimulatorHelper.stop unless launcher.calabash_no_stop?
+  end
 end

data/lib/calabash-cucumber/core.rb

@@ -7,7 +7,10 @@ module Calabash
 
       DATA_PATH = File.expand_path(File.dirname(__FILE__))
       CAL_HTTP_RETRY_COUNT=3
-      RETRYABLE_ERRORS = [Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ECONNABORTED, Errno::ETIMEDOUT]
+      RETRYABLE_ERRORS = [HTTPClient::TimeoutError,
+                          HTTPClient::KeepAliveDisconnected,
+                          Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ECONNABORTED,
+                          Errno::ETIMEDOUT]
 
       def macro(txt)
         if self.respond_to? :step
@@ -187,6 +190,31 @@ module Calabash
         views_touched
       end
 
+
+      def scroll_to_row_with_mark(row_id, options={:query => 'tableView',
+                                                   :scroll_position => :middle,
+                                                   :animate => true})
+        uiquery = options[:query] || 'tableView'
+
+        args = []
+        if options.has_key?(:scroll_position)
+          args << options[:scroll_position]
+        else
+          args << 'middle'
+        end
+        if options.has_key?(:animate)
+          args << options[:animate]
+        end
+
+        views_touched=map(uiquery, :scrollToRowWithMark, row_id, *args)
+
+        if views_touched.empty? or views_touched.member? '<VOID>'
+          msg = options[:failed_message] || "Unable to scroll: '#{uiquery}' to: #{options}"
+          screenshot_and_raise msg
+        end
+        views_touched
+      end
+
       def pinch(in_out, options={})
         file = "pinch_in"
         if in_out.to_sym==:out
@@ -466,10 +494,11 @@ EOF
 
       def calabash_exit
         # Exiting the app shuts down the HTTP connection and generates ECONNREFUSED,
+        # or HTTPClient::KeepAliveDisconnected
         # which needs to be suppressed.
         begin
-          http({:method =>:post, :path => 'exit', :retryable_errors => RETRYABLE_ERRORS - [Errno::ECONNREFUSED]})
-        rescue Errno::ECONNREFUSED
+          http({:method =>:post, :path => 'exit', :retryable_errors => RETRYABLE_ERRORS - [Errno::ECONNREFUSED,HTTPClient::KeepAliveDisconnected]})
+        rescue Errno::ECONNREFUSED, HTTPClient::KeepAliveDisconnected
           []
         end
       end
@@ -548,6 +577,7 @@ EOF
       end
 
       def make_http_request(options)
+
         body = nil
         retryable_errors = options[:retryable_errors] || RETRYABLE_ERRORS
         CAL_HTTP_RETRY_COUNT.times do |count|
@@ -561,29 +591,20 @@ EOF
               body = @http.get(options[:uri], options[:body]).body
             end
             break
-          rescue HTTPClient::TimeoutError, HTTPClient::KeepAliveDisconnected => e
-            if count < CAL_HTTP_RETRY_COUNT-1
-              @http.reset_all
-              @http=nil
-              STDOUT.write "Waiting 5 secs before retry...\n"
-              sleep(5)
-              STDOUT.write "Retrying.. #{e.class}: (#{e})\n"
-              STDOUT.flush
+          rescue Exception => e
 
-            else
-              puts "Failing... #{e.class}"
-              raise e
-            end
+            if retryable_errors.include?(e) || retryable_errors.any?{|c| e.is_a?(c)}
 
-          rescue Exception => e
-            if retryable_errors.include?(e)
               if count < CAL_HTTP_RETRY_COUNT-1
-                sleep(0.5)
+                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

data/lib/calabash-cucumber/launch/simulator_helper.rb

@@ -226,10 +226,10 @@ module Calabash
                 end
               end
             rescue TimeoutErr => e
-              puts "Timed out..."
+              puts 'Timed out...'
             end
           end
-        rescue e
+        rescue RuntimeError => e
           p e
           msg = "Unable to make connection to Calabash Server at #{ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/"}\n"
           msg << "Make sure you've' linked correctly with calabash.framework and set Other Linker Flags.\n"

data/lib/calabash-cucumber/launcher.rb

@@ -25,7 +25,7 @@ class Calabash::Cucumber::Launcher
   end
 
   def device_target?
-    ENV['DEVICE_TARGET'] == 'device'
+    (ENV['DEVICE_TARGET'] != nil) && (not simulator_target?)
   end
 
   def simulator_target?
@@ -68,6 +68,10 @@ class Calabash::Cucumber::Launcher
 
     if device_target?
       default_args = {:app => ENV['BUNDLE_ID']}
+      target = ENV['DEVICE_TARGET']
+      if target != 'DEVICE'
+        default_args[:udid] = target
+      end
       self.run_loop = RunLoop.run(default_args.merge(args))
     else
 
@@ -119,7 +123,7 @@ class Calabash::Cucumber::Launcher
           puts "Timed out...Retry.."
         end
       end
-    rescue e
+    rescue RuntimeError => e
       p e
       msg = "Unable to make connection to Calabash Server at #{ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/"}\n"
       msg << "Make sure you don't have a firewall blocking traffic to #{ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/"}.\n"
@@ -132,7 +136,7 @@ class Calabash::Cucumber::Launcher
 
     http = Net::HTTP.new(url.host, url.port)
     res = http.start do |sess|
-      sess.request Net::HTTP::Get.new "version"
+      sess.request Net::HTTP::Get.new(ENV['CALABASH_VERSION_PATH'] || "version")
     end
     status = res.code
     begin

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.143'
-    FRAMEWORK_VERSION = '0.9.143'
+    VERSION = '0.9.144'
+    FRAMEWORK_VERSION = '0.9.144'
   end
 end

data/scripts/launch.rb

@@ -22,6 +22,7 @@ require 'calabash-cucumber/launcher'
 # However the recommended approach is to let Calabash find the app itself
 # or set the environment variable APP_BUNDLE_PATH
 
+
 Before do |scenario|
   @calabash_launcher = Calabash::Cucumber::Launcher.new
   unless @calabash_launcher.calabash_no_launch?
@@ -37,4 +38,11 @@ After do |scenario|
       @calabash_launcher.stop
     end
   end
-end
+end
+
+at_exit do
+  launcher = Calabash::Cucumber::Launcher.new
+  if launcher.simulator_target?
+    Calabash::Cucumber::SimulatorHelper.stop unless launcher.calabash_no_stop?
+  end
+end

data/testautoi.gemspecx

@@ -0,0 +1,31 @@
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "calabash-cucumber/version"
+
+Gem::Specification.new do |s|
+  s.name        = "testautoi"
+  s.version     = Calabash::Cucumber::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["jimtsay"]
+  s.summary     = %q{Summary}
+  s.description = %q{Description}
+  s.files         = `git ls-files`.split("\n").concat(["staticlib/calabash.framework.zip"])
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = ["calabash-ios", "testautoi"]
+  s.require_paths = ["lib"]
+
+  s.add_dependency( "cucumber", "~> 1.3.0" )
+  s.add_dependency( "calabash-common", "~> 0.0.1" )
+  s.add_dependency( "json" )
+  s.add_dependency( "CFPropertyList" )
+  s.add_dependency( "sim_launcher", "0.4.6")
+  s.add_dependency( "slowhandcuke" )
+  s.add_dependency( "location-one", "~>0.0.10")
+  s.add_dependency( "httpclient","~> 2.3.3")
+  s.add_dependency( "bundler", "~> 1.1")
+  s.add_dependency( "run_loop", "~> 0.0.11" )
+  s.add_dependency( "awesome_print")
+  s.add_dependency( "rest-client" )
+  s.add_dependency( "nokogiri" )
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testautoi
 version: !ruby/object:Gem::Version
-  version: 0.9.143
+  version: 0.9.144
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,40 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: calabash-common
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,23 +122,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.10
 - !ruby/object:Gem::Dependency
   name: httpclient
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 2.3.2
+        version: 2.3.3
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -144,17 +160,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.11
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.9
+        version: 0.0.11
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -187,6 +203,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Description
 email: 
 executables:
@@ -322,6 +354,7 @@ files:
 - scripts/data/com.apple.Accessibility.plist
 - scripts/launch.rb
 - scripts/reset_simulator.scpt
+- testautoi.gemspecx
 - staticlib/calabash.framework.zip
 homepage: 
 licenses: []