calabash-cucumber 0.9.151 → 0.9.152

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65d842e54bba4c90f96d1e6e45af63c9d18c6c5e
-  data.tar.gz: 2ef76a18f37855579f0f1d1211abeca56364a57c
+  metadata.gz: 4e5d32bd3de7fc4255e3c73c5c94a1b437445bda
+  data.tar.gz: def9cece9fcf16b4e2f1dc552b0cb0faa0e9b095
 SHA512:
-  metadata.gz: 065dd85fb3a090d48713c6a7a76bc41d4cbc45aba2b9f48836a420bdbbc063a96fa69143f5752bafadac27a450924828a359284dddb3cd8eeec503474f1e79b4
-  data.tar.gz: 90f4e515b68e12748210c7b4d66967a715edc021652ead2df6201a4091917e3fbadade7ddd627cc244a44cdd0f17fb4f67f5a57ceb344bc45959285e76153746
+  metadata.gz: 24b3c029c87ec6c03e1303726298590e02dd4fcc21d9fdc49f456f2b0cf34e8f7cdfaaa5ac41a23e9dd49a1ed4b7ee41edf7a4d2949a09f3065a85bd7cdc0a71
+  data.tar.gz: e83946d9e1bb3725edaa5240541ca55e18a9356a0e063bfd071a48b790a8f04eefc41154882adaeb59f78d78aca04f385238563fe959a1803f2f606414d0b7b1

data/Rakefile

@@ -23,7 +23,7 @@ EOF
 
     FileUtils.cd(dir) do
       puts 'Building Server'
-      cmd = 'xcodebuild build -project calabash.xcodeproj -target Framework -configuration Debug -sdk iphonesimulator6.1'
+      cmd = 'xcodebuild build -project calabash.xcodeproj -target Framework -configuration Debug -sdk iphonesimulator7.0'
       puts cmd
       puts `#{cmd}`
 
@@ -56,7 +56,5 @@ EOF
 
 end
 
-task :build => [:build_server]
-task :install => [:build_server]
-task :release => [:build_server]
-
+task :install_server => [:build_server]
+task :release_server => [:build_server]

data/bin/calabash-ios-build.rb

@@ -46,6 +46,11 @@ end
 
 def console
   path = ENV['CALABASH_IRBRC']
+  unless path
+    if File.exist?('.irbrc')
+      path = File.expand_path('.irbrc')
+    end
+  end
   unless path
     path = File.expand_path(File.join(@script_dir,".irbrc"))
   end

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.15" )
+  s.add_dependency( "run_loop", "~> 0.0.19" )
   s.add_dependency( "awesome_print")
 
 end

data/features/step_definitions/calabash_steps.rb

@@ -97,12 +97,16 @@ end
 ## -- Entering text -- ##
 
 Then /^I enter "([^\"]*)" into the "([^\"]*)" field$/ do |text_to_type, field_name|
-  set_text("textField marked:'#{field_name}'", text_to_type)
+  touch("textField marked:'#{field_name}'")
+  await_keyboard
+  keyboard_enter_text text_to_type
   sleep(STEP_PAUSE)
 end
 
 Then /^I enter "([^\"]*)" into the "([^\"]*)" (?:text|input) field$/ do |text_to_type, field_name|
-  set_text("textField placeholder:'#{field_name}'", text_to_type)
+  touch("textField marked:'#{field_name}'")
+  await_keyboard
+  keyboard_enter_text text_to_type
   sleep(STEP_PAUSE)
 end
 
@@ -127,24 +131,33 @@ end
 Then /^I enter "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text, index|
   index = index.to_i
   screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-  set_text("textField index:#{index-1}",text)
+  touch("textField index:#{index-1}")
+  await_keyboard()
+  keyboard_enter_text text
+  sleep(STEP_PAUSE)
 end
 
 Then /^I use the native keyboard to enter "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text_to_type, index|
-  macro %Q|I touch text field number #{index}|
+  idx = index.to_i
+  macro %Q|I touch text field number #{idx}|
   await_keyboard()
   keyboard_enter_text(text_to_type)
   sleep(STEP_PAUSE)
 end
 
 When /^I clear "([^\"]*)"$/ do |name|
-  macro %Q|I enter "" into the "#{name}" text field|
+  # definition changed - now uses keyboard_enter_text instead of (deprecated) set_text
+  # macro %Q|I enter "" into the "#{name}" text field|
+  unless ENV['CALABASH_NO_DEPRECATION'] == '1'
+    warn "WARNING: 'When I clear <name>' will be deprecated because it is ambiguous - what should be cleared?"
+  end
+  clear_text("textField marked:'#{name}'")
 end
 
 Then /^I clear (?:input|text) field number (\d+)$/ do |index|
   index = index.to_i
   screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-  set_text("textField index:#{index-1}","")
+  clear_text("textField index:#{index-1}")
 end
 
 # -- See -- #
@@ -176,8 +189,11 @@ Then /^I wait to see a navigation bar titled "([^\"]*)"$/ do |expected_mark|
   end
 end
 
-Then /^I wait for the "([^\"]*)" (?:input|text) field$/ do |placeholder|
-  wait_for(WAIT_TIMEOUT) { element_exists( "textField placeholder:'#{placeholder}'") || element_exists( "textField marked:'#{placeholder}'") }
+Then /^I wait for the "([^\"]*)" (?:input|text) field$/ do |placeholder_or_view_mark|
+  wait_for(WAIT_TIMEOUT) {
+    element_exists( "textField placeholder:'#{placeholder_or_view_mark}'") ||
+          element_exists( "textField marked:'#{placeholder_or_view_mark}'")
+  }
 end
 
 Then /^I wait for (\d+) (?:input|text) field(?:s)?$/ do |count|

data/lib/calabash-cucumber/core.rb

@@ -1,11 +1,13 @@
 require 'httpclient'
 require 'calabash-cucumber/launch/simulator_helper'
 require 'calabash-cucumber/uia'
+require 'calabash-cucumber/ios7_operations'
 
 module Calabash
   module Cucumber
     module Core
       include Calabash::Cucumber::UIA
+      include Calabash::Cucumber::IOS7Operations
 
       DATA_PATH = File.expand_path(File.dirname(__FILE__))
       CAL_HTTP_RETRY_COUNT=3
@@ -14,6 +16,7 @@ module Calabash
                           Errno::ECONNREFUSED, Errno::ECONNRESET, Errno::ECONNABORTED,
                           Errno::ETIMEDOUT]
 
+
       def macro(txt)
         if self.respond_to? :step
           step(txt)
@@ -65,30 +68,16 @@ module Calabash
         map("all #{uiquery}", :query, *args)
       end
 
+
       def touch(uiquery, options={})
+
+
         if (uiquery.is_a?(Array))
           raise "No elements to touch in array" if uiquery.empty?
           uiquery = uiquery.first
         end
         if (uiquery.is_a?(Hash))
-          offset_x = 0
-          offset_y = 0
-          if options[:offset]
-            offset_x += options[:offset][:x] || 0
-            offset_y += options[:offset][:y] || 0
-          end
-          x = offset_x
-          y = offset_y
-          rect = uiquery["rect"] || uiquery[:rect]
-          if rect
-            x += rect['center_x'] || rect[:center_x] || rect[:x] || 0
-            y += rect['center_y'] || rect[:center_y] || rect[:y] || 0
-          else
-            x += uiquery['center_x'] || uiquery[:center_x] || uiquery[:x] || 0
-            y += uiquery['center_y'] || uiquery[:center_y] || uiquery[:y] || 0
-          end
-
-          options[:offset] = {:x => x, :y => y}
+          options[:offset] = point_from(uiquery, options)
           return touch(nil, options)
         end
 
@@ -101,58 +90,74 @@ module Calabash
       end
 
       def do_touch(options)
-        if ENV['OS']=='ios7' || @calabash_launcher && @calabash_launcher.ios_major_version == "7"
-          options[:uia_gesture] = :tap
+        if ios7?
+          touch_ios7(options)
+        else
+          playback("touch", options)
         end
-        playback("touch", options)
       end
 
       def swipe(dir, options={})
-        dir = dir.to_sym
-        @current_rotation = @current_rotation || :down
-        if @current_rotation == :left
-          case dir
-            when :left then
-              dir = :down
-            when :right then
-              dir = :up
-            when :up then
-              dir = :left
-            when :down then
-              dir = :right
-            else
+        if ios7?
+          swipe_ios7(options.merge(:direction => dir))
+        else
+          dir = dir.to_sym
+          current_orientation = device_orientation().to_sym
+          if current_orientation == :left
+            case dir
+              when :left then
+                dir = :down
+              when :right then
+                dir = :up
+              when :up then
+                dir = :left
+              when :down then
+                dir = :right
+              else
+            end
           end
-        end
-        if @current_rotation == :right
-          case dir
-            when :left then
-              dir = :up
-            when :right then
-              dir = :down
-            when :up then
-              dir = :right
-            when :down then
-              dir = :left
-            else
+          if current_orientation == :right
+            case dir
+              when :left then
+                dir = :up
+              when :right then
+                dir = :down
+              when :up then
+                dir = :right
+              when :down then
+                dir = :left
+              else
+            end
           end
-        end
-        if @current_rotation == :up
-          case dir
-            when :left then
-              dir = :right
-            when :right then
-              dir = :left
-            when :up then
-              dir = :down
-            when :down then
-              dir = :up
-            else
+          if current_orientation == :up
+            case dir
+              when :left then
+                dir = :right
+              when :right then
+                dir = :left
+              when :up then
+                dir = :down
+              when :down then
+                dir = :up
+              else
+            end
           end
+          playback("swipe_#{dir}", options)
+        end
+      end
+
+      def pan(from, to, options={})
+        if ios7?
+          pan_ios7(from, to, options)
+        else
+          interpolate "pan", options.merge(:start => from, :end => to)
         end
-        playback("swipe_#{dir}", options)
       end
 
       def cell_swipe(options={})
+        if ios7?
+          raise "cell_swipe not supported on iOS7, simply use swipe with a query that matches the cell"
+        end
         playback("cell_swipe", options)
       end
 
@@ -225,70 +230,119 @@ module Calabash
       end
 
       def pinch(in_out, options={})
-        file = "pinch_in"
-        if in_out.to_sym==:out
-          file = "pinch_out"
+        if ios7?
+          pinch_ios7(in_out.to_sym, options)
+        else
+          file = "pinch_in"
+          if in_out.to_sym==:out
+            file = "pinch_out"
+          end
+          playback(file, options)
+        end
+      end
+
+      def rotation_candidates
+        ['rotate_left_home_down', 'rotate_left_home_left',
+         'rotate_left_home_right', 'rotate_left_home_up',
+         'rotate_right_home_down', 'rotate_right_home_left',
+         'rotate_right_home_right', 'rotate_right_home_up']
+      end
+
+      # orientations refer to home button position
+      #  down ==> bottom
+      #    up ==> top
+      #  left ==> landscape with left home button AKA: _right_ landscape*
+      # right ==> landscape with right home button AKA: _left_ landscape*
+      #
+      # * 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
+        res = device_orientation
+        return res if res.eql? dir
+        rotation_candidates.each { |candidate|
+          #if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
+          #  puts "try to rotate to '#{dir}' using '#{candidate}'"
+          #end
+          playback(candidate)
+          # need a longer sleep for cloud testing
+          sleep(0.5)
+          res = device_orientation
+
+          ### UNEXPECTED ###
+          # 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
+          end
+
+          # return res if res.eql? dir
+        }
+        if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
+          puts "Could not rotate device.  Is rotation enabled in app? Will return 'down'"
         end
-        playback(file, options)
+        'down'
       end
 
-      #Current position of home button
-      def current_rotation
-        @current_rotation
+      def device_orientation(force_down=false)
+        res = map(nil, :orientation, :device).first
+        return res if !res.eql?('unknown')
+        return res if !force_down
+        rotate_home_button_to(:down)
+      end
+
+      def status_bar_orientation
+        map(nil, :orientation, :status_bar).first
       end
 
       def rotate(dir)
-        @current_rotation = @current_rotation || :down
-        rotate_cmd = nil
-        case dir
-          when :left then
-            if @current_rotation == :down
-              rotate_cmd = "left_home_down"
-              @current_rotation = :right
-            elsif @current_rotation == :right
-              rotate_cmd = "left_home_right"
-              @current_rotation = :up
-            elsif @current_rotation == :left
-              rotate_cmd = "left_home_left"
-              @current_rotation = :down
-            elsif @current_rotation == :up
-              rotate_cmd = "left_home_up"
-              @current_rotation = :left
-            end
-          when :right then
-            if @current_rotation == :down
-              rotate_cmd = "right_home_down"
-              @current_rotation = :left
-            elsif @current_rotation == :left
-              rotate_cmd = "right_home_left"
-              @current_rotation = :up
-            elsif @current_rotation == :right
-              rotate_cmd = "right_home_right"
-              @current_rotation = :down
-            elsif @current_rotation == :up
-              rotate_cmd = "right_home_up"
-              @current_rotation = :right
-            end
-        end
+        if ios7?
+          rotate_ios7(dir)
+        else
+          dir = dir.to_sym
+          current_orientation = device_orientation(true).to_sym
+          rotate_cmd = nil
+          case dir
+            when :left then
+              if current_orientation == :down
+                rotate_cmd = "left_home_down"
+              elsif current_orientation == :right
+                rotate_cmd = "left_home_right"
+              elsif current_orientation == :left
+                rotate_cmd = "left_home_left"
+              elsif current_orientation == :up
+                rotate_cmd = "left_home_up"
+              end
+            when :right then
+              if current_orientation == :down
+                rotate_cmd = "right_home_down"
+              elsif current_orientation == :left
+                rotate_cmd = "right_home_left"
+              elsif current_orientation == :right
+                rotate_cmd = "right_home_right"
+              elsif current_orientation == :up
+                rotate_cmd = "right_home_up"
+              end
+          end
 
-        if rotate_cmd.nil?
-          screenshot_and_raise "Does not support rotating #{dir} when home button is pointing #{@current_rotation}"
+          # should this really throw an exception?  shouldn't it just report a
+          # warning and do nothing?
+          if rotate_cmd.nil?
+            screenshot_and_raise "Does not support rotating '#{dir}' when home button is pointing '#{current_orientation}'"
+          end
+          playback("rotate_#{rotate_cmd}")
         end
-        playback("rotate_#{rotate_cmd}")
       end
 
       def background(secs)
-        set_user_pref("__calabash_action", {:action => :background, :duration => secs})
-      end
-
-      def prepare_dialog_action(opts={:dialog => nil, :answer => "Ok"})
-        if opts[:dialog].nil? || opts[:dialog].length < 1
-          raise ":dialog must be specified as a non-empty string (used as regexp to match dialog text)"
-        end
-        txt = opts[:answer] || 'Ok'
-        set_user_pref("__calabash_action", {:action => :dialog,
-                                            :text => opts[:dialog],
-                                            :answer => txt})
+        uia_send_app_to_background(secs)
       end
 
       def move_wheel(opts={})
@@ -348,19 +402,29 @@ module Calabash
         end
       end
 
-
       def load_recording(recording, rec_dir)
-        data = nil
-        if (File.exists?(recording))
-          data = File.read(recording)
-        elsif (File.exists?("features/#{recording}"))
-          data = File.read("features/#{recording}")
-        elsif (File.exists?("#{rec_dir}/#{recording}"))
-          data = File.read("#{rec_dir}/#{recording}")
-        elsif (File.exists?("#{DATA_PATH}/resources/#{recording}"))
-          data = File.read("#{DATA_PATH}/resources/#{recording}")
-        end
-        data
+        directories = playback_file_directories(rec_dir)
+        directories.each { |dir|
+          path = "#{dir}/#{recording}"
+          if File.exists?(path)
+            # useful for debugging recordings, but too verbose for release
+            # suggest (yet) another variable CALABASH_DEBUG_PLAYBACK ?
+            #if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
+            #  puts "found compatible playback: '#{path}'"
+            #end
+            return File.read(path)
+          end
+        }
+        nil
+      end
+
+      def playback_file_directories (rec_dir)
+        # rec_dir is either ENV['PLAYBACK_DIR'] or ./features/playback
+        [File.expand_path(rec_dir),
+         "#{Dir.pwd}",
+         "#{Dir.pwd}/features",
+         "#{Dir.pwd}/features/playback",
+         "#{DATA_PATH}/resources/"].uniq
       end
 
       def load_playback_data(recording_name, options={})
@@ -388,32 +452,48 @@ EOF
           os = "ios#{major}"
         end
 
-        rec_dir = ENV['PLAYBACK_DIR'] || "#{Dir.pwd}/playback"
+        rec_dir = ENV['PLAYBACK_DIR'] || "#{Dir.pwd}/features/playback"
 
-        recording = recording_name_for(recording_name, os, device)
-        data = load_recording(recording, rec_dir)
-
-        if data.nil? and os=="ios6"
-          recording = recording_name_for(recording_name, "ios5", device)
-          data = load_recording(recording, rec_dir)
-        end
+        candidates = []
+        data = find_compatible_recording(recording_name, os, rec_dir, device, candidates)
 
         if data.nil? and device=='ipad'
           if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
             puts "Unable to find recording for #{os} and #{device}. Trying with #{os} iphone"
           end
-          recording = recording_name_for(recording_name, os, 'iphone')
-          data = load_recording(recording, rec_dir)
+          data = find_compatible_recording(recording_name, os, rec_dir, 'iphone', candidates)
         end
 
-
         if data.nil?
-          screenshot_and_raise "Playback not found: #{recording} (searched for #{recording} in #{Dir.pwd}, #{rec_dir}, #{DATA_PATH}/resources"
+          searched_for = "  searched for => \n"
+          candidates.each { |file| searched_for.concat("    * '#{file}'\n") }
+          searched_in = "  in directories =>\n"
+          playback_file_directories(rec_dir).each { |dir| searched_in.concat("    * '#{dir}'\n") }
+          screenshot_and_raise "Playback file not found for: '#{recording_name}'\n#{searched_for}#{searched_in}"
         end
 
         data
       end
 
+      def find_compatible_recording (recording_name, os, rec_dir, device, candidates)
+        recording = recording_name_for(recording_name, os, device)
+        data = load_recording(recording, rec_dir)
+        if data.nil?
+          candidates << recording
+          version_counter = os[-1, 1].to_i
+          loop do
+            version_counter = version_counter - 1
+            break if version_counter < 5
+            loop_os = "ios#{version_counter}"
+            recording = recording_name_for(recording_name, loop_os, device)
+            candidates << recording
+            data = load_recording(recording, rec_dir)
+            break if !data.nil?
+          end
+        end
+        data
+      end
+
       def playback(recording, options={})
         data = load_playback_data(recording)
 
@@ -434,6 +514,7 @@ EOF
         res['results']
       end
 
+      # not called? -jjm 2013-08-16
       def interpolate(recording, options={})
         data = load_playback_data(recording)
 
@@ -484,9 +565,41 @@ EOF
 
         file_name = "#{file_name}_#{os}_#{device}.base64"
         system("/usr/bin/plutil -convert binary1 -o _recording_binary.plist _recording.plist")
-        system("openssl base64 -in _recording_binary.plist -out #{file_name}")
+        system("openssl base64 -in _recording_binary.plist -out '#{file_name}'")
         system("rm _recording.plist _recording_binary.plist")
-        file_name
+
+        rec_dir = ENV['PLAYBACK_DIR'] || "#{Dir.pwd}/features/playback"
+        unless File.directory?(rec_dir)
+          if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
+            puts "creating playback directory at '#{rec_dir}'"
+          end
+          system("mkdir -p #{rec_dir}")
+        end
+
+        system("mv #{file_name} #{rec_dir}")
+        "#{file_name} ==> '#{rec_dir}/#{file_name}'"
+
+      end
+
+      def point_from(query_result, options)
+        offset_x = 0
+        offset_y = 0
+        if options[:offset]
+          offset_x += options[:offset][:x] || 0
+          offset_y += options[:offset][:y] || 0
+        end
+        x = offset_x
+        y = offset_y
+        rect = query_result["rect"] || query_result[:rect]
+        if rect
+          x += rect['center_x'] || rect[:center_x] || rect[:x] || 0
+          y += rect['center_y'] || rect[:center_y] || rect[:y] || 0
+        else
+          x += query_result['center_x'] || query_result[:center_x] || query_result[:x] || 0
+          y += query_result['center_y'] || query_result[:center_y] || query_result[:y] || 0
+        end
+
+        {:x => x, :y => y}
       end
 
       def backdoor(sel, arg)
@@ -507,7 +620,7 @@ EOF
         # or HTTPClient::KeepAliveDisconnected
         # which needs to be suppressed.
         begin
-          http({:method =>:post, :path => 'exit', :retryable_errors => RETRYABLE_ERRORS - [Errno::ECONNREFUSED,HTTPClient::KeepAliveDisconnected]})
+          http({:method => :post, :path => 'exit', :retryable_errors => RETRYABLE_ERRORS - [Errno::ECONNREFUSED, HTTPClient::KeepAliveDisconnected]})
         rescue Errno::ECONNREFUSED, HTTPClient::KeepAliveDisconnected
           []
         end
@@ -541,7 +654,7 @@ EOF
 
       def stop_test_server
         if @calabash_launcher
-           @calabash_launcher.stop
+          @calabash_launcher.stop
         end
       end
 
@@ -595,7 +708,7 @@ EOF
             break
           rescue Exception => e
 
-            if retryable_errors.include?(e) || retryable_errors.any?{|c| e.is_a?(c)}
+            if retryable_errors.include?(e) || retryable_errors.any? { |c| e.is_a?(c) }
 
               if count < CAL_HTTP_RETRY_COUNT-1
                 if e.is_a?(HTTPClient::TimeoutError)