calabash-cucumber 0.9.160 → 0.9.161

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4250065fb240c637edd42fdd56234dcd2cc5e0ad
-  data.tar.gz: 082b884451b052b431d502cfb10bc8591bc9b037
+  metadata.gz: d5a530cbf65efa54db1984a3f8afe227d5de54f9
+  data.tar.gz: 4e9b073d215cc110aaf8d207b6ce2d9fdeef29eb
 SHA512:
-  metadata.gz: dce4c8faf1c3a8aba0d38f947c006c3a7c7394d47e3c63da08cea904aba5cee50d24e206e44e45977a6af9605d871a194e37052980f59d8b0090e3f9806e40d5
-  data.tar.gz: a9502b1a1e61ce0276d7f1cc44eb64a277a556b9aa4e41defde7b7f83b689efcbc694222ee3e61e7c3d6dedf5f6034fccf5f3d42e4154b5fc63337b6361dd29a
+  metadata.gz: 26835b71dfd637fcaa0003b6ac3f051a61cb0db81742a188fda6e8bfec820f5f86e502a8135608c15d5330f81a9caf1e7825f181e92f7228dd27299c1f897880
+  data.tar.gz: e4d5478835361305f871412e9a1808d44a415b7743baa2adcd3a54c6662344a2f7cb1e976b0ebffb556cd7f47dcc5a20d51d303335c241f08736b0a1e94bde48

data/bin/calabash-ios-setup.rb

@@ -93,7 +93,7 @@ def download_calabash(project_path)
       zip_file = File.join(@framework_dir,"calabash.framework.zip")
 
       if File.exist?(zip_file)
-        if not system("unzip -C -K -o -q -d #{project_path} #{zip_file} -x __MACOSX/* calabash.framework/.DS_Store")
+        if not system("unzip -C -K -o -q -d '#{project_path}' '#{zip_file}' -x __MACOSX/* calabash.framework/.DS_Store")
           msg("Error") do
             puts "Unable to unzip file: #{zip_file}"
             puts "You must install manually."

data/features/step_definitions/calabash_steps.rb

@@ -1,4 +1,3 @@
-
 WAIT_TIMEOUT = (ENV['WAIT_TIMEOUT'] || 30).to_f
 STEP_PAUSE = (ENV['STEP_PAUSE'] || 0.5).to_f
 
@@ -336,7 +335,7 @@ end
 
 Then /^I send app to background for (\d+) seconds$/ do |secs|
   secs = secs.to_f
-  background(secs)
+  send_app_to_background(secs)
   sleep(secs+10)
 end
 

data/lib/calabash-cucumber/core.rb

@@ -71,7 +71,6 @@ module Calabash
 
       def touch(uiquery, options={})
 
-
         if (uiquery.is_a?(Array))
           raise "No elements to touch in array" if uiquery.empty?
           uiquery = uiquery.first
@@ -102,8 +101,7 @@ module Calabash
         if ios7?
           swipe_ios7(options.merge(:direction => dir))
         else
-          dir = dir.to_sym
-          current_orientation = device_orientation().to_sym
+          current_orientation = status_bar_orientation.to_sym
           if current_orientation == :left
             case dir
               when :left then
@@ -117,6 +115,7 @@ module Calabash
               else
             end
           end
+
           if current_orientation == :right
             case dir
               when :left then
@@ -130,6 +129,7 @@ module Calabash
               else
             end
           end
+
           if current_orientation == :up
             case dir
               when :left then
@@ -143,6 +143,7 @@ module Calabash
               else
             end
           end
+
           playback("swipe_#{dir}", options)
         end
       end
@@ -259,47 +260,59 @@ module Calabash
       # * see apple documentation for clarification about where the home button
       #   is in left and right landscape orientations
       def rotate_home_button_to(dir)
-        dir = dir.to_s
-        # *** UNEXPECTED ***
-        # do not call device_orientation function here because it does a number
-        # of checks that will lead to inconsistent and confusing warnings
-        # ******************
-        res = map(nil, :orientation, :device).first
-        return res if res.eql? dir
+        dir_sym = dir.to_sym
+        if dir_sym.eql?(:top)
+          if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
+            warn "converting '#{dir}' to ':up' - please adjust your code"
+          end
+          dir_sym = :up
+        end
+
+        if dir_sym.eql?(:bottom)
+          if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
+            warn "converting '#{dir}' to ':down' - please adjust your code"
+          end
+          dir_sym = :down
+        end
+
+        directions = [:down, :up, :left, :right]
+        unless directions.include?(dir_sym)
+          screenshot_and_raise "expected one of '#{directions}' as an arg to 'rotate_home_button_to but found '#{dir}'"
+        end
+
+        res = status_bar_orientation()
+        if res.nil?
+          screenshot_and_raise "expected 'status_bar_orientation' to return a non-nil value"
+        else
+          res = res.to_sym
+        end
+
+        return res if res.eql? dir_sym
+
         rotation_candidates.each { |candidate|
           if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
-            puts "try to rotate to '#{dir}' using '#{candidate}'"
+            puts "try to rotate to '#{dir_sym}' using '#{candidate}'"
           end
           playback(candidate)
           # need a longer sleep for cloud testing
-          sleep(0.5)
-
-          # *** UNEXPECTED ***
-          # do not call device_orientation function here because it does a number
-          # of checks that will lead to inconsistent and confusing warnings
-          # ******************
-          res = map(nil, :orientation, :device).first
-
-          # *** UNEXPECTED ***
-          # the device orientation changes when rotation playback is performed
-          # _regardless_ of whether or not the rotation succeeded
-          #
-          # this is an attempt to sync to the device and status bar orientation
-          # ******************
-          if res.eql? dir
-            status_bar = status_bar_orientation
-            if status_bar.eql? res
-              return res
-            else
-              return rotate_home_button_to status_bar
-            end
+          sleep(0.4)
+
+          res = status_bar_orientation
+          if res.nil?
+            screenshot_and_raise "expected 'status_bar_orientation' to return a non-nil value"
+          else
+            res = res.to_sym
           end
 
+          return if res.eql? dir_sym
         }
+
         if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
-          puts "Could not rotate device.  Is rotation enabled in app? Will return 'down'"
+          warn "Could not rotate home button to '#{dir}'."
+          warn 'Is rotation enabled for this controller?'
+          warn "Will return 'down'"
         end
-        'down'
+        :down
       end
 
       def device_orientation(force_down=false)
@@ -309,11 +322,6 @@ module Calabash
           if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
             if force_down
               puts "WARN  found orientation '#{res}' - will rotate to force orientation to 'down'"
-            else
-              puts "WARN  found orientation '#{res}'"
-              puts '      if you did not expect this, you have two options:'
-              puts '      1. position your device in the upright position'
-              puts "      2. call device_orientation(true) to force a 'down' orientation"
             end
           end
 
@@ -332,7 +340,7 @@ module Calabash
 
       def rotate(dir)
         dir = dir.to_sym
-        current_orientation = device_orientation(true).to_sym
+        current_orientation = status_bar_orientation().to_sym
         rotate_cmd = nil
         case dir
           when :left then

data/lib/calabash-cucumber/ios7_operations.rb

@@ -27,7 +27,7 @@ module Calabash
       end
 
       def normalize_rect_for_orientation(rect)
-        orientation = device_orientation().to_sym
+        orientation = status_bar_orientation().to_sym
         launcher = Calabash::Cucumber::Launcher.launcher
         screen_size = launcher.device.screen_size
         case orientation

data/lib/calabash-cucumber/operations.rb

@@ -38,7 +38,7 @@ module Calabash
       end
 
       def home_direction
-        device_orientation().to_sym
+        status_bar_orientation.to_sym
       end
 
       def assert_home_direction(expected)

data/lib/calabash-cucumber/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.160
+  version: 0.9.161
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-04 00:00:00.000000000 Z
+date: 2013-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -359,9 +359,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS
 test_files:
 - features/step_definitions/calabash_steps.rb
+has_rdoc: