testautoi 0.9.135 → 0.9.142

data/.gitignore

@@ -1,4 +1,6 @@
 pkg
 Markdown.pl
 .idea
-Gemfile.lock
+Gemfile.lock
+staticlib
+libcalabash

data/Rakefile

@@ -1,2 +1,62 @@
 require 'bundler'
+require 'fileutils'
+
 Bundler::GemHelper.install_tasks
+
+
+task :build_server do
+
+  FRAMEWORK='calabash.framework'
+  ZIP_FILE="#{FRAMEWORK}.zip"
+
+  def build_server
+    return if ENV['SKIP_SERVER']
+    framework_zip = nil
+    dir = ENV['CALABASH_SERVER_PATH'] || File.join('..', '..', 'calabash-ios-server')
+    unless File.exist?(dir)
+      raise <<EOF
+      Unable to find calabash server checked out at #{dir}.
+      Please checkout as #{dir} or set CALABASH_SERVER_PATH to point
+      to Calabash server (branch 0.9.x).
+EOF
+    end
+
+    FileUtils.cd(dir) do
+      puts 'Building Server'
+      cmd = 'xcodebuild build -project calabash.xcodeproj -target Framework -configuration Debug -sdk iphonesimulator6.1'
+      puts cmd
+      puts `#{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}`
+      framework_zip = File.expand_path(ZIP_FILE)
+      unless File.exist?(framework_zip)
+        raise 'Unable to zip down framework...'
+      end
+    end
+
+
+
+    FileUtils.mkdir_p('staticlib')
+    output_path = File.join('staticlib', ZIP_FILE)
+    FileUtils.mv(framework_zip,output_path, :force => true)
+    puts "Server built to path #{output_path}"
+
+  end
+
+  build_server
+
+end
+
+task :build => [:build_server]
+task :install => [:build_server]
+task :release => [:build_server]
+

data/bin/calabash-ios

@@ -15,6 +15,7 @@ require File.join(File.dirname(__FILE__),"calabash-ios-build")
 @features_dir = File.join(FileUtils.pwd, "features")
 @source_dir = File.join(File.dirname(__FILE__), '..', 'features-skeleton')
 @script_dir = File.join(File.dirname(__FILE__), '..', 'scripts')
+@framework_dir = File.join(File.dirname(__FILE__), '..', 'staticlib')
 
 if (ARGV.length == 0)
   print_usage
@@ -33,6 +34,9 @@ elsif cmd == 'console'
 elsif cmd == 'build'
   build
   exit 0
+elsif cmd == 'update'
+  update(ARGV)
+  exit 0
 elsif cmd == 'run'
   run
   exit 0

data/bin/calabash-ios-helpers.rb

@@ -1,6 +1,7 @@
 require 'tempfile'
 require 'json'
 
+UPDATE_TARGETS = ['hooks']
 
 def msg(title, &block)
   puts "\n" + "-"*10 + title + "-"*10
@@ -21,8 +22,10 @@ def print_usage
       starts an interactive console to interact with your app via Calabash
     setup [<path>]
       setup your XCode project for calabash-ios (EXPERIMENTAL)
+    update [target]
+      updates one of the following targets: hooks
     download
-      downloads latest compatible version of calabash.framework
+      install latest compatible version of calabash.framework
     check [{<path to .ipa>|<path to .app>}]
       check whether an app or ipa is linked with calabash.framework (EXPERIMENTAL)
     sim locale <lang> [<region>]

data/bin/calabash-ios-setup.rb

@@ -94,47 +94,9 @@ def download_calabash(project_path)
   ##Download calabash.framework
   if not File.directory?(File.join(project_path, file))
     msg("Info") do
-      zip_file = "calabash.framework-#{ENV['FRAMEWORK_VERSION']||Calabash::Cucumber::FRAMEWORK_VERSION}.zip"
-      puts "Did not find calabash.framework. I'll download it...'"
-      puts "http://cloud.github.com/downloads/calabash/calabash-ios/#{zip_file}"
-      require 'uri'
-
-      uri = URI.parse "http://cloud.github.com/downloads/calabash/calabash-ios/#{zip_file}"
-      success = false
-      if has_proxy?
-        proxy_url = proxy
-        connection = Net::HTTP::Proxy(proxy_url[0], proxy_url[1])
-      else
-        connection = Net::HTTP
-      end
-      begin
-      connection.start(uri.host, uri.port) do |http|
-        request = Net::HTTP::Get.new uri.request_uri
-
-        http.request request do |response|
-          if response.code == '200'
-            open zip_file, 'wb' do |io|
-              response.read_body do |chunk|
-                print "."
-                io.write chunk
-              end
-            end
-            success = true
-          else
-             puts "Got bad response code #{response.code}."
-             puts "Aborting..."
-          end
-        end
-      end
-      rescue SocketError => e
-        msg("Error") do
-          puts "Exception: #{e}"
-          puts "Unable to download Calabash. Please check connection."
-        end
-        exit 1
-      end
-      if success
-        puts "\nDownload done: #{file}. Unzipping..."
+      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")
           msg("Error") do
             puts "Unable to unzip file: #{zip_file}"
@@ -142,8 +104,8 @@ def download_calabash(project_path)
           end
           exit 1
         end
-        FileUtils.rm(zip_file)
       else
+        puts "Inconsistent gem state: Cannot find framework: #{zip_file}"
         exit 0
       end
     end
@@ -328,4 +290,50 @@ def validate_app(app)
     end
   end
 
+end
+
+
+def update(args)
+  if args.length > 0
+    target = args[0]
+    unless UPDATE_TARGETS.include?(target)
+      msg("Error") do
+        puts "Invalid target #{target}. Must be one of: #{UPDATE_TARGETS.join(' ')}"
+      end
+      exit 1
+    end
+
+
+
+    target_file = "features/support/launch.rb"
+    msg("Question") do
+      puts "I'm about to update the #{target_file} file."
+      puts "Please hit return to confirm that's what you want."
+    end
+    exit 2 unless STDIN.gets.chomp == ''
+
+
+    unless File.exist?(target_file)
+      msg("Error") do
+        puts "Unable to find file #{target_file}"
+        puts "Please change directory so that #{target_file} exists."
+      end
+      exit 1
+    end
+    new_launch_script = File.join(@script_dir,"launch.rb")
+
+    FileUtils.cp(new_launch_script, target_file, :verbose => true)
+
+    msg("Info") do
+      puts "File copied.\n"
+      puts "Launch on device using environment variable DEVICE_TARGET=device."
+    end
+  else
+    msg("Error") do
+      puts "update must take one of the following targets: #{UPDATE_TARGETS.join(' ')}"
+    end
+    exit 1
+
+  end
+
 end

data/bin/testautoi

@@ -8,6 +8,8 @@ require 'uri'
 
 require File.join(File.dirname(__FILE__),"calabash-ios-sim")
 
+@script_dir = File.join(File.dirname(__FILE__), '..', 'scripts')
+
 @settings_file = File.join(FileUtils.pwd, ".testautoi_settings")
 
 def print_usage
@@ -76,7 +78,7 @@ def print_usage
       Stop recording
     version
       prints the gem version
-      
+
 EOF
 end
 
@@ -113,6 +115,8 @@ def run(option)
     env["APP_BUNDLE_PATH"] =  File.join(FileUtils.pwd, app_bundle)
     if device_udid == ''
         # Use a Simulator
+        #Calabash::Cucumber::SimulatorHelper.relaunch(env["APP_BUNDLE_PATH"], @settings["sim_version"], @settings["sim_device"])
+        #calabash_sim_location(['on', app_bundle_id])
         if option == 'console'
             Calabash::Cucumber::SimulatorHelper.relaunch(env["APP_BUNDLE_PATH"], @settings["sim_version"], @settings["sim_device"])
         else
@@ -122,9 +126,11 @@ def run(option)
     else
         env["NO_LAUNCH"] = "1"
         get_device_ip
-        if ENV["NO_INSTALL"] != "1"
+        if ENV["CLEAN_INSTALL"] == "1"
             uninstall_app(app_bundle_id)
             install_app(File.join(FileUtils.pwd, app_bundle))
+        elsif ENV["NO_INSTALL"] != "1"
+            install_app(File.join(FileUtils.pwd, app_bundle))            
         end
         launch_app(app_url)
         sleep(5)
@@ -426,6 +432,14 @@ def uninstall_app(app_bundle_id)
     raise "Failed to install the app" if result == false
 end
 
+def tracetemplate
+    "/Applications/Xcode.app/Contents/Applications/Instruments.app/Contents/PlugIns/AutomationInstrument.bundle/Contents/Resources/Automation.tracetemplate"
+end
+
+def simulator_path
+    "/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\\ Simulator.app/Contents/MacOS/iPhone\\ Simulator"
+end
+
 def launch_app(app_url)
     udid = @settings["device_udid"].to_s
     udids = Device.detect
@@ -435,13 +449,12 @@ def launch_app(app_url)
         udid = udids.first
     end    
     raise "The device #{udid} is not found." if not udids.include?(udid)
-    tracetempl = "/Applications/Xcode.app/Contents/Applications/Instruments.app/Contents/PlugIns/AutomationInstrument.bundle/Contents/Resources/Automation.tracetemplate"
     launcher = "./AppLaunch.app"
     script = 'LaunchApp.js'
     text = File.read(File.join(File.dirname(__FILE__), script))
     File.open(File.join(FileUtils.pwd, script), "w") {|file| file.puts text.gsub(/\[%app%\]/, app_url)}
     script = File.join(FileUtils.pwd, script)
-    cmd = `instruments -w #{udid} -t #{tracetempl} #{launcher_path} -e UIASCRIPT #{script}`
+    cmd = `instruments -w #{udid} -t #{tracetemplate} #{launcher_path} -e UIASCRIPT #{script}`
 end
 
 def get_device_ip
@@ -454,20 +467,19 @@ def get_device_ip
         udid = udids.first
     end    
     raise "The device #{udid} is not found." if not udids.include?(udid)
-    tracetempl = "/Applications/Xcode.app/Contents/Applications/Instruments.app/Contents/PlugIns/AutomationInstrument.bundle/Contents/Resources/Automation.tracetemplate"
     launcher = "./AppLaunch.app"
     script = 'GetIPAddress.js'
     text = File.read(File.join(File.dirname(__FILE__), script))
     File.open(File.join(FileUtils.pwd, script), "w") {|file| file.puts text}
     script = File.join(FileUtils.pwd, script)
     File.open(File.join(FileUtils.pwd, "Device.cfg"), "w") {|file| file.puts "IPAddress="}
-    cmd = `instruments -w #{udid} -t #{tracetempl} #{launcher_path} -e UIASCRIPT #{script}`
+    cmd = `instruments -w #{udid} -t #{tracetemplate} #{launcher_path} -e UIASCRIPT #{script}`
     puts File.read(File.join(FileUtils.pwd, "Device.cfg"))
 end
 
 def start_sim
     quit_sim
-    pid = spawn("/Applications/Xcode.app/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/Applications/iPhone\\ Simulator.app/Contents/MacOS/iPhone\\ Simulator")
+    pid = spawn(simulator_path)
 end
 
 def reset_sim

data/calabash-cucumber.gemspec

@@ -11,9 +11,9 @@ Gem::Specification.new do |s|
   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")
+  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", "testautoi"]
+  s.executables   = "calabash-ios"
   s.require_paths = ["lib"]
 
   s.add_dependency( "cucumber" )
@@ -24,7 +24,7 @@ Gem::Specification.new do |s|
   s.add_dependency( "location-one", "~>0.0.9")
   s.add_dependency( "httpclient","2.3.2")
   s.add_dependency( "bundler", "~> 1.1")
-  s.add_dependency( "run_loop", "0.0.5" )
+  s.add_dependency( "run_loop", "0.0.7" )
   s.add_dependency( "awesome_print")
 
 end

data/doc/calabash-ios-help.txt

@@ -8,7 +8,10 @@ Usage: calabash-ios <command-name> [parameters]
     sim locale [lang] [regional]?
     sim reset
     sim acc
-    sim device [iPad_Retina, iPhone, iPhone_Retina, iPhone_Retina_4inch]
+    sim device {iPad,iPad_Retina,iPhone,iPhone_Retina,iPhone_Retina_4inch}
+    sim location {on|off} <bundleid>
+
+
 
   Commands:
   gen creates a skeleton features dir. This is usually used once when
@@ -16,8 +19,8 @@ Usage: calabash-ios <command-name> [parameters]
       the right step definitions and environment to run with cucumber.
   console
       starts an interactive console to interact with your app via Calabash.
-      Copies the irb_ios5.sh and irb_ios4.sh scripts and the .irbrc file
-      then launches irb_ios5.sh.
+      Supports setting environment var CALABASH_IRBRC for custom .irbrc file.
+
   setup [path]? (EXPERIMENTAL) Automates setting up your iOS Xcode project
         with calabash-ios-server. It is your responsibility to ensure
         that your production build does not link with calabash.framework.
@@ -41,18 +44,24 @@ Usage: calabash-ios <command-name> [parameters]
         If something goes wrong. Close Xcode and copy project.pbxproj.bak
         to project.pbxproj inside your .xcodeproj folder.
 
+  update [target]
+        updates one of the following targets: hooks
+
   download [opt_path]?
-        downloads latest compatible version of calabash.framework.
+        copies current compatible version of calabash.framework to your project.
         It should be run from a directory containing an Xcode project,
         or optionally opt_path should be supplied and pointing to a
         directory containing an Xcode project.
-        Download will download the latest version that matches the
+        Will copy in the latest version that matches the
         currently installed calabash-cucumber gem.
         To update Calabash for your project run
 
-        gem update calabash-cucumber
+        gem install calabash-cucumber
         calabash-ios download
 
+        Then clean and rebuild to your project.
+        Check the current server version on http://localhost:37265/version
+
   check (EXPERIMENTAL) [.app or .ipa]?
         check whether an app or ipa is linked with calabash.framework
         if called without parameter [.app or .ipa] then pwd should be
@@ -66,8 +75,11 @@ Usage: calabash-ios <command-name> [parameters]
       for the optional regional parameter, for example,
       da_DK, en_US.
 
+  sim location {on|off} <bundleid>
+      set allow location on/off for current project or bundleid
+
   sim reset (EXPERIMENTAL) Will select "Reset Content and Settings"
       in the iOS Simulators using AppleScript.
 
   sim device [device] Will set the default iOS Simulator device.
-      [device] can be one of iPad, iPhone, iPhone_Retina.
+      [device] can be one of iPad iPad_Retina iPhone iPhone_Retina iPhone_Retina_4inch

data/doc/x-platform-testing.md

@@ -0,0 +1,250 @@
+# Cross-platform Acceptance Testing Best Practices
+
+Test automation is programming - hence, well-established practices of programming apply to test automation. Ruby is object-oriented, and most Calabash tests should also follow good object-oriented design (e.g., principles of abstraction, separation of concerns, modularity, reuse...).
+
+A well-established pattern in test engineering is the *Page-Object Pattern* (POP). While originating in web testing, the ideas of POP apply equally well to native mobile. In this short article, we'll illustrate how to use the page object pattern to better architect test code and obtain better cross-platform code reuse.
+
+We've created a sample project: [X-Platform-Example](https://github.com/calabash/x-platform-example) using the open source WordPress app. If you want to follow along and try things out, go to the project page [https://github.com/calabash/x-platform-example](https://github.com/calabash/x-platform-example) and follow install and run instructions. You can also choose to just read about the principles in this article and try to implement them in you own app.
+
+LessPainful also provides both on-site and public training courses where we teach the use of Calabash as well as cross-platform and automated testing best practices. If you're interested in a two-day, hands-on course, please contact us at [contact@lesspainful.com](mailto:contact@lesspainful.com).
+
+# Page Objects
+
+A *page object* is an object that represents a single screen (page) in your application. For mobile, "screen object" would possibly be a better word, but Page Object is an established term that we'll stick with.
+
+A page object should abstract a single screen in your application. It should expose methods to query the state and data of the screen as well as methods to take actions on the screen. 
+
+As a trivial example, a "login screen" consisting of username and password text fields and a "Login" button could expose a method `login(user,pass)` method that would abstract the details of entering username, password, touching the "Login" button, as well as 'transitioning' to another page (after login). A screen with a list of talks for a conference could expose a `talks()` method to return the visible talks and perhaps a `details(talk)` method to navigate to details for a particular talk.
+
+The most obvious benefit of this is abstraction and reuse. If you have several steps needing to navigate to details, the code for `details(talk)` is reused. Also, callers of this method need not worry about the details (e.g. query and touch) or navigating to this screen.
+
+# Cross-platform Core Idea
+
+
+Let's go into more detail with this last example. Consider the following sketch of a class (don't do it exactly like this - read on a bit):
+
+```ruby
+
+    class TalksScreen
+       def talks
+       # query all talks...
+       end
+       
+       def details(talk)
+       #touch talk…
+       end
+    end
+```
+
+
+Suppose you're building the same app for iPhone and Android phones. Most likely the interface of the `TalksScreen` class makes complete sense on both platforms. This means that the calling code, which is usually in a step definition, is independent of platform - hence it can be reused across platforms. 
+
+Working this way gets you complete reuse of Cucumber features as well as step definitions: the details of interacting with the screen is pushed to page object implementations.
+
+The idea is that you provide an implementation of page objects for each platform you need to support (e.g. iPhone, iPad, Android phone, Android tablet, mobile web, desktop web,…).
+
+# Cross-platform in practice
+
+So… The idea and design looks good. The question now is how to implement this is practice. Here we describe the mechanics and below you'll find an example extracted from [X-Platform-Example](https://github.com/calabash/x-platform-example).
+
+There are a couple of ingredients we need.
+
+1. For each screen you want to automate, decide on an interface for a page object class (e.g. like `TalksScreen` above).
+2. Use only custom steps, and in each step definition *only* use page objects and their methods (no direct calls to Calabash iOS or Calabash Android APIs).
+3. For each supported platform, define a class with implementations of the page-object methods.
+4. Create a Cucumber profile (`config/cucumber.yml`). Define a profile for each platform (e.g. `android` and `ios`), and ensure that the profile *only* loads the page object classes for the platform.
+5. Rejoice and profit!
+
+Let's see what these steps look like in a concrete example on the [X-Platform-Example](https://github.com/calabash/x-platform-example).
+
+# Example
+
+## Step 1 - Interface
+For the wordpress app, let's focus on the Login/Add-WordPress Blog screen. This method has a single method: `login(user)` which takes a hash `{:email => 'username', :password => 'somepass'}` representing a user:
+
+```ruby
+
+    def login(user)
+      #…
+    end 
+    
+    def assert_invalid_login_message()
+      #…
+    end
+```
+
+For this simple screen the interface consists of just these two methods.
+
+## Step 2 - Step definitions
+
+We have a feature alà 
+
+    Scenario: Invalid login to WordPress.com blog
+      Given I am about to login
+      When I enter invalid credentials
+      Then I am presented with an error message to correct credentials
+
+Below are step definitions that *only use the page objects* and no Calabash methods like touch, query…
+
+For the following, assume we have also a Page Object class `WelcomePage` with a method `wordpress_blog` that transitions to the `AddWordPressBlog` screen:
+
+```ruby
+
+    ## Invalid login ##
+    Given /^I am about to login$/ do
+
+      welcome = page(WelcomePage).await    
+      @page = welcome.wordpress_blog
+      
+	end
+
+    When /^I enter invalid credentials$/ do
+      @page = @page.login(USERS[:invalid])
+    end
+
+    Then /^I am presented with an error message to correct credentials$/ do
+      @page.assert_invalid_login_message
+      screenshot_embed
+    end
+```
+
+The `page` method is a helper method in Calabash which initializes a page object from a class. The `await` method just returns the page object after waiting for the page to be loaded.
+
+We store the page object in an instance variable in the cucumber world (`@page`) and use it in the subsequent steps.
+
+Notice how the steps only use page-object methods. This feature, as well as the step definitions, can be 100% reused across platforms. Great!
+
+## Step 3 - Platform implementations
+
+Now we need to give an implementation of the `WordPressComPage` on iOS and Android (and all other supported platforms). We put those implementations in separte directories `features/ios/pages` and `features/android/pages` and name them `word_press_com_page_ios.rb` and `word_press_com_android.rb`.
+
+Here is the implementation for iOS. It uses an abstract Page Object Class defined in Calabash iOS (`Calabash::IBase`).
+
+```ruby
+require 'calabash-cucumber/ibase'
+
+class WordPressComPage < Calabash::IBase
+
+  def title
+    "Sign In"
+  end
+
+  def login(user)
+     touch("view marked:'Username'")
+     await_keyboard
+
+     keyboard_enter_text user[:email]
+
+     touch("view marked:'Password'")
+
+     keyboard_enter_text user[:password]
+     done
+
+     wait_for_elements_do_not_exist(["tableViewCell activityIndicatorView"],
+                                    :timeout => 120)
+
+
+     if element_exists(invalid_login_query)
+      self
+     else
+      page(MainPage).await
+     end
+  end
+
+  def assert_invalid_login_message
+    check_element_exists(trait)
+    check_element_exists(invalid_login_query)
+  end
+
+  def invalid_login_query
+    "label {text LIKE '*Sign in failed*'}"
+  end
+
+end
+
+```
+
+And for Android:
+
+```ruby
+class WordPressComPage < Calabash::ABase
+
+  def trait
+    "* id:'username'"
+  end
+
+  def await(opts={})
+    wait_for_elements_exist([trait])
+    self
+  end
+
+
+  def login(user)
+    query("* id:'username'",{:setText => user[:email]})
+    query("* id:'password'",{:setText => user[:password]})
+
+    performAction('scroll_down')
+
+    touch(login_button_query)
+
+    sleep(1)#Chance to show Dialog
+
+    wait_for(:timeout => 60, :timeout_message => "Timed out logging in") do
+      current_dialogs = query("DialogTitle",:text)
+
+      empty_dialog = current_dialogs.empty?
+      error_dialog = current_dialogs.include?("Error")
+      no_network_dialog = current_dialogs.include?("No network available")
+
+      empty_dialog or error_dialog or no_network_dialog
+    end
+
+    main_page = page(MainPage)
+
+    if main_page.current_page?
+      main_page.await
+    else
+      self
+    end
+  end
+
+  def invalid_login_query
+    login_button_query
+  end
+
+  def login_button_query
+    "android.widget.Button marked:'Log In'"
+  end
+
+  def assert_invalid_login_message
+    check_element_exists(invalid_login_query)
+  end
+
+
+end
+```
+
+## Step 4 - Conditional loading
+
+The final missing part is conditionally loading page-object implementations based on which platform we're running. This is done using Cucumber *profiles*. We create a file `config/cucumber.yml` 
+
+    ---
+    android: RESET_BETWEEN_SCENARIOS=1 PLATFORM=android -r features/support -r features/android/support -r features/android/helpers -r features/step_definitions -r features/android/pages/
+
+    ios: APP_BUNDLE_PATH=ios-source/3.3.1/build/Applications/WordPress.app RESET_BETWEEN_SCENARIOS=1 PLATFORM=ios -r features/support -r features/ios/support -r features/ios/helpers -r features/step_definitions -r features/ios/pages
+    
+We're using Cucumbers `-r` option to only load a subset of Ruby files. We can then execute the tests as specified [here](https://github.com/calabash/x-platform-example).
+
+iOS:
+
+    cucumber -p ios features/login.feature
+    
+Android:
+
+    calabash-android run path_to.apk -p android features/login.feature
+    
+## Conclusion
+
+We've described how to improve the architecture of your test code base: using page objects you get better abstraction, reuse and cross-platform comes more easily. We've created an open source sample project that you can use for inspiration: [X-Platform-Example](https://github.com/calabash/x-platform-example).
+
+Comments and improvements welcome!

data/lib/calabash-cucumber/core.rb

@@ -325,7 +325,12 @@ module Calabash
         device = options["DEVICE"] || ENV["DEVICE"] || "iphone"
 
         unless os
-          major = Calabash::Cucumber::SimulatorHelper.ios_major_version
+          if @calabash_launcher && @calabash_launcher.active?
+            major = @calabash_launcher.ios_major_version
+          else
+            major = Calabash::Cucumber::SimulatorHelper.ios_major_version
+          end
+
           unless major
             raise <<EOF
           Unable to determine iOS major version
@@ -471,24 +476,28 @@ EOF
       end
 
 
-      def start_app_in_background(path=nil, sdk = nil, version = 'iphone', args = nil)
-
-        if path.nil?
-          path = ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH)
-        end
-        app_bundle_path = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(path)
+      ## args :app for device bundle id, for sim path to app
+      ##
+      def start_test_server_in_background(args={})
+        target = args[:device_target] || :simulator
+        stop_test_server
+        @calabash_launcher = Calabash::Cucumber::Launcher.new(target)
+        @calabash_launcher.relaunch(args)
 
-        @ios_device = RunLoop.run(:app => app_bundle_path)
       end
 
-      def send_uia_command(opts ={})
-        RunLoop.send_command(opts[:device] ||@ios_device, opts[:command])
+      def stop_test_server
+        if @calabash_launcher
+           @calabash_launcher.stop
+        end
       end
 
-      def stop_background_app(stop_spec = nil)
-
-        @ios_device = RunLoop.stop(stop_spec || @ios_device)
-
+      def send_uia_command(opts ={})
+        run_loop = opts[:run_loop] || (@calabash_launcher && @calabash_launcher.active? && @calabash_launcher.run_loop)
+        command = opts[:command]
+        raise ArgumentError, 'please supply :run_loop or instance var @calabash_launcher' unless run_loop
+        raise ArgumentError, 'please supply :command' unless command
+        RunLoop.send_command(run_loop, opts[:command])
       end
 
 

data/lib/calabash-cucumber/ibase.rb

@@ -4,42 +4,95 @@ require 'calabash-cucumber/operations'
 class Calabash::IBase
   include Calabash::Cucumber::Operations
 
-  def initialize(world)
-    @world = world
-  end
-
-  def embed(*args)
-    @world.send(:embed,*args)
-  end
+  attr_accessor :world, :transition_duration
 
-  def puts(*args)
-    @world.send(:puts, *args)
+  def initialize(world, transition_duration=0.5)
+    self.world = world
+    self.transition_duration = transition_duration
   end
 
   def trait
+    raise "You should define a trait method or a title method" unless respond_to?(:title)
     "navigationItemView marked:'#{self.title}'"
   end
 
-  def page(clz,*args)
-    clz.new(@world,*args)
+  def current_page?
+    element_exists(trait)
   end
 
-  def step(s)
+  def page(clz, *args)
+    clz.new(world, *args)
+  end
 
+  def await(wait_opts={})
+    wait_for_elements_exist([trait], wait_opts)
+    unless wait_opts.has_key?(:await_animation) && !wait_opts[:await_animation]
+      sleep(transition_duration)
+    end
+    self
   end
 
-  def steps(ss)
+  ##
+  # Performs a transition from receiver page to another by performing a +:tap+ gesture
+  # or a user specified +:action+.
+  # Caller must supply a hash of options +transition_options+ to describe the transition.
+  # Transition options may have the following keys
+  #
+  # +:tap+: A uiquery used to perform a tap gesture to begin transition
+  # +:action+: A proc to use begin transition (either :tap or :action must be supplied)
+  # +:page+: A page object or page object class to transition to (target page). If a class is provided this
+  # is instantiated using the +page+ method of self. If no +:page+ is supplied, +self+ is used.
+  # +:await+: If specified and truthy will await the +:page+ after performing gesture (usually to wait
+  # for animation to finish)
+  # +:tap_options+: If +:tap+ is provided used to pass as options to touch
+  # +:wait_options+: When awaiting target page, pass these options to the +await+ method
+  #
+  # Returns the transition target page
+  #
+  # Note it is assumed that the target page is a Calabash::IBase (or acts accordingly)
+  def transition(transition_options={})
+    uiquery = transition_options[:tap]
+    action = transition_options[:action]
+    page_arg = transition_options[:page]
+    should_await = transition_options.has_key?(:await) ? transition_options[:await] : true
 
-  end
+    if action.nil? && uiquery.nil?
+      raise "Called transition without providing a gesture (:tap or :action) #{transition_options}"
+    end
 
-  def await(opts={})
-    wait_for_elements_exist([trait], opts)
-    self
+    if uiquery
+      tap_options = transition_options[:tap_options] || {}
+      touch(uiquery, tap_options)
+    else
+      action.call()
+    end
+
+    page_obj = page_arg.is_a?(Class) ? page(page_arg) : page_arg
+    page_obj ||= self
+
+    if should_await
+      wait_opts = transition_options[:wait_options] || {}
+      if page_obj == self
+        unless wait_opts.has_key?(:await_animation) && !wait_opts[:await_animation]
+          sleep(transition_duration)
+        end
+      else
+        page_obj.await(wait_opts)
+      end
+    end
+
+    page_obj
   end
 
-  def await_screenshot(wait_opts={},screenshot_opts={})
+  def await_screenshot(wait_opts={}, screenshot_opts={})
     await(wait_opts)
     screenshot_embed(screenshot_opts)
   end
 
+
+  protected
+  def method_missing(name, *args, &block)
+    world.send(name, *args, &block)
+  end
+
 end

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

@@ -19,6 +19,10 @@ module Calabash
 
       DEFAULT_SIM_RETRY = 2
 
+      # Load environment variable for showing full console output
+      # If not env var set then we use true; i.e. output to console in full
+      FULL_CONSOLE_OUTPUT = ENV['CALABASH_FULL_CONSOLE_OUTPUT'] == 'false' ? false : true
+
       def self.relaunch(path, sdk = nil, version = 'iphone', args = nil)
 
         app_bundle_path = app_bundle_or_raise(path)
@@ -176,12 +180,18 @@ module Calabash
           timeout = (ENV['CONNECT_TIMEOUT'] || DEFAULT_SIM_WAIT).to_i
           retry_count = 0
           connected = false
-          puts "Waiting at most #{timeout} seconds for simulator (CONNECT_TIMEOUT)"
-          puts "Retrying at most #{max_retry_count} times (MAX_CONNECT_RETRY)"
+
+          if FULL_CONSOLE_OUTPUT
+            puts "Waiting at most #{timeout} seconds for simulator (CONNECT_TIMEOUT)"
+            puts "Retrying at most #{max_retry_count} times (MAX_CONNECT_RETRY)"
+          end
+
           until connected do
             raise "MAX_RETRIES" if retry_count == max_retry_count
             retry_count += 1
-            puts "(#{retry_count}.) Start Simulator #{sdk}, #{version}, for #{app_bundle_path}"
+            if FULL_CONSOLE_OUTPUT
+              puts "(#{retry_count}.) Start Simulator #{sdk}, #{version}, for #{app_bundle_path}"
+            end
             begin
               Timeout::timeout(timeout, TimeoutErr) do
                 simulator = launch(app_bundle_path, sdk, version, args)
@@ -196,7 +206,9 @@ module Calabash
                     if connected
                       server_version = get_version
                       if server_version
-                        p server_version
+                        if FULL_CONSOLE_OUTPUT
+                          p server_version
+                        end
                         unless version_check(server_version)
                           msgs = ["You're running an older version of Calabash server with a newer client",
                                   "Client:#{Calabash::Cucumber::VERSION}",
@@ -241,7 +253,9 @@ module Calabash
 
       def self.ping_app
         url = URI.parse(ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/")
-        puts "Ping #{url}..."
+        if FULL_CONSOLE_OUTPUT
+           puts "Ping #{url}..."   
+        end
         http = Net::HTTP.new(url.host, url.port)
         res = http.start do |sess|
           sess.request Net::HTTP::Get.new url.path
@@ -260,7 +274,9 @@ module Calabash
         endpoint += "/" unless endpoint.end_with? "/"
         url = URI.parse("#{endpoint}version")
 
-        puts "Fetch version #{url}..."
+        if FULL_CONSOLE_OUTPUT
+          puts "Fetch version #{url}..."
+        end
         begin
           body = Net::HTTP.get_response(url).body
           res = JSON.parse(body)

data/lib/calabash-cucumber/launcher.rb

@@ -0,0 +1,155 @@
+require 'calabash-cucumber/launch/simulator_helper'
+require 'sim_launcher'
+require 'run_loop'
+
+
+class Calabash::Cucumber::Launcher
+  attr_accessor :run_loop
+  attr_accessor :device_target
+  attr_accessor :ios_version
+
+  def initialize(device_target=:simulator)
+    self.device_target = device_target
+  end
+
+  class CalabashLauncherTimeoutErr < Timeout::Error
+  end
+
+  def calabash_no_stop?
+    ENV['NO_LAUNCH']=="1" or ENV['NO_STOP']=="1"
+  end
+
+  def device_target?
+    ENV['DEVICE_TARGET'] == 'device'
+  end
+
+  def simulator_target?
+    ENV['DEVICE_TARGET'] == 'simulator'
+  end
+
+  def active?
+    (simulator_target? || device_target?) && (not run_loop.nil?)
+  end
+
+  def ios_major_version
+    v = ios_version
+    (v && v.split('.')[0])
+  end
+
+
+  def reset_app_jail(sdk, app_path)
+    return if device_target?
+
+    app = File.basename(app_path)
+    bundle = `find "#{ENV['HOME']}/Library/Application Support/iPhone Simulator/#{sdk}/Applications/" -type d -depth 2 -name "#{app}" | head -n 1`
+    return if bundle.empty? # Assuming we're already clean
+
+    sandbox = File.dirname(bundle)
+    ['Library', 'Documents', 'tmp'].each do |dir|
+      FileUtils.rm_rf(File.join(sandbox, dir))
+    end
+  end
+
+  def relaunch(args={})
+    RunLoop.stop(run_loop) if run_loop
+
+    if device_target?
+      default_args = {:app => ENV['BUNDLE_ID']}
+      self.run_loop = RunLoop.run(default_args.merge(args))
+    else
+
+      sdk = ENV['SDK_VERSION'] || SimLauncher::SdkDetector.new().latest_sdk_version
+      path = Calabash::Cucumber::SimulatorHelper.app_bundle_or_raise(app_path)
+      if ENV['RESET_BETWEEN_SCENARIOS']=="1"
+        reset_app_jail(sdk, path)
+      end
+
+      if simulator_target?
+        device = (ENV['DEVICE'] || 'iphone').to_sym
+        default_args = {:app => path, :device => device}
+        self.run_loop = RunLoop.run(default_args.merge(args))
+      else
+        ## sim launcher
+        Calabash::Cucumber::SimulatorHelper.relaunch(path, sdk, ENV['DEVICE'] || 'iphone', args)
+      end
+
+    end
+    ensure_connectivity
+  end
+
+
+  def ensure_connectivity
+    begin
+      max_retry_count = (ENV['MAX_CONNECT_RETRY'] || 10).to_i
+      timeout = (ENV['CONNECT_TIMEOUT'] || 30).to_i
+      retry_count = 0
+      connected = false
+      puts "Waiting for App to be ready"
+      until connected do
+        raise "MAX_RETRIES" if retry_count == max_retry_count
+        retry_count += 1
+        begin
+          Timeout::timeout(timeout, CalabashLauncherTimeoutErr) do
+            until connected
+              begin
+                connected = (ping_app == '200')
+                break if connected
+              rescue Exception => e
+                #p e
+                #retry
+              ensure
+                sleep 1 unless connected
+              end
+            end
+          end
+        rescue CalabashLauncherTimeoutErr => e
+          puts "Timed out...Retry.."
+        end
+      end
+    rescue e
+      p e
+      msg = "Unable to make connection to Calabash Server at #{ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/"}\n"
+      msg << "Make sure you don't have a firewall blocking traffic to #{ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/"}.\n"
+      raise msg
+    end
+  end
+
+  def ping_app
+    url = URI.parse(ENV['DEVICE_ENDPOINT']|| "http://localhost:37265/")
+
+    http = Net::HTTP.new(url.host, url.port)
+    res = http.start do |sess|
+      sess.request Net::HTTP::Get.new "version"
+    end
+    status = res.code
+    begin
+      http.finish if http and http.started?
+    rescue Exception => e
+
+    end
+
+    if status=='200'
+      version_body = JSON.parse(res.body)
+      if version_body['iOS_version']
+        self.ios_version = version_body['iOS_version']
+      end
+    end
+
+    status
+  end
+
+  def stop
+    RunLoop.stop(run_loop)
+  end
+
+  def app_path
+    ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH)
+  end
+
+  def calabash_notify(world)
+    if world.respond_to?(:on_launch)
+      world.on_launch
+    end
+  end
+end
+

data/lib/calabash-cucumber/operations.rb

@@ -3,6 +3,7 @@ require 'calabash-cucumber/tests_helpers'
 require 'calabash-cucumber/keyboard_helpers'
 require 'calabash-cucumber/wait_helpers'
 require 'calabash-cucumber/location'
+require 'calabash-cucumber/launcher'
 require 'net/http'
 require 'test/unit/assertions'
 require 'json'
@@ -99,7 +100,6 @@ module Calabash
       end
 
 
-
       #not officially supported yet
       #def change_slider_value_to(q, value)
       #  target = value.to_f

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.135"
-    FRAMEWORK_VERSION = "0.9.126"
+    VERSION = '0.9.142'
+    FRAMEWORK_VERSION = '0.9.141'
   end
 end

data/scripts/launch.rb

@@ -0,0 +1,49 @@
+########################################
+#                                      #
+#       Important Note                 #
+#                                      #
+#   When running calabash-ios tests at #
+#   www.lesspainful.com                #
+#   this file will be overwritten by   #
+#   a file which automates             #
+#   app launch on devices.             #
+#                                      #
+#   Don't rely on this file being      #
+#   present when running at            #
+#   www.lesspainful.com.               #
+#                                      #
+#  Only put stuff here to automate     #
+#  iOS Simulator.                      #
+#                                      #
+#  You can put your app bundle path    #
+#  for automating simulator app start: #
+#  Uncomment APP_BUNDLE_PATH =..       #
+#                                      #
+########################################
+
+require 'calabash-cucumber/launcher'
+
+# Uncomment and replace ?? appropriately
+# This should point to your Simulator build
+# which includes calabash framework
+# this is usually the Calabash build configuration
+# of your production target.
+#APP_BUNDLE_PATH = "~/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app"
+#
+
+
+Before do |scenario|
+  @calabash_launcher = Calabash::Cucumber::Launcher.new
+  @calabash_launcher.relaunch
+  @calabash_launcher.calabash_notify(self)
+end
+
+After do |scenario|
+  unless @calabash_launcher.calabash_no_stop?
+    if @calabash_launcher.active?
+      @calabash_launcher.stop
+    else
+      Calabash::Cucumber::SimulatorHelper.stop
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: testautoi
 version: !ruby/object:Gem::Version
-  version: 0.9.135
+  version: 0.9.142
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-03 00:00:00.000000000 Z
+date: 2013-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -146,7 +146,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -154,7 +154,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.7
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
@@ -215,6 +215,7 @@ files:
 - bin/testautoi
 - calabash-cucumber.gemspec
 - doc/calabash-ios-help.txt
+- doc/x-platform-testing.md
 - epl-v10.html
 - features-skeleton/my_first.feature
 - features-skeleton/step_definitions/calabash_steps.rb
@@ -230,6 +231,7 @@ files:
 - lib/calabash-cucumber/ibase.rb
 - lib/calabash-cucumber/keyboard_helpers.rb
 - lib/calabash-cucumber/launch/simulator_helper.rb
+- lib/calabash-cucumber/launcher.rb
 - lib/calabash-cucumber/location.rb
 - lib/calabash-cucumber/operations.rb
 - lib/calabash-cucumber/resources/cell_swipe_ios4_ipad.base64
@@ -317,7 +319,9 @@ files:
 - scripts/data/.GlobalPreferences.plist
 - scripts/data/clients.plist
 - scripts/data/com.apple.Accessibility.plist
+- scripts/launch.rb
 - scripts/reset_simulator.scpt
+- staticlib/calabash.framework.zip
 homepage: 
 licenses: []
 post_install_message: