calabash-cucumber 0.9.148 → 0.9.149

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 025f351d56fac5ff108230ce3e40b41a7b3d1a06
-  data.tar.gz: 2cb59b2008047bd41b12c80fa202d4d6c61a2c4e
+  metadata.gz: 640d5e4e268d95b44769d4d5997d619dabff8006
+  data.tar.gz: da35cf9f62d032d2fa1b181d8c8de934301d4095
 SHA512:
-  metadata.gz: a280eae537a3736f2cde14cdf2d9dde20e4a039021ad637ff86c7c1fd3d92696905bcd3076b9ebca021de8fb86290ec23bc424aebbc04a9bf70f713e42f71567
-  data.tar.gz: d4bbd775053737edf46b1de99b8e74c6b4cbc062ca4952fcaac76cf271eff7512a572335833be5249ec5e955b422d894dd2607ee97961e4e896cb089e5590575
+  metadata.gz: f796bc3ef19fb1d8f5e06198c547841a26ab9c51a1adfde16fd83ac28497f03282dffb48ea898e7c1f05dc3fb64e060637d4dbd5c11b8bd86e82cb0c531a39ca
+  data.tar.gz: 4321411662fa7214f557d2664b976736cfa5bef19a94fcbbf1f34c5696302b9af8f2505cf1ed6fb6fd8418bb14027b4989f7d54cf12836addcaeae300e3508bb

data/calabash-cucumber.gemspec

@@ -19,13 +19,14 @@ Gem::Specification.new do |s|
   s.add_dependency( "cucumber", "~> 1.3.0" )
   s.add_dependency( "calabash-common", "~> 0.0.1" )
   s.add_dependency( "json" )
+  s.add_dependency( 'edn')
   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.12" )
+  s.add_dependency( "run_loop", "~> 0.0.13" )
   s.add_dependency( "awesome_print")
 
 end

data/lib/calabash-cucumber/core.rb

@@ -1,9 +1,11 @@
 require 'httpclient'
 require 'calabash-cucumber/launch/simulator_helper'
+require 'calabash-cucumber/uia'
 
 module Calabash
   module Cucumber
     module Core
+      include Calabash::Cucumber::UIA
 
       DATA_PATH = File.expand_path(File.dirname(__FILE__))
       CAL_HTTP_RETRY_COUNT=3
@@ -91,13 +93,20 @@ module Calabash
         end
 
         options[:query] = uiquery
-        views_touched = playback("touch", options)
+        views_touched = do_touch(options)
         unless uiquery.nil?
           screenshot_and_raise "could not find view to touch: '#{uiquery}', args: #{options}" if views_touched.empty?
         end
         views_touched
       end
 
+      def do_touch(options)
+        if ENV['OS']=='ios7' || @calabash_launcher && @calabash_launcher.ios_major_version == "7"
+          options[:uia_gesture] = :tap
+        end
+        playback("touch", options)
+      end
+
       def swipe(dir, options={})
         dir = dir.to_sym
         @current_rotation = @current_rotation || :down
@@ -412,6 +421,7 @@ EOF
         post_data<< %Q|,"query":"#{escape_quotes(options[:query])}"| if options[:query]
         post_data<< %Q|,"offset":#{options[:offset].to_json}| if options[:offset]
         post_data<< %Q|,"reverse":#{options[:reverse]}| if options[:reverse]
+        post_data<< %Q|,"uia_gesture":"#{options[:uia_gesture]}"| if options[:uia_gesture]
         post_data<< %Q|,"prototype":"#{options[:prototype]}"| if options[:prototype]
         post_data << "}"
 
@@ -539,14 +549,6 @@ EOF
         @calabash_launcher && @calabash_launcher.device
       end
 
-      def send_uia_command(opts ={})
-        run_loop = opts[:run_loop] || (@calabash_launcher && @calabash_launcher.active? && @calabash_launcher.run_loop)
-        command = opts[:command]
-        raise ArgumentError, 'please supply :run_loop or instance var @calabash_launcher' unless run_loop
-        raise ArgumentError, 'please supply :command' unless command
-        RunLoop.send_command(run_loop, opts[:command])
-      end
-
 
       def http(options, data=nil)
         options[:uri] = url_for(options[:path])

data/lib/calabash-cucumber/launcher.rb

@@ -72,6 +72,7 @@ class Calabash::Cucumber::Launcher
       if target != 'DEVICE'
         default_args[:udid] = target
       end
+      default_args
       self.run_loop = RunLoop.run(default_args.merge(args))
     else
 

data/lib/calabash-cucumber/resources/touch_ios7_ipad.base64

@@ -0,0 +1,9 @@
+YnBsaXN0MDCiARLVAgMEBQYHCAkOEVRUaW1lVERhdGFeV2luZG93TG9jYXRpb25Y
+TG9jYXRpb25UVHlwZRMAADAlq7xUgk8QQAEAAAABAAEAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAABAAICAgAAAIA/AACAPwAALEMAAH5DAECKQAAAAADSCgsMDVFY
+UVkjQGWAAAAAAAAjQG/AAAAAAADSCgsPECNAZYAAAAAAACNAb8AAAAAAABELudUC
+AwQFBhMUFRgREwAAMCWuVOtDTxBABgAAAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAEAAgIBAAAAgD8AAIA/AAAsQwAAfkMAAAAAAAAAANIKCxYXI0BlgAAA
+AAAAI0BvwAAAAAAA0goLGRojQGWAAAAAAAAjQG/AAAAAAAAACAALABYAGwAgAC8A
+OAA9AEYAiQCOAJAAkgCbAKQAqQCyALsAvgDJANIBFQEaASMBLAExAToAAAAAAAAC
+AQAAAAAAAAAbAAAAAAAAAAAAAAAAAAABQw==

data/lib/calabash-cucumber/resources/touch_ios7_iphone.base64

@@ -0,0 +1,9 @@
+YnBsaXN0MDCiARLVAgMEBQYHCAkOEVRUaW1lVERhdGFeV2luZG93TG9jYXRpb25Y
+TG9jYXRpb25UVHlwZRMAADAlq7xUgk8QQAEAAAABAAEAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAAAAAABAAICAgAAAIA/AACAPwAALEMAAH5DAECKQAAAAADSCgsMDVFY
+UVkjQGWAAAAAAAAjQG/AAAAAAADSCgsPECNAZYAAAAAAACNAb8AAAAAAABELudUC
+AwQFBhMUFRgREwAAMCWuVOtDTxBABgAAAAEAAQAAAAAAAAAAAAAAAAAAAAAAAAAA
+AAAAAAAAAAEAAgIBAAAAgD8AAIA/AAAsQwAAfkMAAAAAAAAAANIKCxYXI0BlgAAA
+AAAAI0BvwAAAAAAA0goLGRojQGWAAAAAAAAjQG/AAAAAAAAACAALABYAGwAgAC8A
+OAA9AEYAiQCOAJAAkgCbAKQAqQCyALsAvgDJANIBFQEaASMBLAExAToAAAAAAAAC
+AQAAAAAAAAAbAAAAAAAAAAAAAAAAAAABQw==

data/lib/calabash-cucumber/uia.rb

@@ -0,0 +1,45 @@
+require 'edn'
+module Calabash
+  module Cucumber
+    module UIA
+
+      def send_uia_command(opts ={})
+        run_loop = opts[:run_loop] || (@calabash_launcher && @calabash_launcher.active? && @calabash_launcher.run_loop)
+        command = opts[:command]
+        raise ArgumentError, 'please supply :run_loop or instance var @calabash_launcher' unless run_loop
+        raise ArgumentError, 'please supply :command' unless command
+        RunLoop.send_command(run_loop, opts[:command])
+      end
+
+      def uia_query(*queryparts)
+        #TODO escape ' in query
+        uia_handle_command(:query, queryparts)
+      end
+
+      def uia_tap(*queryparts)
+        #TODO escape ' in query
+        uia_handle_command(:tap, queryparts)
+      end
+
+      def uia_handle_command(cmd, query)
+        command = %Q[uia.#{cmd}('#{query.to_edn}')]
+        if ENV['DEBUG'] == '1'
+          puts "Sending UIA command"
+          puts command
+        end
+        s=send_uia_command :command => command
+        if ENV['DEBUG'] == '1'
+          puts "Result"
+          p s
+        end
+        if s['status'] == 'success'
+          s['value']
+        else
+          raise s
+        end
+      end
+
+
+    end
+  end
+end

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.148'
+    VERSION = '0.9.149'
     FRAMEWORK_VERSION = '0.9.146'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.148
+  version: 0.9.149
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-04 00:00:00.000000000 Z
+date: 2013-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -52,6 +52,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: edn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +156,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.12
+        version: 0.0.13
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -278,6 +292,8 @@ files:
 - lib/calabash-cucumber/resources/touch_ios4_iphone.base64
 - lib/calabash-cucumber/resources/touch_ios5_ipad.base64
 - lib/calabash-cucumber/resources/touch_ios5_iphone.base64
+- lib/calabash-cucumber/resources/touch_ios7_ipad.base64
+- lib/calabash-cucumber/resources/touch_ios7_iphone.base64
 - lib/calabash-cucumber/resources/wheel_down_ios4_ipad.base64
 - lib/calabash-cucumber/resources/wheel_down_ios4_iphone.base64
 - lib/calabash-cucumber/resources/wheel_down_ios5_ipad.base64
@@ -287,6 +303,7 @@ files:
 - lib/calabash-cucumber/resources/wheel_up_ios5_ipad.base64
 - lib/calabash-cucumber/resources/wheel_up_ios5_iphone.base64
 - lib/calabash-cucumber/tests_helpers.rb
+- lib/calabash-cucumber/uia.rb
 - lib/calabash-cucumber/version.rb
 - lib/calabash-cucumber/wait_helpers.rb
 - scripts/.irbrc