calabash-cucumber 0.9.161 → 0.9.162

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d5a530cbf65efa54db1984a3f8afe227d5de54f9
-  data.tar.gz: 4e9b073d215cc110aaf8d207b6ce2d9fdeef29eb
+  metadata.gz: 5b8134e2f83edca8edd8edddca519b5189a427a2
+  data.tar.gz: 4a105d3ae28b247712a531a1d78df6205a976395
 SHA512:
-  metadata.gz: 26835b71dfd637fcaa0003b6ac3f051a61cb0db81742a188fda6e8bfec820f5f86e502a8135608c15d5330f81a9caf1e7825f181e92f7228dd27299c1f897880
-  data.tar.gz: e4d5478835361305f871412e9a1808d44a415b7743baa2adcd3a54c6662344a2f7cb1e976b0ebffb556cd7f47dcc5a20d51d303335c241f08736b0a1e94bde48
+  metadata.gz: 1b40fbdca41785f04e10c94326ceb946c14083c90faab97ebd40583a29c6d4bc14e3ed1c820451e08496a9b5571df8dd9db5b2aeea1bc53c168596cc668df069
+  data.tar.gz: 07002708b43689e9a1a5b7f4ec20a59b88f8c226e3aa39b60070e4f44d0d8ada75cede0244872c219c4510b3ae2b6beb9454c5c929159429e0916994f3cf745a

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.21" )
+  s.add_dependency( "run_loop", "~> 0.0.22" )
   s.add_dependency( "awesome_print")
   s.add_dependency( "xamarin-test-cloud", "~> 0.9.25")
 

data/lib/calabash-cucumber/ios7_operations.rb

@@ -18,44 +18,19 @@ module Calabash
         if ui_query.nil?
           uia_tap_offset(offset)
         else
-          el_to_touch = find_or_raise(ui_query)
-          rect = el_to_touch['rect']
-          normalize_rect_for_orientation(rect)
+          el_to_touch = find_and_normalize_or_raise(ui_query)
           touch(el_to_touch, options)
           [el_to_touch]
         end
       end
 
-      def normalize_rect_for_orientation(rect)
-        orientation = status_bar_orientation().to_sym
-        launcher = Calabash::Cucumber::Launcher.launcher
-        screen_size = launcher.device.screen_size
-        case orientation
-          when :right
-            cx = rect['center_x']
-            rect['center_x'] = rect['center_y']
-            rect['center_y'] = screen_size[:width] - cx
-          when :left
-            cx = rect['center_x']
-            rect['center_x'] = screen_size[:height] - rect['center_y']
-            rect['center_y'] = cx
-          when :up
-            cy = rect['center_y']
-            cx = rect['center_x']
-            rect['center_y'] = screen_size[:height] - cy
-            rect['center_x'] = screen_size[:width]  - cx
-          else
-            # no-op by design.
-        end
-      end
-
       def swipe_ios7(options)
         ui_query = options[:query]
         offset =  options[:offset]
         if ui_query.nil?
           uia_swipe_offset(offset, options)
         else
-          el_to_swipe = find_or_raise(ui_query)
+          el_to_swipe = find_and_normalize_or_raise(ui_query)
           offset = point_from(el_to_swipe, options)
           uia_swipe_offset(offset, options)
           [el_to_swipe]
@@ -69,7 +44,7 @@ module Calabash
         if ui_query.nil?
           uia_pinch_offset(in_or_out, offset, {:duration => options[:duration]})
         else
-          el_to_pinch = find_or_raise(ui_query)
+          el_to_pinch = find_and_normalize_or_raise(ui_query)
           offset = point_from(el_to_pinch, options)
           uia_pinch_offset(in_or_out, offset, duration)
           [el_to_pinch]
@@ -77,12 +52,21 @@ module Calabash
       end
 
       def pan_ios7(from, to, options={})
-        from_result = find_or_raise from
-        to_result = find_or_raise to
-        uia_pan_offset(point_from(from_result, options), point_from(to_result, options), options)
+        from_result = find_and_normalize_or_raise from
+        to_result = find_and_normalize_or_raise to
+        uia_pan_offset(point_from(from_result, options),
+                       point_from(to_result, options),
+                       options)
         [to_result]
       end
 
+      private
+      def find_and_normalize_or_raise(ui_query)
+        res = find_or_raise(ui_query)
+        normalize_rect_for_orientation!(res['rect']) if res['rect']
+        res
+      end
+
       def find_or_raise(ui_query)
         results = query(ui_query)
         if results.empty?
@@ -92,6 +76,31 @@ module Calabash
         end
       end
 
+      def normalize_rect_for_orientation!(rect)
+        orientation = status_bar_orientation().to_sym
+        launcher = Calabash::Cucumber::Launcher.launcher
+        screen_size = launcher.device.screen_size
+        case orientation
+          when :right
+            cx = rect['center_x']
+            rect['center_x'] = rect['center_y']
+            rect['center_y'] = screen_size[:width] - cx
+          when :left
+            cx = rect['center_x']
+            rect['center_x'] = screen_size[:height] - rect['center_y']
+            rect['center_y'] = cx
+          when :up
+            cy = rect['center_y']
+            cx = rect['center_x']
+            rect['center_y'] = screen_size[:height] - cy
+            rect['center_x'] = screen_size[:width]  - cx
+          else
+            # no-op by design.
+        end
+      end
+
+
+
     end
   end
 end

data/lib/calabash-cucumber/uia.rb

@@ -73,7 +73,7 @@ module Calabash
       end
 
       def uia_screenshot(name)
-        uia_handle_command(:elementDoesNotExist, name)
+        uia_handle_command(:screenshot, name)
       end
 
       def uia_type_string(string)

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.161'
-    FRAMEWORK_VERSION = '0.9.160'
+    VERSION = '0.9.162'
+    FRAMEWORK_VERSION = '0.9.162'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.161
+  version: 0.9.162
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-24 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -156,14 +156,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.21
+        version: 0.0.22
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.21
+        version: 0.0.22
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement