calabash-cucumber 0.9.163.pre5 → 0.9.163.pre6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3890c3b5aea8c789a8aa90c226ae528d6e17e78
-  data.tar.gz: 21991600f65969e8eb8018a2bb835a110f86bbe9
+  metadata.gz: 08de191047f321e0ffed282134c68eb60330b541
+  data.tar.gz: 89b0d98563434d12e9bdfef041e8430b2ecdfefa
 SHA512:
-  metadata.gz: c46c1d2d0b74cb6f9ff7944563b71e23c1fab55df66b57ad19f7f33694df09e9c738e696ab56846ba6ee21d5d3c8e4f6b58d62c9fb071c7748c5b0c2d272d0f8
-  data.tar.gz: 641ae6857ccd75f7bf46e9837ef72fe4594baef5df30733e7a1717e0203c8aa95e4d2ecc0f1e7f14d5f3d13ac9eeaa2cc79795c256954dc1d911c43a806bec06
+  metadata.gz: 5777ca5de72a1c88fbde13e2a2d7e154dccbe6da6df1a2d33d0b075b41f3b01d128232b0fa10e9e837ad580565779366c2892153370e3f7245b7860f1f11c762
+  data.tar.gz: 38c5dd7c53756499585f0709134075fced3724ca68028bf12272bdff532d4e997f645f2c25922e8f3207cf17ccfe93bdedef73738cfb5fef949f6a86adcf8d7c

data/calabash-cucumber.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   s.add_dependency( "geocoder", "~>1.1.8")
   s.add_dependency( "httpclient","~> 2.3.3")
   s.add_dependency( "bundler", "~> 1.1")
-  s.add_dependency( "run_loop", "~> 0.1.0.pre3" )
+  s.add_dependency( "run_loop", "~> 0.1.0.pre4" )
   s.add_dependency( "awesome_print")
   s.add_dependency( "xamarin-test-cloud", "~> 0.9.25")
 

data/lib/calabash-cucumber/uia.rb

@@ -1,4 +1,5 @@
 require 'edn'
+require 'json'
 
 module Calabash
   module Cucumber
@@ -24,6 +25,16 @@ module Calabash
         uia_handle_command(:query, queryparts)
       end
 
+      def uia_query_el(*queryparts)
+        #TODO escape '\n etc in query
+        uia_handle_command(:queryEl, queryparts)
+      end
+
+      def uia_query_windows(*queryparts)
+        #TODO escape '\n etc in query
+        uia_handle_command(:queryWindows, queryparts)
+      end
+
       def uia_names(*queryparts)
         #TODO escape '\n etc in query
         uia_handle_command(:names, queryparts)
@@ -41,6 +52,38 @@ module Calabash
         uia_handle_command(:tapOffset, offset)
       end
 
+      def uia_double_tap(*queryparts)
+        uia_handle_command(:doubleTap, queryparts)
+      end
+
+      def uia_double_tap_mark(mark)
+        uia_double_tap(:view, marked:mark)
+      end
+
+      def uia_double_tap_offset(offset)
+        uia_handle_command(:doubleTapOffset, offset)
+      end
+
+      def uia_two_finger_tap(*queryparts)
+        uia_handle_command(:twoFingerTap, queryparts)
+      end
+
+      def uia_two_finger_tap_offset(offset)
+        uia_handle_command(:twoFingerTapOffset, offset)
+      end
+
+      def uia_flick_offset(from, to)
+        uia_handle_command(:flickOffset, from, to)
+      end
+
+      def uia_touch_hold(duration, *queryparts)
+        uia_handle_command(:touchHold, duration, queryparts)
+      end
+
+      def uia_touch_hold_offset(duration, offset)
+        uia_handle_command(:touchHoldOffset, duration, offset)
+      end
+
       def uia_pan(from_q, to_q)
         uia_handle_command(:pan, from_q, to_q)
       end
@@ -82,7 +125,12 @@ module Calabash
       end
 
       def uia_type_string(string)
-        uia_handle_command(:typeString, string)
+        res = uia_handle_command(:typeString, string)
+        status = res['status']
+        if status.eql?('error')
+          value = res['value']
+          screenshot_and_raise "could not type '#{string}' - '#{value}'"
+        end
       end
 
       def uia_enter
@@ -107,28 +155,73 @@ module Calabash
         uia_handle_command(:deactivate, secs)
       end
 
-      def uia_handle_command(cmd, *query_args)
-        args = query_args.map do |part|
-          if part.is_a?(String)
-            "'#{escape_uia_string(part)}'"
-          else
-            "'#{escape_uia_string(part.to_edn)}'"
+      def uia_call(args_arr, *opts)
+        uia_call_method(:queryEl, args_arr, *opts)
+      end
+
+      def uia_call_method(cmd, args_arr, *opts)
+        if opts.empty?
+          return uia_handle_command(cmd, args_arr)
+        end
+        js_cmd = uia_serialize_command(cmd, args_arr)
+
+        js_args = []
+        opts.each do |invocation|
+          js_args << case invocation
+                       when Symbol
+                         "#{invocation}()"
+                       when Hash
+                         m = invocation.keys.first
+                         args = invocation[m]
+
+                         if args.is_a?(Array)
+                           serialized_args = (args.map &:to_json).join(',')
+                         else
+                           serialized_args = args.to_json
+                         end
+
+
+                         "#{m}(#{serialized_args})"
+                       else
+                         raise "Invalid invocation spec #{invocation}"              
           end
         end
-        command = %Q[uia.#{cmd}(#{args.join(', ')})]
+        command = "#{js_cmd}.#{js_args.join('.')}"
         if ENV['DEBUG'] == '1'
           puts "Sending UIA command"
           puts command
         end
-        s = uia(command)
+
+        uia_result(uia(command))
+
+      end
+
+      def uia_handle_command(cmd, *query_args)
+        command = uia_serialize_command(cmd, *query_args)
         if ENV['DEBUG'] == '1'
-          puts "Result"
-          p s
+          puts "Sending UIA command"
+          puts command
         end
-        if s['status'] == 'success'
-          s['value']
+        s = uia(command)
+        uia_result(s)
+      end
+
+      def uia_serialize_command(cmd, *query_args)
+        args = uia_serialize_arguments(query_args)
+        %Q[uia.#{cmd}(#{args.join(', ')})]
+      end
+
+      def uia_serialize_arguments(args)
+        args.map do |part|
+          uia_serialize_argument(part)
+        end
+      end
+
+      def uia_serialize_argument(part)
+        if part.is_a?(String)
+          "'#{escape_uia_string(part)}'"
         else
-          s
+          "'#{escape_uia_string(part.to_edn)}'"
         end
       end
 
@@ -148,6 +241,19 @@ module Calabash
         end
       end
 
+      def uia_result(s)
+        if ENV['DEBUG'] == '1'
+          puts "Result"
+          p s
+        end
+        if s['status'] == 'success'
+          s['value']
+        else
+          s
+        end
+      end
+
+
 
     end
   end

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.163.pre5'
+    VERSION = '0.9.163.pre6'
     FRAMEWORK_VERSION = '0.9.163.pre3'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.163.pre5
+  version: 0.9.163.pre6
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2013-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre3
+        version: 0.1.0.pre4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.0.pre3
+        version: 0.1.0.pre4
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement