calabash-cucumber 0.9.169.pre2 → 0.9.169.pre5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c860c07a3b899e7aa1ee325f1dfc8bcd047ae2e6
-  data.tar.gz: 564980de6ded2290c81e2b6c6348ce2f649e553c
+  metadata.gz: 5720c3a1025782b5d07f6b2283414c8b2e0986a0
+  data.tar.gz: 556933f7a91bcb3a05539d9048daf2360e550512
 SHA512:
-  metadata.gz: b08713ae250a8b54b24e05f89a4b41f015f6483932289a2b4f0806260d90c6d0ada14773afe9acac2026beaf003d04f9246597efea055a771eb080cf48fa1b62
-  data.tar.gz: 735c45b24c1bdd1dd67a89653f8a31397542426352b6fbde2b638ff59e457839f7ac55005b371a4d4fa449473b8cce19a9237126d74cde1439d656d4214fcc9d
+  metadata.gz: bd03a7ed163acfa246b53da1a8ee41a181e968f9e6f5d0594bbeba4480a1901be7939392b04f6088a69f3536ec7f4dc9ec12199339873eeeedd1eb207fbe2e99
+  data.tar.gz: 21367d4e5a072e303f70bb26b75c254906df900c80f4af75d8c76b08780d72e673f1983320ca6f6f98a571ce57311afe851e4d12547ff5ae6344c98606f922ec

data/Rakefile

@@ -1,9 +1,22 @@
-require 'bundler'
 require 'fileutils'
 
+require 'bundler'
 Bundler::GemHelper.install_tasks
 
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new
+task :test => :spec
 
+# REQUIRES that the calabash-ios-server source code is located
+#
+#   ../../calabash-ios-server.
+#
+# if your server source code is in a different location, you can use:
+#
+# $ CALABASH_SERVER_PATH=/your/path rake build_server'
+#
+# to specify an alternative server location
+desc 'build the calabash.framework and install it in ./staticlib/.'
 task :build_server do
 
   FRAMEWORK='calabash.framework'

data/bin/calabash-ios-setup.rb

@@ -154,9 +154,7 @@ def setup_project(project_name, project_path, path)
 
 end
 
-
-
-require 'calabash-cucumber/launch/simulator_helper'
+require 'calabash-cucumber/launch/simulator_launcher'
 def validate_setup(args)
   if args.length > 0
     if args[0].end_with?(".ipa")
@@ -170,7 +168,7 @@ def validate_setup(args)
       exit 1
     end
   else
-    dd_dir = Calabash::Cucumber::SimulatorHelper.derived_data_dir_for_project
+    dd_dir = Calabash::Cucumber::SimulatorLauncher.new().derived_data_dir_for_project
       if not dd_dir
         puts "Unable to find iOS XCode project."
         puts "You should run this command from an XCode project directory."

data/bin/calabash-ios-sim.rb

@@ -1,52 +1,22 @@
-require 'sim_launcher'
-require 'calabash-cucumber/launch/simulator_helper'
+require 'calabash-cucumber/utils/simulator_accessibility'
+require 'calabash-cucumber/utils/logging'
+
+include Calabash::Cucumber::Logging
+include Calabash::Cucumber::SimulatorAccessibility
 
 def quit_sim
-  `echo 'application "iPhone Simulator" quit' | osascript`
+  _deprecated('0.9.169', 'use Calabash::Cucumber::SimulatorAccessibility.quit_simulator', :warn)
+  quit_simulator
 end
 
 def calabash_sim_reset
-  reset_script = File.expand_path("#{@script_dir}/reset_simulator.scpt")
-  app_path = File.expand_path("#{@script_dir}/EmptyAppHack.app")
-  launcher = SimLauncher::Simulator.new
-
-  sdks = ENV['SDK_VERSIONS']
-  if sdks
-    sdks = sdks.split(",")
-  else
-    sdks = SimLauncher::SdkDetector.new(launcher).available_sdk_versions
-  end
-
-
-  sdks.each do |sdk|
-    launcher.launch_ios_app(app_path, sdk, ENV['DEVICE'] || 'iphone')
-    puts `osascript #{reset_script}`
-  end
-
-
+  reset_simulator_content_and_settings
 end
 
 def calabash_sim_accessibility
-  Calabash::Cucumber::SimulatorHelper.stop
-  old = ['5.*','6.*','7.0*'].map do |x|
-    Dir.glob(File.join(File.expand_path("~/Library"), "Application Support", "iPhone Simulator", "7.0*", "Library", "Preferences"))
-  end.flatten
-
-  rest = Dir.glob(File.join(File.expand_path("~/Library"), "Application Support", "iPhone Simulator", "*.*", "Library", "Preferences"))
-  rest = rest - old
-  (old+rest).each do |sim_pref_dir|
-    fp = File.expand_path("#{@script_dir}/data/")
-    if rest.include?(sim_pref_dir)
-      tgt = 'com.apple.Accessibility-5.1.plist'
-    else
-      tgt = 'com.apple.Accessibility.plist'
-    end
-    FileUtils.cp("#{fp}/#{tgt}", File.join(sim_pref_dir, 'com.apple.Accessibility.plist'))
-  end
-
+  enable_accessibility_on_simulators
 end
 
-
 def calabash_sim_location(args)
 
   if args.length == 0
@@ -136,7 +106,7 @@ end
 
 
 def calabash_sim_device(args)
-  quit_sim
+  quit_simulator
   options = ["iPad", "iPad_Retina", "iPhone", "iPhone_Retina", "iPhone_Retina_4inch"]
   if args.length != 1 or not options.find { |x| x == args[0] }
     print_usage

data/calabash-cucumber.gemspec

@@ -1,33 +1,36 @@
 # -*- encoding: utf-8 -*-
-$:.push File.expand_path("../lib", __FILE__)
-require "calabash-cucumber/version"
+$:.push File.expand_path('../lib', __FILE__)
+require 'calabash-cucumber/version'
 
 Gem::Specification.new do |s|
-  s.name        = "calabash-cucumber"
+  s.name        = 'calabash-cucumber'
   s.version     = Calabash::Cucumber::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Karl Krukow"]
-  s.email       = ["karl@lesspainful.com"]
-  s.homepage    = "http://calaba.sh"
+  s.authors     = ['Karl Krukow']
+  s.email       = ['karl@lesspainful.com']
+  s.homepage    = 'http://calaba.sh'
   s.summary     = %q{Client for calabash-ios-server for automated functional testing on iOS}
   s.description = %q{calabash-cucumber drives tests for native iOS apps. You must link your app with calabash-ios-server framework to execute tests.}
-  s.files         = `git ls-files`.split("\n").concat(["staticlib/calabash.framework.zip"])
+  s.files         = `git ls-files`.split("\n").concat(['staticlib/calabash.framework.zip'])
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
-  s.executables   = "calabash-ios"
-  s.require_paths = ["lib"]
+  s.executables   = 'calabash-ios'
+  s.require_paths = ['lib']
 
-  s.add_dependency( "cucumber", "~> 1.3.0" )
-  s.add_dependency( "calabash-common", "~> 0.0.1" )
-  s.add_dependency( "json" )
-  s.add_dependency( 'edn')
-  s.add_dependency( "CFPropertyList" )
-  s.add_dependency( "sim_launcher", "~> 0.4.9")
-  s.add_dependency( "slowhandcuke" )
-  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.2.0" )
-  s.add_dependency( "awesome_print")
-  s.add_dependency( "xamarin-test-cloud", "~> 0.9.27")
+  s.add_dependency('cucumber', '~> 1.3.0')
+  s.add_dependency('calabash-common', '~> 0.0.1')
+  s.add_dependency('json')
+  s.add_dependency('edn')
+  s.add_dependency('CFPropertyList')
+  s.add_dependency('sim_launcher', '~> 0.4.9')
+  s.add_dependency('slowhandcuke')
+  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.2.1.pre1')
+  s.add_dependency('awesome_print')
+  s.add_dependency('xamarin-test-cloud', '~> 0.9.27')
+
+  s.add_development_dependency 'rake'
+  s.add_development_dependency 'rspec'
 
 end

data/features-skeleton/support/01_launch.rb

@@ -43,6 +43,6 @@ end
 at_exit do
   launcher = Calabash::Cucumber::Launcher.new
   if launcher.simulator_target?
-    Calabash::Cucumber::SimulatorHelper.stop unless launcher.calabash_no_stop?
+    launcher.simulator_launcher.stop unless launcher.calabash_no_stop?
   end
 end

data/lib/calabash-cucumber.rb

@@ -6,4 +6,16 @@ require 'calabash-cucumber/wait_helpers'
 require 'calabash-cucumber/operations'
 require 'calabash-cucumber/version'
 require 'calabash-cucumber/date_picker'
-require 'calabash-cucumber/ipad_1x_2x'
+require 'calabash-cucumber/ipad_1x_2x'
+require 'calabash-cucumber/utils/logging'
+
+# stubs for documentation
+
+# base module for Calabash iOS
+module Calabash
+  # base sub module
+  # todo in 1.0 release consider changing Cucumber module to iOS module
+  module Cucumber
+
+  end
+end

data/lib/calabash-cucumber/actions/instruments_actions.rb

@@ -13,10 +13,6 @@ class Calabash::Cucumber::InstrumentsActions
     query_action(options, :uia_tap_offset)
   end
 
-  def tap(options)
-    uia_tap_server(options[:query], options)
-  end
-
   def double_tap(options)
     query_action(options, :uia_double_tap_offset)
   end

data/lib/calabash-cucumber/actions/playback_actions.rb

@@ -13,10 +13,6 @@ class Calabash::Cucumber::PlaybackActions
     playback('touch', options)
   end
 
-  def tap(options)
-    touch(options)
-  end
-
   def double_tap(options)
     playback('double_tap', options)
   end

data/lib/calabash-cucumber/core.rb

@@ -5,17 +5,25 @@ 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/launch/simulator_launcher'
 require 'calabash-cucumber/query_helpers'
 require 'calabash-cucumber/playback_helpers'
 require 'calabash-cucumber/failure_helpers'
 require 'calabash-cucumber/status_bar_helpers'
 require 'calabash-cucumber/rotation_helpers'
 require 'calabash-cucumber/map'
+require 'calabash-cucumber/utils/logging'
+
+
+# legacy support - module was deprecated 0.9.169
+# replaced with simulator-launcher
+require 'calabash-cucumber/launch/simulator_helper'
 
 module Calabash
   module Cucumber
     module Core
+
+      include Calabash::Cucumber::Logging
       include Calabash::Cucumber::EnvironmentHelpers
       include Calabash::Cucumber::ConnectionHelpers
       include Calabash::Cucumber::QueryHelpers
@@ -26,7 +34,6 @@ module Calabash
       include Calabash::Cucumber::RotationHelpers
       include Calabash::Cucumber::PlaybackHelpers
 
-
       def macro(txt)
         if self.respond_to? :step
           step(txt)
@@ -39,10 +46,6 @@ module Calabash
         map(uiquery, :query, *args)
       end
 
-      def q(uiquery, *args)
-        query(uiquery, *args)
-      end
-
       # causes all views matched by the +query+ to briefly change colors making
       # them visually identifiable.
       #
@@ -78,16 +81,6 @@ module Calabash
         query_action_with_options(:touch, uiquery, options)
       end
 
-      def tap_q(uiquery, options={})
-        _uiquery, options = extract_query_and_options(uiquery, options)
-        launcher.actions.tap(options)
-      end
-
-      def t(uiquery, options={})
-        tap_q(uiquery, options)
-      end
-
-
       def double_tap(uiquery, options={})
         query_action_with_options(:double_tap, uiquery, options)
       end

data/lib/calabash-cucumber/device.rb

@@ -1,4 +1,5 @@
 require 'json'
+require 'calabash-cucumber/utils/logging'
 
 module Calabash
   module Cucumber
@@ -6,6 +7,8 @@ module Calabash
     # interacting with during a test.
     class Device
 
+      include Calabash::Cucumber::Logging
+
       GESTALT_IPHONE = 'iPhone'
       GESTALT_IPAD = 'iPad'
       GESTALT_IPHONE5 = '4-inch'
@@ -16,7 +19,7 @@ module Calabash
       attr_reader :device_family
       attr_reader :simulator_details, :ios_version
       attr_reader :system
-      attr_reader :framework_version
+      attr_reader :server_version
       attr_reader :iphone_app_emulated_on_ipad
       attr_reader :iphone_4in
 
@@ -29,7 +32,7 @@ module Calabash
         @device_family = @system.eql?(GESTALT_SIM_SYS) ? simulator_device : @system.split(/[\d,.]/).first
         @simulator_details = version_data['simulator']
         @ios_version = version_data['iOS_version']
-        @framework_version = version_data['version']
+        @server_version = version_data['version']
         @iphone_app_emulated_on_ipad = version_data['iphone_app_emulated_on_ipad']
         @iphone_4in = version_data['4inch']
       end
@@ -95,6 +98,12 @@ module Calabash
       def iphone_app_emulated_on_ipad?
         iphone_app_emulated_on_ipad
       end
+
+      def framework_version
+        _deprecated('0.9.169', "use 'server_version', instead", :warn)
+        @server_version
+      end
+
     end
   end
 end

data/lib/calabash-cucumber/environment_helpers.rb

@@ -1,10 +1,14 @@
 require 'calabash-cucumber/device'
 require 'calabash-cucumber/launcher'
+require 'calabash-cucumber/utils/logging'
 
 module Calabash
   module Cucumber
+
+    # methods that describe the runtime environment
     module EnvironmentHelpers
 
+      include Calabash::Cucumber::Logging
 
       # returns +true+ if UIAutomation functions are available
       #
@@ -121,62 +125,6 @@ module Calabash
         _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?
-
-
-          if RUBY_VERSION < '2.0'
-            stack = Kernel.caller()[1..6].join("\n")
-          else
-            stack = Kernel.caller(0, 6)[1..-1].join("\n")
-          end
-
-          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
-            # todo should the _deprecated function be colored?
-            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
       #

data/lib/calabash-cucumber/ios7_operations.rb

@@ -4,15 +4,17 @@ require 'calabash-cucumber/actions/instruments_actions'
 require 'calabash-cucumber/actions/playback_actions'
 require 'calabash-cucumber/environment_helpers'
 
+# todo deprecate the Calabash::Cucumber::IOS7Operations
 
-
+# WARNING:  this entire module is deprecated
+# references functions that do not exist
+# should be removed
 module Calabash
   module Cucumber
     module IOS7Operations
       include Calabash::Cucumber::UIA
       include Calabash::Cucumber::EnvironmentHelpers
 
-      # todo deprecate the Calabash::Cucumber::IOS7Operations
 
       # <b>DEPRECATED</b>
       #