calabash-cucumber 0.9.163.pre11 → 0.9.163

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a3a488993902bfbb00390bc250e3c1bd67863115
-  data.tar.gz: 838d8084acb6139715dbf5f8597cd6255f603f8e
+  metadata.gz: 8e46355e0ae02bee56543532987c7b907f58398e
+  data.tar.gz: 10e5addcfae303f65b9abfbfa65609cd075b1bd8
 SHA512:
-  metadata.gz: ca26a0000569e4729514796fa4273178096df47e647d2fcba6688bc429d3a8d1d21d4da144881a3431e38a2b59cf8f5d12ce91bd5e17fbfe2cb7242ed41d39a7
-  data.tar.gz: 39743981fa30de194e00ef53a538d561a0bba9025102fafc139253c8c64a4e47de539c457febe6481d95113b6420099d8e5747a2126c7e1c38e0a8b2ec70a899
+  metadata.gz: 879217db665a6c5b6279abed8e3ae98ddd8e2654ad8b28b67953375401a9ba808f17e53b6e6ff03cf23e89522ec7d4afc5d522e8ab97fe565a2a8a534f824cdb
+  data.tar.gz: 98c78b78a519fe5529616faeab0334b936198503f889ba1b1b81942cd5ec971883b4f9a2d202efabcfe08ac6ad539248f8298f0513f23b013250a1d5d6c5e6c7

data/bin/calabash-ios-setup.rb

@@ -239,8 +239,8 @@ def validate_ipa(ipa)
     end
 
     app_dir = Dir.foreach("#{dir}/Payload").find {|d| /\.app$/.match(d)}
-    app = app_dir.split(".")[0]
-    res = `otool "#{File.expand_path(dir)}/Payload/#{app_dir}/#{app}" -o 2> /dev/null | grep CalabashServer`
+
+    res = `otool "#{File.expand_path(dir)}/Payload/#{app_dir}/"* -o 2> /dev/null | grep CalabashServer`
     msg("Info") do
       if /CalabashServer/.match(res)
         puts "Ipa: #{ipa} *contains* calabash.framework"

data/calabash-cucumber.gemspec

@@ -26,8 +26,8 @@ Gem::Specification.new do |s|
   s.add_dependency( "geocoder", "~>1.1.8")
   s.add_dependency( "httpclient","~> 2.3.3")
   s.add_dependency( "bundler", "~> 1.1")
-  s.add_dependency( "run_loop", "~> 0.1.0.pre8" )
+  s.add_dependency( "run_loop", "~> 0.1.0" )
   s.add_dependency( "awesome_print")
-  s.add_dependency( "xamarin-test-cloud", "~> 0.9.25")
+  s.add_dependency( "xamarin-test-cloud", "~> 0.9.27")
 
 end

data/features/step_definitions/calabash_steps.rb

@@ -98,14 +98,14 @@ end
 
 Then /^I enter "([^\"]*)" into the "([^\"]*)" field$/ do |text_to_type, field_name|
   touch("textField marked:'#{field_name}'")
-  await_keyboard
+  wait_for_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|
   touch("textField marked:'#{field_name}'")
-  await_keyboard
+  wait_for_keyboard()
   keyboard_enter_text text_to_type
   sleep(STEP_PAUSE)
 end
@@ -117,7 +117,7 @@ end
 
 Then /^I use the native keyboard to enter "([^\"]*)" into the "([^\"]*)" (?:text|input) field$/ do |text_to_type, field_name|
   macro %Q|I touch the "#{field_name}" text field|
-  await_keyboard()
+  wait_for_keyboard()
   keyboard_enter_text(text_to_type)
   sleep(STEP_PAUSE)
 end
@@ -132,7 +132,7 @@ Then /^I enter "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text, ind
   index = index.to_i
   screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
   touch("textField index:#{index-1}")
-  await_keyboard()
+  wait_for_keyboard()
   keyboard_enter_text text
   sleep(STEP_PAUSE)
 end
@@ -140,17 +140,14 @@ end
 Then /^I use the native keyboard to enter "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text_to_type, index|
   idx = index.to_i
   macro %Q|I touch text field number #{idx}|
-  await_keyboard()
+  wait_for_keyboard()
   keyboard_enter_text(text_to_type)
   sleep(STEP_PAUSE)
 end
 
 When /^I clear "([^\"]*)"$/ do |name|
-  # 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
+  msg = "When I clear <name>' will be deprecated because it is ambiguous - what should be cleared?"
+  _deprecated('0.9.151', msg, :warn)
   clear_text("textField marked:'#{name}'")
 end
 

data/lib/calabash-cucumber.rb

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

data/lib/calabash-cucumber/core.rb

@@ -1,10 +1,11 @@
 require 'httpclient'
 require 'json'
 require 'geocoder'
+require 'calabash-cucumber/uia'
+require 'calabash-cucumber/environment_helpers'
 require 'calabash-cucumber/connection'
 require 'calabash-cucumber/connection_helpers'
 require 'calabash-cucumber/launch/simulator_helper'
-require 'calabash-cucumber/uia'
 require 'calabash-cucumber/query_helpers'
 require 'calabash-cucumber/playback_helpers'
 require 'calabash-cucumber/failure_helpers'
@@ -15,6 +16,7 @@ require 'calabash-cucumber/map'
 module Calabash
   module Cucumber
     module Core
+      include Calabash::Cucumber::EnvironmentHelpers
       include Calabash::Cucumber::ConnectionHelpers
       include Calabash::Cucumber::QueryHelpers
       include Calabash::Cucumber::FailureHelpers
@@ -50,10 +52,10 @@ module Calabash
       end
 
       def query_all(uiquery, *args)
-        unless ENV['CALABASH_NO_DEPRECATION'] == '1'
-          puts "query_all is deprecated. Use the new all/visible feature."
-          puts "see: https://github.com/calabash/calabash-ios/wiki/05-Query-syntax"
-        end
+        msg0 = "use the 'all' or 'visible' query language feature"
+        msg1 = 'see: https://github.com/calabash/calabash-ios/wiki/05-Query-syntax'
+        msg = "#{msg0}\n#{msg1}"
+        _deprecated('0.9.133', msg, :warn)
         map("all #{uiquery}", :query, *args)
       end
 
@@ -84,7 +86,7 @@ module Calabash
       end
 
       def swipe(dir, options={})
-        unless uia?
+        unless uia_available?
           options = options.merge(:status_bar_orientation => status_bar_orientation)
         end
         launcher.actions.swipe(dir.to_sym, options)
@@ -100,8 +102,8 @@ module Calabash
 
 
       def cell_swipe(options={})
-        if uia?
-          raise "cell_swipe not supported with instruments, simply use swipe with a query that matches the cell"
+        if uia_available?
+          raise 'cell_swipe not supported with instruments, simply use swipe with a query that matches the cell'
         end
         playback('cell_swipe', options)
       end
@@ -114,36 +116,36 @@ module Calabash
 
       def scroll_to_row(uiquery, number)
         views_touched=map(uiquery, :scrollToRow, number)
-        if views_touched.empty? or views_touched.member? "<VOID>"
+        if views_touched.empty? or views_touched.member? '<VOID>'
           screenshot_and_raise "Unable to scroll: '#{uiquery}' to: #{number}"
         end
         views_touched
       end
 
-      def scroll_to_cell(options={:query => "tableView",
+      def scroll_to_cell(options={:query => 'tableView',
                                   :row => 0,
                                   :section => 0,
                                   :scroll_position => :top,
                                   :animate => true})
-        uiquery = options[:query] || "tableView"
+        uiquery = options[:query] || 'tableView'
         row = options[:row]
         sec = options[:section]
         if row.nil? or sec.nil?
-          raise "You must supply both :row and :section keys to scroll_to_cell"
+          raise 'You must supply both :row and :section keys to scroll_to_cell'
         end
 
         args = []
         if options.has_key?(:scroll_position)
           args << options[:scroll_position]
         else
-          args << "top"
+          args << 'top'
         end
         if options.has_key?(:animate)
           args << options[:animate]
         end
         views_touched=map(uiquery, :scrollToRow, row.to_i, sec.to_i, *args)
 
-        if views_touched.empty? or views_touched.member? "<VOID>"
+        if views_touched.empty? or views_touched.member? '<VOID>'
           screenshot_and_raise "Unable to scroll: '#{uiquery}' to: #{options}"
         end
         views_touched
@@ -179,7 +181,7 @@ module Calabash
       end
 
       def set_location(options)
-        if uia?
+        if uia_available?
           uia_set_location(options)
         else
           if options[:place]
@@ -216,14 +218,14 @@ module Calabash
       end
 
       def move_wheel(opts={})
-        q = opts[:query] || "pickerView"
+        q = opts[:query] || 'pickerView'
         wheel = opts[:wheel] || 0
         dir = opts[:dir] || :down
 
-        raise "Wheel index must be non negative" if wheel < 0
+        raise 'Wheel index must be non negative' if wheel < 0
         raise "Only up and down supported :dir (#{dir})" unless [:up, :down].include?(dir)
 
-        if ENV['OS'] == "ios4"
+        if ENV['OS'] == 'ios4'
           playback "wheel_#{dir}", :query => "#{q} pickerTable index:#{wheel}"
         elsif ios7?
           raise NotImplementedError
@@ -233,8 +235,8 @@ module Calabash
 
       end
 
-      def picker(opts={:query => "pickerView", :action => :texts})
-        raise "Not implemented" unless opts[:action] == :texts
+      def picker(opts={:query => 'pickerView', :action => :texts})
+        raise 'Not implemented' unless opts[:action] == :texts
 
         q = opts[:query]
 
@@ -269,8 +271,8 @@ module Calabash
 
       def backdoor(sel, arg)
         json = {
-            :selector => sel,
-            :arg => arg
+              :selector => sel,
+              :arg => arg
         }
         res = http({:method => :post, :path => 'backdoor'}, json)
         res = JSON.parse(res)
@@ -310,21 +312,15 @@ module Calabash
         stop_test_server
       end
 
-      def default_device
-        l = Calabash::Cucumber::Launcher.launcher_if_used
-        l && l.device
-      end
-
-      def uia?
-        Calabash::Cucumber::Launcher.instruments?
-      end
 
       def console_attach
-        launcher.attach
+        # setting the @calabash_launcher here for backward compatibility
+        @calabash_launcher = launcher.attach
       end
 
       def launcher
-        Calabash::Cucumber::Launcher.launcher
+        # setting the @calabash_launcher here for backward compatibility
+        @calabash_launcher = Calabash::Cucumber::Launcher.launcher
       end
 
       def query_action_with_options(action, uiquery, options)
@@ -343,12 +339,12 @@ module Calabash
 
       def prepare_query_options(uiquery, options)
         opts = options.dup
-        if (uiquery.is_a?(Array))
+        if uiquery.is_a?(Array)
           raise 'No elements in array' if uiquery.empty?
           uiquery = uiquery.first
         end #this is deliberately not elsif (uiquery.first could be a hash)
 
-        if (uiquery.is_a?(Hash))
+        if uiquery.is_a?(Hash)
           opts[:offset] = point_from(uiquery, options)
           uiquery = nil
         end
@@ -359,3 +355,4 @@ module Calabash
     end
   end
 end
+

data/lib/calabash-cucumber/device.rb

@@ -2,10 +2,8 @@ require 'json'
 
 module Calabash
   module Cucumber
-    # Class device encapsulates information about the device or devices
-    # we are interacting with during a test.
-    # Credit: Due to jmoody's briar: https://github.com/jmoody/briar/blob/master/lib/briar/gestalt.rb
-
+    # Class device encapsulates information about the device or devices we are
+    # interacting with during a test.
     class Device
 
       GESTALT_IPHONE = 'iPhone'
@@ -14,12 +12,12 @@ module Calabash
       GESTALT_SIM_SYS = 'x86_64'
       GESTALT_IPOD = 'iPod'
 
-
       attr_reader :endpoint
       attr_reader :device_family
       attr_reader :simulator_details, :ios_version
       attr_reader :system
       attr_reader :framework_version
+      attr_reader :iphone_app_emulated_on_ipad
 
       attr_accessor :udid
 
@@ -31,6 +29,7 @@ module Calabash
         @simulator_details = version_data['simulator']
         @ios_version = version_data['iOS_version']
         @framework_version = version_data['version']
+        @iphone_app_emulated_on_ipad = version_data['iphone_app_emulated_on_ipad']
       end
 
       def simulator?
@@ -89,6 +88,10 @@ module Calabash
         return { :width => 320, :height => 568 } if iphone_5?
         { :width => 320, :height => 480 }
       end
+
+      def iphone_app_emulated_on_ipad?
+        iphone_app_emulated_on_ipad
+      end
     end
   end
 end

data/lib/calabash-cucumber/environment_helpers.rb

@@ -0,0 +1,205 @@
+require 'calabash-cucumber/device'
+require 'calabash-cucumber/launcher'
+
+module Calabash
+  module Cucumber
+    module EnvironmentHelpers
+
+
+      # returns +true+ if UIAutomation functions are available
+      #
+      # UIAutomation is only available if the app has been launched with
+      # Instruments
+      def uia_available?
+        Calabash::Cucumber::Launcher.instruments?
+      end
+
+      # returns +true+ if UIAutomation functions are not available
+      #
+      # UIAutomation is only available if the app has been launched with
+      # Instruments
+      def uia_not_available?
+        not uia_available?
+      end
+
+      # returns +true+ if cucumber is running in the test cloud
+      def xamarin_test_cloud?
+        ENV['XAMARIN_TEST_CLOUD'] == '1'
+      end
+
+      # returns the default Device
+      def default_device
+        l = Calabash::Cucumber::Launcher.launcher_if_used
+        l && l.device
+      end
+
+      # returns +true+ if the target device is an ipad
+      #
+      # raises an error if the server cannot be reached
+      def ipad?
+        _default_device_or_create().ipad?
+      end
+
+      # returns +true+ if the target device is an iphone
+      #
+      # raises an error if the server cannot be reached
+      def iphone?
+        _default_device_or_create().iphone?
+      end
+
+      # returns +true+ if the target device is an ipod
+      #
+      # raises an error if the server cannot be reached
+      def ipod?
+        _default_device_or_create().ipod?
+      end
+      
+      # returns +true+ if the target device is an iphone or ipod
+      #
+      # raises an error if the server cannot be reached
+      def device_family_iphone?
+        iphone? or ipod?
+      end
+
+      # returns +true+ if the target device is a simulator (not a physical device)
+      #
+      # raises an error if the server cannot be reached
+      def simulator?
+        _default_device_or_create().simulator?
+      end
+
+      # returns +true+ if the target device or simulator is a 4in model
+      #
+      # raises an error if the server cannot be reached
+      def iphone_5?
+        _default_device_or_create().iphone_5?
+      end
+
+      # returns +true+ if the target device or simulator is a 4in model
+      #
+      # raises an error if the server cannot be reached
+      def iphone_4in?
+        iphone_5?
+      end
+
+      # returns +true+ if the OS major version is 5
+      #
+      # raises an error if the server cannot be reached
+      #
+      # WARNING: setting the +OS+ env variable will override the value returned
+      #          by querying the device
+      def ios5?
+        _OS_ENV.eql?(_canonical_os_version(:ios5)) || _default_device_or_create().ios5?
+      end
+
+      # returns +true+ if the OS major version is 6
+      #
+      # raises an error if the server cannot be reached
+      #
+      # WARNING: setting the +OS+ env variable will override the value returned
+      #          by querying the device
+      def ios6?
+        _OS_ENV.eql?(_canonical_os_version(:ios6)) || _default_device_or_create().ios6?
+      end
+
+
+      # returns +true+ if the OS major version is 7
+      #
+      # raises an error if the server cannot be reached
+      #
+      # WARNING: setting the +OS+ env variable will override the value returned
+      #          by querying the device
+      def ios7?
+        _OS_ENV.eql?(_canonical_os_version(:ios7)) || _default_device_or_create().ios7?
+      end
+
+      # returns +true+ if the app is an iphone app emulated on an ipad
+      #
+      # raises an error if the server cannot be reached
+      def iphone_app_emulated_on_ipad?
+        _default_device_or_create().iphone_app_emulated_on_ipad?
+      end
+
+      # returns +true+ if the <tt>CALABASH_NO_DEPRECATION</tt> variable is set
+      # to +1+
+      def no_deprecation_warnings?
+        ENV['CALABASH_NO_DEPRECATION'] == '1'
+      end
+
+      # returns +true+ if the <tt>CALABASH_FULL_CONSOLE_OUTPUT</tt> is set to
+      # +1+
+      def full_console_logging?
+        ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == '1'
+      end
+
+      # returns +true+ if the <tt>DEBUG</tt> is set to +1+
+      def debug_logging?
+        ENV['DEBUG'] == '1'
+      end
+
+
+
+      # prints a deprecated message that includes the line number
+      #   +version+ string indicating when the feature was deprecated
+      #   +msg+ deprecation message (possibly suggesting alternatives)
+      #   +type+ <tt>{ :warn | :pending }</tt> - <tt>:pending</tt> will raise a
+      #          cucumber pending exception
+      #
+      # if ENV['CALABASH_NO_DEPRECATION'] == '1' then this method is a nop
+      def _deprecated(version, msg, type)
+        allowed = [:pending, :warn]
+        unless allowed.include?(type)
+          screenshot_and_raise "type '#{type}' must be on of '#{allowed}'"
+        end
+
+        unless no_deprecation_warnings?
+
+          stack = Kernel.caller(0, 6)[1..-1].join("\n")
+          msg = "deprecated '#{version}' - '#{msg}'\n#{stack}"
+
+          if type.eql?(:pending)
+            pending(msg)
+          else
+            # todo deprecated function does not output on a new line when called within cucumber
+            begin
+              warn "\033[34m\nWARN: #{msg}\033[0m"
+            rescue
+              warn "\nWARN: #{msg}"
+            end
+          end
+        end
+      end
+
+      private
+      # returns the device that is currently being tested against
+      #
+      # returns the +device+ attr of <tt>Calabash::Cucumber::Launcher</tt> if
+      # it is defined.  otherwise, creates a new <tt>Calabash::Cucumber::Device</tt>
+      # by querying the server.
+      #
+      # raises an error if the server cannot be reached
+      def _default_device_or_create
+        device = default_device
+        if device.nil?
+          device = Calabash::Cucumber::Device.new(nil, server_version())
+        end
+        device
+      end
+
+      # returns the value of the environmental variable +OS+
+      def _OS_ENV
+        ENV['OS']
+      end
+
+      CANONICAL_IOS_VERSIONS = {:ios5 => 'ios5',
+                                :ios6 => 'ios6',
+                                :ios7 => 'ios7'}
+
+
+      # returns the canonical value iOS versions as strings
+      def _canonical_os_version(key)
+        CANONICAL_IOS_VERSIONS[key]
+      end
+    end
+  end
+end