testautoi 0.9.127 → 0.9.133

data/calabash-cucumber.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |s|
   s.description = %q{calabash-cucumber drives tests for native iOS apps. You must link your app with calabash-ios-server framework to execute tests.}
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = "calabash-ios"
+  s.executables   = ["calabash-ios", "testautoi"]
   s.require_paths = ["lib"]
 
   s.add_dependency( "cucumber" )
@@ -21,9 +21,10 @@ Gem::Specification.new do |s|
   s.add_dependency( "CFPropertyList" )
   s.add_dependency( "sim_launcher", "0.4.6")
   s.add_dependency( "slowhandcuke" )
-  s.add_dependency( "location-one", "~>0.0.8")
-  s.add_dependency( "httpclient","2.2.7")
+  s.add_dependency( "location-one", "~>0.0.9")
+  s.add_dependency( "httpclient","2.3.2")
   s.add_dependency( "bundler", "~> 1.1")
-  s.add_dependency( "run_loop", "~>0.0.3" )
+  s.add_dependency( "run_loop", "0.0.5" )
+  s.add_dependency( "awesome_print")
 
 end

data/features/step_definitions/calabash_steps.rb

@@ -51,6 +51,13 @@ Then /^I (?:press|touch) the "([^\"]*)" button$/ do |name|
   sleep(STEP_PAUSE)
 end
 
+Then /^I (?:press|touch) (?:input|text) field number (\d+)$/ do |index|
+  index = index.to_i
+  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
+  touch("textField index:#{index-1}")
+  sleep(STEP_PAUSE)  
+end
+
 Then /^I (?:press|touch) the "([^\"]*)" (?:input|text) field$/ do |name|
   touch("textField placeholder:'#{name}'")
   sleep(STEP_PAUSE)
@@ -124,7 +131,10 @@ Then /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |text_field, text_to_type|
 end
 
 Then /^I use the native keyboard to enter "([^\"]*)" into the "([^\"]*)" (?:text|input) field$/ do |text_to_type, field_name|
-  raise "Native keyboard entering is not yet implemented on iOS"
+  macro %Q|I touch the "#{field_name}" text field|
+  await_keyboard()
+  keyboard_enter_text(text_to_type)
+  sleep(STEP_PAUSE)
 end
 
 Then /^I fill in text fields as follows:$/ do |table|
@@ -145,11 +155,13 @@ Then /^I enter "([^\"]*)" into text view number (\d+)$/ do |text, index|
   set_text("textView index:#{index-1}",text)
 end
     
-Then /^I use the native keyboard to enter "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text, index|
-  raise "Native keyboard entering is not yet implemented on iOS"
+Then /^I use the native keyboard to enter "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text_to_type, index|
+  macro %Q|I touch text field number #{index}|
+  await_keyboard()
+  keyboard_enter_text(text_to_type)
+  sleep(STEP_PAUSE)
 end
 
-
 When /^I clear "([^\"]*)"$/ do |name|
   macro %Q|I enter "" into the "#{name}" text field|
 end

data/lib/calabash-cucumber/core.rb

@@ -45,14 +45,42 @@ module Calabash
             args = args[0]
           end
         end
-        map(q, :query_all, *args)
+        map(q, :query, *args)
       end
 
       def query_all(uiquery, *args)
-        map(uiquery, :query_all, *args)
+        puts "query_all is deprecated. Use the new all/visible feature."
+        puts "see: https://github.com/calabash/calabash-ios/wiki/05-Query-syntax"
+        map("all #{uiquery}", :query, *args)
       end
 
       def touch(uiquery, options={})
+        if (uiquery.is_a?(Array))
+          raise "No elements to touch in array" if uiquery.empty?
+          uiquery = uiquery.first
+        end
+        if (uiquery.is_a?(Hash))
+          offset_x = 0
+          offset_y = 0
+          if options[:offset]
+            offset_x += options[:offset][:x] || 0
+            offset_y += options[:offset][:y] || 0
+          end
+          x = offset_x
+          y = offset_y
+          rect = uiquery["rect"] || uiquery[:rect]
+          if rect
+            x += rect['center_x'] || rect[:center_x] || rect[:x] || 0
+            y += rect['center_y'] || rect[:center_y] || rect[:y] || 0
+          else
+            x += uiquery['center_x'] || uiquery[:center_x] || uiquery[:x] || 0
+            y += uiquery['center_y'] || uiquery[:center_y] || uiquery[:y] || 0
+          end
+
+          options[:offset] = {:x => x, :y => y}
+          return touch(nil, options)
+        end
+
         options[:query] = uiquery
         views_touched = playback("touch", options)
         unless uiquery.nil?
@@ -278,7 +306,7 @@ module Calabash
       end
 
 
-      def load_recording(recording,rec_dir)
+      def load_recording(recording, rec_dir)
         data = nil
         if (File.exists?(recording))
           data = File.read(recording)
@@ -315,13 +343,13 @@ EOF
         rec_dir = ENV['PLAYBACK_DIR'] || "#{Dir.pwd}/playback"
 
         recording = recording_name_for(recording_name, os, device)
-        data = load_recording(recording,rec_dir)
+        data = load_recording(recording, rec_dir)
 
         if data.nil? and os=="ios6"
           recording = recording_name_for(recording_name, "ios5", device)
         end
 
-        data = load_recording(recording,rec_dir)
+        data = load_recording(recording, rec_dir)
 
         if data.nil?
           screenshot_and_raise "Playback not found: #{recording} (searched for #{recording} in #{Dir.pwd}, #{rec_dir}, #{DATA_PATH}/resources"
@@ -450,7 +478,7 @@ EOF
         end
         app_bundle_path = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(path)
 
-        @ios_device  = RunLoop.run(:app => app_bundle_path)
+        @ios_device = RunLoop.run(:app => app_bundle_path)
       end
 
       def send_uia_command(opts ={})
@@ -464,7 +492,6 @@ EOF
       end
 
 
-
       def http(options, data=nil)
         options[:uri] = url_for(options[:path])
         options[:method] = options[:method] || :get
@@ -507,11 +534,12 @@ EOF
               body = @http.get(options[:uri], options[:body]).body
             end
             break
-          rescue HTTPClient::TimeoutError => e
+          rescue HTTPClient::TimeoutError, HTTPClient::KeepAliveDisconnected => e
             if count < CAL_HTTP_RETRY_COUNT-1
-              sleep(0.5)
               @http.reset_all
               @http=nil
+              STDOUT.write "Waiting 5 secs before retry...\n"
+              sleep(5)
               STDOUT.write "Retrying.. #{e.class}: (#{e})\n"
               STDOUT.flush
 
@@ -519,6 +547,7 @@ EOF
               puts "Failing... #{e.class}"
               raise e
             end
+
           rescue Exception => e
             if retryable_errors.include?(e)
               if count < CAL_HTTP_RETRY_COUNT-1
@@ -546,6 +575,9 @@ EOF
         http.connect_timeout = 15
         http.send_timeout = 15
         http.receive_timeout = 15
+        if ENV['DEBUG_HTTP'] and (ENV['DEBUG_HTTP'] != "0")
+          http.debug_dev = $stdout
+        end
         http
       end
     end

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.127"
+    VERSION = "0.9.133"
     FRAMEWORK_VERSION = "0.9.126"
   end
 end

data/lib/calabash-cucumber/wait_helpers.rb

@@ -32,7 +32,9 @@ module Calabash
           retry_frequency = options_or_timeout[:retry_frequency] || 0.2
           post_timeout = options_or_timeout[:post_timeout] || 0.1
           timeout_message = options_or_timeout[:timeout_message]
-          screenshot_on_error = options_or_timeout[:screenshot_on_error] || true
+          if options_or_timeout.key?(:screenshot_on_error)
+            screenshot_on_error = options_or_timeout[:screenshot_on_error]
+          end
         end
 
         begin

data/{features-skeleton → scripts}/.irbrc

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'irb/completion'
 require 'irb/ext/save-history'
+require 'awesome_print'
+AwesomePrint.irb!
 
 ARGV.concat [ "--readline",
               "--prompt-mode",
@@ -16,7 +18,7 @@ require 'calabash-cucumber/operations'
 require 'calabash-cucumber/launch/simulator_helper'
 SIM=Calabash::Cucumber::SimulatorHelper
 
-include Calabash::Cucumber::Operations
+extend Calabash::Cucumber::Operations
 
 def embed(x,y=nil,z=nil)
    puts "Screenshot at #{x}"

metadata

@@ -1,172 +1,208 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: testautoi
-version: !ruby/object:Gem::Version 
-  hash: 197
+version: !ruby/object:Gem::Version
+  version: 0.9.133
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 127
-  version: 0.9.127
 platform: ruby
-authors: 
+authors:
 - jimtsay
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-18 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cucumber
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: CFPropertyList
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: CFPropertyList
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sim_launcher
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: sim_launcher
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        - 4
-        - 6
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
         version: 0.4.6
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: slowhandcuke
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.4.6
+- !ruby/object:Gem::Dependency
+  name: slowhandcuke
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: location-one
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: location-one
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 0
-        - 8
-        version: 0.0.8
+      - !ruby/object:Gem::Version
+        version: 0.0.9
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: httpclient
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 9
-        segments: 
-        - 2
-        - 2
-        - 7
-        version: 2.2.7
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.9
+- !ruby/object:Gem::Dependency
+  name: httpclient
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.3.2
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.3.2
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+      - !ruby/object:Gem::Version
+        version: '1.1'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
   name: run_loop
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+  type: :runtime
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 0
-        - 3
-        version: 0.0.3
+      - !ruby/object:Gem::Version
+        version: 0.0.5
+- !ruby/object:Gem::Dependency
+  name: awesome_print
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id009
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  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: 
+executables:
 - calabash-ios
+- testautoi
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGES.txt
 - Gemfile
 - LICENSE
 - Rakefile
 - bin/CalabashSetup
+- bin/GetIPAddress.js
+- bin/LaunchApp.js
 - bin/cal.xcconfig
 - bin/calabash-ios
 - bin/calabash-ios-build.rb
@@ -174,12 +210,12 @@ files:
 - bin/calabash-ios-helpers.rb
 - bin/calabash-ios-setup.rb
 - bin/calabash-ios-sim.rb
+- bin/devicedetect
+- bin/fruitstrap
+- bin/testautoi
 - calabash-cucumber.gemspec
 - doc/calabash-ios-help.txt
 - epl-v10.html
-- features-skeleton/.irbrc
-- features-skeleton/irb_ios4.sh
-- features-skeleton/irb_ios5.sh
 - features-skeleton/my_first.feature
 - features-skeleton/step_definitions/calabash_steps.rb
 - features-skeleton/step_definitions/my_first_steps.rb
@@ -277,43 +313,35 @@ files:
 - lib/calabash-cucumber/tests_helpers.rb
 - lib/calabash-cucumber/version.rb
 - lib/calabash-cucumber/wait_helpers.rb
+- scripts/.irbrc
 - scripts/data/.GlobalPreferences.plist
 - scripts/data/clients.plist
 - scripts/data/com.apple.Accessibility.plist
 - scripts/reset_simulator.scpt
 homepage: 
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Summary
-test_files: 
+test_files:
 - features/step_definitions/calabash_steps.rb
 has_rdoc: