frank-cucumber 0.7.8 → 0.8.0

data/frank-skeleton/features/step_definitions/launch_steps.rb

@@ -1,62 +1,4 @@
 Given /^I launch the app$/ do
-
-
   app_path = ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH)
-
-  ####################
-  # once you're setting APP_BUNDLE_PATH correctly you can get rid 
-  # of this detection/reporting code if you want
-  #
-  if app_path.nil?
-    require 'frank-cucumber/app_bundle_locator'
-    message = "APP_BUNDLE_PATH is not set. \n\nPlease set APP_BUNDLE_PATH (either an environment variable, or the ruby constant in support/env.rb) to the path of your Frankified target's iOS app bundle."
-    possible_app_bundles = Frank::Cucumber::AppBundleLocator.new.guess_possible_app_bundles_for_dir( Dir.pwd )
-    if possible_app_bundles && !possible_app_bundles.empty?
-      message << "\n\nBased on your current directory, you probably want to use one of the following paths for your APP_BUNDLE_PATH:\n"
-      message << possible_app_bundles.join("\n")
-    end
-
-    raise "\n\n"+("="*80)+"\n"+message+"\n"+("="*80)+"\n\n"
-  end
-  #
-  ####################
-
-
-
-  # kill the app if it's already running, just in case this helps 
-  # reduce simulator flakiness when relaunching the app. Use a timeout of 5 seconds to 
-  # prevent us hanging around for ages waiting for the ping to fail if the app isn't running
-  begin
-    Timeout::timeout(5) { press_home_on_simulator if frankly_ping }
-  rescue Timeout::Error 
-  end
-
-
-  require 'sim_launcher'
-
-  if( ENV['USE_SIM_LAUNCHER_SERVER'] )
-    simulator = SimLauncher::Client.for_iphone_app( app_path )
-  else
-    simulator = SimLauncher::DirectClient.for_iphone_app( app_path )
-  end
-  
-  num_timeouts = 0
-  loop do
-    begin
-      simulator.relaunch
-      wait_for_frank_to_come_up
-      break # if we make it this far without an exception then we're good to move on
-
-    rescue Timeout::Error
-      num_timeouts += 1
-      puts "Encountered #{num_timeouts} timeouts while launching the app."
-      if num_timeouts > 3
-        raise "Encountered #{num_timeouts} timeouts in a row while trying to launch the app." 
-      end
-    end
-  end
-
-  # TODO: do some kind of waiting check to see that your initial app UI is ready
-  # e.g. Then "I wait to see the login screen"
-
+  launch_app app_path
 end

data/lib/frank-cucumber.rb

@@ -1,8 +1,10 @@
 require 'frank-cucumber/color_helper'
 require 'frank-cucumber/frank_helper'
+require 'frank-cucumber/launcher'
 
 World(Frank::Cucumber::ColorHelper)
 World(Frank::Cucumber::FrankHelper)
+World(Frank::Cucumber::Launcher)
 
 AfterConfiguration do
   require 'frank-cucumber/core_frank_steps'

data/lib/frank-cucumber/core_frank_steps.rb

@@ -121,12 +121,12 @@ end
 
 # alias 
 When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |text_field, text_to_type|
-  When %Q|I type "#{text_to_type}" into the "#{text_field}" text field|
+  step %Q|I type "#{text_to_type}" into the "#{text_field}" text field|
 end
 
 When /^I fill in text fields as follows:$/ do |table|
   table.hashes.each do |row|
-    When %Q|I type "#{row['text']}" into the "#{row['field']}" text field|
+    step %Q|I type "#{row['text']}" into the "#{row['field']}" text field|
   end
 end
 
@@ -239,6 +239,7 @@ When /^I flip switch "([^\"]*)"$/ do |mark|
   touch("view:'UISwitch' marked:'#{mark}'") 
 end
 
+
 Then /^switch "([^\"]*)" should be (on|off)$/ do |mark,expected_state|
   expected_state = expected_state == 'on'
 

data/lib/frank-cucumber/frank_helper.rb

@@ -5,6 +5,14 @@ module Frank module Cucumber
 
 module FrankHelper 
 
+  class << self
+    # TODO: adding an ivar to the module itself is a big ugyl hack. We need a FrankDriver class, or similar
+    attr_accessor :selector_engine
+    def use_shelley_from_now_on
+      @selector_engine = 'shelley_compat'
+    end
+  end
+
   def touch( uiquery )
     views_touched = frankly_map( uiquery, 'touch' )
     raise "could not find anything matching [#{uiquery}] to touch" if views_touched.empty?
@@ -50,6 +58,7 @@ module FrankHelper
     
     before = Time.now
     res = post_to_uispec_server( 'app_exec', :operation => operation_map )
+
     #logger.debug( "MAP applying #{method_name} with args:( #{method_args.inspect} ) to 'Application Delegate' took #{Time.now - before} seconds" )
 
     res = JSON.parse( res )
@@ -64,9 +73,10 @@ module FrankHelper
   def frankly_map( query, method_name, *method_args )
     operation_map = {
       :method_name => method_name,
-      :arguments => method_args
+      :arguments => method_args,
     }
-    res = post_to_uispec_server( 'map', :query => query, :operation => operation_map )
+    selector_engine = Frank::Cucumber::FrankHelper.selector_engine || 'uiquery' # default to UIQuery for backwards compatibility
+    res = post_to_uispec_server( 'map', :query => query, :operation => operation_map, :selector_engine => selector_engine )
     res = JSON.parse( res )
     if res['outcome'] != 'SUCCESS'
       raise "frankly_map #{query} #{method_name} failed because: #{res['reason']}\n#{res['details']}"
@@ -109,18 +119,28 @@ module FrankHelper
         if frankly_ping
           num_consec_failures = 0
           num_consec_successes += 1
-          print (num_consec_successes == 1 ) ? "\n" : "\r"
-          print "FRANK!".slice(0,num_consec_successes)
         else
           num_consec_successes = 0
           num_consec_failures += 1
-          print (num_consec_failures == 1 ) ? "\n" : "\r"
-          print "PING FAILED" + "!"*num_consec_failures
+          if num_consec_failures >= 5 # don't show small timing errors
+            print (num_consec_failures == 5 ) ? "\n" : "\r"
+            print "PING FAILED" + "!"*num_consec_failures
+          end
         end
         STDOUT.flush
         sleep 0.2
       end
-      puts ''
+
+      if num_consec_successes < 6
+        print (num_consec_successes == 1 ) ? "\n" : "\r"
+        print "FRANK!".slice(0,num_consec_successes)
+        STDOUT.flush
+        puts ''
+      end
+
+      if num_consec_failures >= 5
+        puts ''
+      end
     end
 
     unless frankly_is_accessibility_enabled

data/lib/frank-cucumber/launcher.rb

@@ -0,0 +1,54 @@
+module Frank module Cucumber
+
+module Launcher 
+  
+  def launch_app(app_path)
+    if app_path.nil?
+      require 'frank-cucumber/app_bundle_locator'
+      message = "APP_BUNDLE_PATH is not set. \n\nPlease set APP_BUNDLE_PATH (either an environment variable, or the ruby constant in support/env.rb) to the path of your Frankified target's iOS app bundle."
+      possible_app_bundles = Frank::Cucumber::AppBundleLocator.new.guess_possible_app_bundles_for_dir( Dir.pwd )
+      if possible_app_bundles && !possible_app_bundles.empty?
+        message << "\n\nBased on your current directory, you probably want to use one of the following paths for your APP_BUNDLE_PATH:\n"
+        message << possible_app_bundles.join("\n")
+      end
+
+      raise "\n\n"+("="*80)+"\n"+message+"\n"+("="*80)+"\n\n"
+    end
+
+
+    # kill the app if it's already running, just in case this helps 
+    # reduce simulator flakiness when relaunching the app. Use a timeout of 5 seconds to 
+    # prevent us hanging around for ages waiting for the ping to fail if the app isn't running
+    begin
+      Timeout::timeout(5) { press_home_on_simulator if frankly_ping }
+    rescue Timeout::Error 
+    end
+
+
+    require 'sim_launcher'
+
+    if( ENV['USE_SIM_LAUNCHER_SERVER'] )
+      simulator = SimLauncher::Client.for_iphone_app( app_path )
+    else
+      simulator = SimLauncher::DirectClient.for_iphone_app( app_path )
+    end
+
+    num_timeouts = 0
+    loop do
+      begin
+        simulator.relaunch
+        wait_for_frank_to_come_up
+        break # if we make it this far without an exception then we're good to move on
+
+      rescue Timeout::Error
+        num_timeouts += 1
+        puts "Encountered #{num_timeouts} timeouts while launching the app."
+        if num_timeouts > 3
+          raise "Encountered #{num_timeouts} timeouts in a row while trying to launch the app." 
+        end
+      end
+    end
+
+  end
+end
+end end

data/lib/frank-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Frank
   module Cucumber
-    VERSION = "0.7.8"
+    VERSION = "0.8.0"
   end
 end

metadata

@@ -1,104 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: frank-cucumber
-version: !ruby/object:Gem::Version 
-  hash: 19
+version: !ruby/object:Gem::Version
+  version: 0.8.0
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 8
-  version: 0.7.8
 platform: ruby
-authors: 
+authors:
 - Pete Hodgson
 - Derek Longmuir
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-10-26 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-10 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: cucumber
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2153809540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2153809540
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2153808740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sim_launcher
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2153808740
+- !ruby/object:Gem::Dependency
+  name: sim_launcher
+  requirement: &2153808120 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: plist
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2153808120
+- !ruby/object:Gem::Dependency
+  name: plist
+  requirement: &2153807400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2153807400
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2153806780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: *2153806780
 description: Use cucumber to test native iOS apps via Frank
-email: 
+email:
 - gems@thepete.net
-executables: 
+executables:
 - frank-skeleton
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Rakefile
@@ -141,39 +117,30 @@ files:
 - lib/frank-cucumber/color_helper.rb
 - lib/frank-cucumber/core_frank_steps.rb
 - lib/frank-cucumber/frank_helper.rb
+- lib/frank-cucumber/launcher.rb
 - lib/frank-cucumber/version.rb
 homepage: http://rubygems.org/gems/frank-cucumber
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Use cucumber to test native iOS apps via Frank
 test_files: []
-