calabash-cucumber 0.9.149 → 0.9.150

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 640d5e4e268d95b44769d4d5997d619dabff8006
-  data.tar.gz: da35cf9f62d032d2fa1b181d8c8de934301d4095
+  metadata.gz: e9cb615b16697711669a84fa18b9c89d5258c996
+  data.tar.gz: 53769b75773781a43f3135d45aad222b5cc662ad
 SHA512:
-  metadata.gz: f796bc3ef19fb1d8f5e06198c547841a26ab9c51a1adfde16fd83ac28497f03282dffb48ea898e7c1f05dc3fb64e060637d4dbd5c11b8bd86e82cb0c531a39ca
-  data.tar.gz: 4321411662fa7214f557d2664b976736cfa5bef19a94fcbbf1f34c5696302b9af8f2505cf1ed6fb6fd8418bb14027b4989f7d54cf12836addcaeae300e3508bb
+  metadata.gz: 73c212c4f54a5c85594a8410d17363e65ba1c08cd3949e0a4974dbf27d15a2bd801a5c0bc623ede3bbb18db49268a40c726116332530c2edaca91cba5534fe6d
+  data.tar.gz: c975e2107c7fcc76cd5bdc45af86621287907050b2e5b5f48c36fd353f9f9416318e9a4a6e02662938e726927be38d4f2d28c89f397e0bbfae4040643523d46e

data/calabash-cucumber.gemspec

@@ -26,7 +26,7 @@ Gem::Specification.new do |s|
   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.13" )
+  s.add_dependency( "run_loop", "~> 0.0.15" )
   s.add_dependency( "awesome_print")
 
 end

data/lib/calabash-cucumber/uia.rb

@@ -1,4 +1,6 @@
 require 'edn'
+require 'location-one'
+
 module Calabash
   module Cucumber
     module UIA
@@ -12,17 +14,70 @@ module Calabash
       end
 
       def uia_query(*queryparts)
-        #TODO escape ' in query
+        #TODO escape '\n etc in query
         uia_handle_command(:query, queryparts)
       end
 
+      def uia_names(*queryparts)
+        #TODO escape '\n etc in query
+        uia_handle_command(:names, 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}')]
+      def uia_tap_mark(mark)
+        uia_handle_command(:tapMark, mark)
+      end
+
+      def uia_pan(from_q, to_q)
+        uia_handle_command(:pan, from_q, to_q)
+      end
+
+      def uia_scroll_to(*queryparts)
+        uia_handle_command(:scrollTo, queryparts)
+      end
+
+      def uia_element_exists?(*queryparts)
+        uia_handle_command(:elementExists, queryparts)
+      end
+
+      def uia_element_does_not_exist?(*queryparts)
+        uia_handle_command(:elementDoesNotExist, queryparts)
+      end
+
+      def uia_screenshot(name)
+        uia_handle_command(:elementDoesNotExist, name)
+      end
+
+      def uia_type_string(string)
+        uia_handle_command(:typeString, string)
+      end
+
+      def uia_enter()
+        uia_handle_command(:enter)
+      end
+
+      def uia_set_location(place)
+        if place.is_a?(String)
+          loc = LocationOne::Client.location_by_place(place)
+          loc_data = {"latitude"=>loc.latitude, "longitude"=>loc.longitude}
+        else
+          loc_data = place
+        end
+        uia_handle_command(:setLocation, loc_data)
+      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)}'"
+          end
+        end
+        command = %Q[uia.#{cmd}(#{args.join(', ')})]
         if ENV['DEBUG'] == '1'
           puts "Sending UIA command"
           puts command
@@ -39,6 +94,10 @@ module Calabash
         end
       end
 
+      def escape_uia_string(string)
+        #TODO escape '\n in query
+        string
+      end
 
     end
   end

data/lib/calabash-cucumber/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.149
+  version: 0.9.150
 platform: ruby
 authors:
 - Karl Krukow
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.15
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.13
+        version: 0.0.15
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement