calabash-cucumber 0.9.158 → 0.9.159

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5bfbd9864b3aa54110b7ca5284da7e023ddbb78b
-  data.tar.gz: a7a5084bcf888bd776e7df8bb9d2500db5d19ab3
+  metadata.gz: 0911cf9d43bcfd754b972803519be5c636556be3
+  data.tar.gz: 303e1511ed046dfd7c89b5459dfb84da5f7ba1bb
 SHA512:
-  metadata.gz: 77a27cb69fa24f4b51d659c1c8c1f32c0a408a8e13100eed32fff424dde535a7c67da042f610918dc8ee6580daa3167c8ca2454f494912c1f2ad48e30aaab6b1
-  data.tar.gz: b3ea523d415ebb7d49bee9408a0662d3b37ccdd94b9c9e1aeef0956f30943abe298df0b3329fd6518a3a69c2985b0718e4c48a8e1e933886d1002dbe3f6bea55
+  metadata.gz: ab28b2a1116c354200796982f84435f7a9493eb2de4b93b0d6d7b5fd5530968e70ba2648d59cb50127cdec3ef7aa45044fd9cd6adbccd13b025d9a7a29fac113
+  data.tar.gz: 42d1037e8fb4016e7a1b8d3a9d24ffe01f2f99f28fb3bc77460a5b2ed75220caf687dd68256e285ea701c6a56c0c91be3a42e0ba38d8faebae2767d0d32ae8ba

data/Rakefile

@@ -22,18 +22,27 @@ EOF
     end
 
     FileUtils.cd(dir) do
+      
+      pwd = FileUtils.pwd
+      cmd = "#{pwd}/calabash/gitversioning-before.sh #{pwd}/calabash/LPGitVersionDefines.h"
+      puts cmd
+      `#{cmd}`
+      
       puts 'Building Server'
       cmd = 'xcodebuild build -project calabash.xcodeproj -target Framework -configuration Debug -sdk iphonesimulator7.0'
       puts cmd
       puts `#{cmd}`
 
+      cmd = "#{pwd}/calabash/gitversioning-after.sh #{pwd}/calabash/LPGitVersionDefines.h"
+      puts cmd
+      `#{cmd}`
+      
       unless File.exist?(FRAMEWORK)
         raise 'Unable to build framework'
       end
 
       puts "Zipping down framework"
 
-
       zip_cmd = "zip -q -r #{ZIP_FILE} #{FRAMEWORK}"
       puts zip_cmd
       puts `#{zip_cmd}`

data/features/step_definitions/calabash_steps.rb

@@ -1,3 +1,4 @@
+
 WAIT_TIMEOUT = (ENV['WAIT_TIMEOUT'] || 30).to_f
 STEP_PAUSE = (ENV['STEP_PAUSE'] || 0.5).to_f
 
@@ -182,10 +183,14 @@ Then /^I wait for the "([^\"]*)" button to appear$/ do |name|
   wait_for(WAIT_TIMEOUT) { element_exists( "button marked:'#{name}'" ) }
 end
 
-
 Then /^I wait to see a navigation bar titled "([^\"]*)"$/ do |expected_mark|
-  wait_for(WAIT_TIMEOUT) do
-     query('navigationItemView', :accessibilityLabel).include?(expected_mark)
+  msg = "waited for '#{WAIT_TIMEOUT}' seconds but did not see the navbar with title '#{expected_mark}'"
+  wait_for(:timeout => WAIT_TIMEOUT,
+           :timeout_message => msg ) do
+    all_items = query("navigationItemView marked:'#{expected_mark}'")
+    button_items = query("navigationItemButtonView")
+    non_button_items = all_items.delete_if { |item| button_items.include?(item) }
+    !non_button_items.empty?
   end
 end
 
@@ -426,3 +431,42 @@ end
 Then /^I should see (?:the)? user location$/ do
   check_element_exists("view:'MKUserLocationView'")
 end
+
+### Date Picker ###
+
+# time_str can be in any format that Time can parse
+Then(/^I change the date picker time to "([^"]*)"$/) do |time_str|
+  target_time = Time.parse(time_str)
+  current_date = date_time_from_picker()
+  current_date = DateTime.new(current_date.year,
+                              current_date.mon,
+                              current_date.day,
+                              target_time.hour,
+                              target_time.min,
+                              0,
+                              target_time.gmt_offset)
+  picker_set_date_time current_date
+  sleep(STEP_PAUSE)
+end
+
+# date_str can be in any format that Date can parse
+Then(/^I change the date picker date to "([^"]*)"$/) do |date_str|
+  target_date = Date.parse(date_str)
+  current_time = date_time_from_picker()
+  date_time = DateTime.new(target_date.year,
+                           target_date.mon,
+                           target_date.day,
+                           current_time.hour,
+                           current_time.min,
+                           0,
+                           Time.now.sec,
+                           current_time.offset)
+  picker_set_date_time date_time
+  sleep(STEP_PAUSE)
+end
+
+# date_str can be in any format that Date can parse
+Then(/^I change the date picker date to "([^"]*)" at "([^"]*)"$/) do |date_str, time_str|
+  macro %Q|I change the date picker time to "#{time_str}"|
+  macro %Q|I change the date picker date to "#{date_str}"|
+end

data/lib/calabash-cucumber.rb

@@ -5,3 +5,4 @@ require 'calabash-cucumber/wait_helpers'
 require 'calabash-cucumber/operations'
 require 'calabash-cucumber/version'
 require 'calabash-cucumber/location'
+require 'calabash-cucumber/date_picker.rb'

data/lib/calabash-cucumber/core.rb

@@ -260,22 +260,32 @@ module Calabash
       #   is in left and right landscape orientations
       def rotate_home_button_to(dir)
         dir = dir.to_s
-        res = device_orientation
+        # *** 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
         rotation_candidates.each { |candidate|
-          #if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
-          #  puts "try to rotate to '#{dir}' using '#{candidate}'"
-          #end
+          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
+          # *** 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
@@ -285,7 +295,6 @@ module Calabash
             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'"
@@ -295,6 +304,23 @@ module Calabash
 
       def device_orientation(force_down=false)
         res = map(nil, :orientation, :device).first
+
+        if ['face up', 'face down'].include?(res)
+          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
+
+          return res if !force_down
+          return rotate_home_button_to :down
+        end
+
         return res if !res.eql?('unknown')
         return res if !force_down
         rotate_home_button_to(:down)
@@ -305,40 +331,37 @@ module Calabash
       end
 
       def rotate(dir)
-        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
+        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
 
-          # 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}'"
+        if rotate_cmd.nil?
+          if ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
+            puts "Could not rotate device in direction '#{dir}' with orientation '#{current_orientation} - will do nothing"
           end
+        else
           playback("rotate_#{rotate_cmd}")
         end
       end

data/lib/calabash-cucumber/date_picker.rb

@@ -0,0 +1,154 @@
+require 'date'
+
+module Calabash
+  module Cucumber
+    module DatePicker
+      include Calabash::Cucumber::Core
+
+      # equivalent formats for ruby and objc
+      # we convert DateTime object to a string
+      # and pass the format that objc can use
+      # to convert the string into NSDate
+      RUBY_DATE_AND_TIME_FMT = '%Y_%m_%d_%H_%M'
+      OBJC_DATE_AND_TIME_FMT = 'yyyy_MM_dd_HH_mm'
+
+      # picker modes
+      UI_DATE_PICKER_MODE_TIME = 0
+      UI_DATE_PICKER_MODE_DATE = 1
+      UI_DATE_PICKER_MODE_DATE_AND_TIME = 2
+      UI_DATE_PICKER_MODE_COUNT_DOWN_TIMER = 3
+
+      def date_picker_mode(picker_id=nil)
+        query_str = should_see_date_picker picker_id
+        res = query(query_str, :datePickerMode)
+        if res.empty?
+          screenshot_and_raise "should be able to get mode from picker with query '#{query_str}'"
+        end
+        res.first
+      end
+
+      def time_mode?(picker_id=nil)
+        date_picker_mode(picker_id) == UI_DATE_PICKER_MODE_TIME
+      end
+
+      def date_mode?(picker_id=nil)
+        date_picker_mode(picker_id) == UI_DATE_PICKER_MODE_DATE
+      end
+
+      def date_and_time_mode?(picker_id=nil)
+        date_picker_mode(picker_id) == UI_DATE_PICKER_MODE_DATE_AND_TIME
+      end
+
+      def countdown_mode?(picker_id=nil)
+        date_picker_mode(picker_id) == UI_DATE_PICKER_MODE_COUNT_DOWN_TIMER
+      end
+
+      # ensuring picker is visible
+
+      def query_string_for_picker (picker_id = nil)
+        picker_id.nil? ? 'datePicker' : "datePicker marked:'#{picker_id}'"
+      end
+
+      def should_see_date_picker (picker_id=nil)
+        query_str = query_string_for_picker picker_id
+        if query(query_str).empty?
+          screenshot_and_raise "should see picker with query '#{query_str}'"
+        end
+        query_str
+      end
+
+
+      # minimum and maximum dates
+      # appledoc ==> The property is an NSDate object or nil (the default),
+      # which means no maximum date.
+      def maximum_date_time_from_picker (picker_id = nil)
+        if countdown_mode? picker_id
+          screenshot_and_raise 'method is not available for pickers that are not in date or date time mode'
+        end
+
+        query_str = should_see_date_picker picker_id
+        res = query(query_str, :maximumDate)
+        if res.empty?
+          screenshot_and_raise "should be able to get max date from picker with query '#{query_str}'"
+        end
+        return nil if res.first.nil?
+        DateTime.parse(res.first)
+      end
+
+      # appledoc ==> The property is an NSDate object or nil (the default),
+      # which means no minimum date.
+      def minimum_date_time_from_picker (picker_id = nil)
+        if countdown_mode? picker_id
+          screenshot_and_raise 'method is not available for pickers that are not in date or date time mode'
+        end
+
+        query_str = should_see_date_picker picker_id
+        res = query(query_str, :minimumDate)
+        if res.empty?
+          screenshot_and_raise "should be able to get min date from picker with query '#{query_str}'"
+        end
+        return nil if res.first.nil?
+        DateTime.parse(res.first)
+      end
+
+      # date time from picker
+      def date_time_from_picker (picker_id=nil)
+        if countdown_mode? picker_id
+          screenshot_and_raise 'method is not available for pickers that are not in date or date time mode'
+        end
+        query_str = query_string_for_picker picker_id
+        res = query(query_str, :date)
+        if res.empty?
+          screenshot_and_raise "should be able to get date from picker with query '#{query_str}'"
+        end
+        DateTime.parse(res.first)
+      end
+
+
+      # changing picker date time
+      def args_for_change_date_on_picker(options)
+        args = []
+        if options.has_key?(:notify_targets)
+          args << options[:notify_targets] ? 1 : 0
+        else
+          args << 1
+        end
+
+        if options.has_key?(:animate)
+          args << options[:animate] ? 1 : 0
+        else
+          args << 1
+        end
+        args
+      end
+
+      # expects a DateTime object
+      # notify_targets = true iterates through the target/action pairs and
+      # calls performSelector:<action> object:<target> to simulate a UIEvent
+      def picker_set_date_time (target_dt, options = {:animate => true,
+                                                      :picker_id => nil,
+                                                      :notify_targets => true})
+
+        picker_id = options == nil ? nil : options[:picker_id]
+
+        if time_mode?(picker_id) == UI_DATE_PICKER_MODE_COUNT_DOWN_TIMER
+          pending('picker is in count down mode which is not yet supported')
+        end
+
+        target_str = target_dt.strftime(RUBY_DATE_AND_TIME_FMT).squeeze(' ').strip
+        fmt_str = OBJC_DATE_AND_TIME_FMT
+
+        args = args_for_change_date_on_picker options
+        query_str = query_string_for_picker picker_id
+
+        views_touched = map(query_str, :changeDatePickerDate, target_str, fmt_str, *args)
+
+        if views_touched.empty? or views_touched.member? '<VOID>'
+          screenshot_and_raise "could not change date on picker to '#{target_dt}' using query '#{query_str}' with options '#{options}'"
+        end
+
+        views_touched
+      end
+    end
+  end
+end

data/lib/calabash-cucumber/device.rb

@@ -83,6 +83,12 @@ module Calabash
       def ios5?
         ios_major_version.eql?('5')
       end
+
+      def screen_size
+        return { :width => 768, :height => 1024 } if ipad?
+        return { :width => 320, :height => 568 } if iphone_5?
+        { :width => 320, :height => 480 }
+      end
     end
   end
 end

data/lib/calabash-cucumber/ios7_operations.rb

@@ -19,11 +19,36 @@ module Calabash
           uia_tap_offset(offset)
         else
           el_to_touch = find_or_raise(ui_query)
+          rect = el_to_touch['rect']
+          normalize_rect_for_orientation(rect)
           touch(el_to_touch, options)
           [el_to_touch]
         end
       end
 
+      def normalize_rect_for_orientation(rect)
+        orientation = device_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]
@@ -58,10 +83,6 @@ module Calabash
         [to_result]
       end
 
-      def rotate_ios7(dir)
-        throw NotImplementedError
-      end
-
       def find_or_raise(ui_query)
         results = query(ui_query)
         if results.empty?

data/lib/calabash-cucumber/launch/simulator_helper.rb

@@ -208,13 +208,23 @@ module Calabash
         # Detect case where there is no such sub directory
         # (i.e. iOS only Xamarin project)
         bin_dir = File.join(project_dir, 'bin')
-        if File.directory?(bin_dir) &&
-            (File.directory?(File.join(bin_dir,'iPhoneSimulator')) ||
-             File.directory?(File.join(bin_dir,'iPhone')))
+        if xamarin_ios_bin_dir?(bin_dir)
             return project_dir ## Looks like iOS bin dir is here
         end
 
+        sub_dirs = Dir[File.join(project_dir,'*')].select {|dir| File.directory?(dir)}
+
+        sub_dirs.find do |sub_dir|
+          contains_csproj = Dir[File.join(sub_dir,'*.csproj')].first
+          contains_csproj && xamarin_ios_bin_dir?(File.join(sub_dir,'bin'))
+        end
+
+      end
 
+      def self.xamarin_ios_bin_dir?(bin_dir)
+        File.directory?(bin_dir) &&
+            (File.directory?(File.join(bin_dir,'iPhoneSimulator')) ||
+                File.directory?(File.join(bin_dir,'iPhone')))
       end
 
       def self.bundle_path_from_xamarin_project(device_build_dir='iPhoneSimulator')

data/lib/calabash-cucumber/launcher.rb

@@ -87,7 +87,7 @@ class Calabash::Cucumber::Launcher
 
     if run_with_instruments?(args) && !simulator_target?
       device_tgt = ENV['DEVICE_TARGET']
-      if device_tgt.nil? || device_tgt.downcase == 'device'
+      if detect_connected_device? && (device_tgt.nil? || device_tgt.downcase == 'device')
         device_tgt = RunLoop::Core.detect_connected_device
       end
 
@@ -104,6 +104,10 @@ class Calabash::Cucumber::Launcher
     args
   end
 
+  def detect_connected_device?
+      return ENV['DETECT_CONNECTED_DEVICE'] != '0'
+  end
+
   def default_launch_method
     return :instruments unless sdk_version || use_instruments_env?
     return :instruments if sdk_version.start_with?('7') # Only instruments supported for iOS7+

data/lib/calabash-cucumber/operations.rb

@@ -9,6 +9,7 @@ require 'test/unit/assertions'
 require 'json'
 require 'set'
 require 'calabash-cucumber/version'
+require 'calabash-cucumber/date_picker'
 
 
 if not Object.const_defined?(:CALABASH_COUNT)
@@ -26,8 +27,7 @@ module Calabash
       include Calabash::Cucumber::WaitHelpers
       include Calabash::Cucumber::KeyboardHelpers
       include Calabash::Cucumber::Location
-
-
+      include Calabash::Cucumber::DatePicker
 
       def page(clz,*args)
         clz.new(self,*args)
@@ -51,7 +51,6 @@ module Calabash
         str.gsub("'", "\\\\'")
       end
 
-
       def label(uiquery)
         query(uiquery, :accessibilityLabel)
       end
@@ -111,51 +110,6 @@ module Calabash
         res['results'].first
       end
 
-      # ha!  i recognize this code - jjm
-      #not officially supported yet
-      #def change_slider_value_to(q, value)
-      #  target = value.to_f
-      #  if target < 0
-      #    pending "value '#{value}' must be >= 0"
-      #  end
-      #  min_val = query(q, :minimumValue).first
-      #  # will not work for min_val != 0
-      #  if min_val != 0
-      #    screenshot_and_raise "sliders with non-zero minimum values are not supported - slider '#{q}' has minimum value of '#{min_val}'"
-      #  end
-      #  max_val = query(q, :maximumValue).first
-      #  if target > max_val
-      #    screenshot_and_raise "cannot change slider '#{q}' to '#{value}' because the maximum allowed value is '#{max_val}'"
-      #  end
-      #
-      #  val = query(q, :value).first
-      #  # the x offset is from the middle of the slider.
-      #  # ex.  slider from 0 to 5
-      #  #      to touch 3, x must be 0
-      #  #      to touch 0, x must be -2.5
-      #  #      to touch 5, x must be 2.5
-      #  width = query(q, :frame).first["width"] - 10
-      #
-      #  cur_x = -width/2.0 + val*width
-      #  tgt_x = -width/2.0 + target*width
-      #
-      #  interpolate("slide", :start =>q, :end => q,
-      #              :offset_end => {:x => tgt_x, :y => 1},
-      #              :offset_start => {:x => cur_x, :y => -1})
-      #  sleep(0.1)
-      #
-      #  val = query(q, :value).first
-      #  cur_x = -width/2.0 + val*width
-      #  tgt_x = -width/2.0 + target*width
-      #
-      #  interpolate("slide", :start =>q, :end => q,
-      #              :offset_end => {:x => tgt_x, :y => 1},
-      #              :offset_start => {:x => cur_x, :y => -1})
-      #
-      #
-      #end
-
-
       #def screencast_begin
       #   http({:method=>:post, :path=>'screencast'}, {:action => :start})
       #end
@@ -167,8 +121,6 @@ module Calabash
       #  end
       #  file_name
       #end
-
-
     end
   end
 end

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.158'
-    FRAMEWORK_VERSION = '0.9.155'
+    VERSION = '0.9.159'
+    FRAMEWORK_VERSION = '0.9.159'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.158
+  version: 0.9.159
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -229,6 +229,7 @@ files:
 - lib/calabash-cucumber/calabash_steps.rb
 - lib/calabash-cucumber/core.rb
 - lib/calabash-cucumber/cucumber.rb
+- lib/calabash-cucumber/date_picker.rb
 - lib/calabash-cucumber/device.rb
 - lib/calabash-cucumber/ibase.rb
 - lib/calabash-cucumber/ios7_operations.rb