frank-cucumber 0.8.6 → 0.8.7

data/Rakefile

@@ -1,4 +1,5 @@
 require 'bundler'
+require 'rake/testtask'
 Bundler::GemHelper.install_tasks
 
 task :edit_version do
@@ -7,3 +8,10 @@ end
 
 task :ev => :edit_version
 
+Rake::TestTask.new do |t|
+  t.libs << "test"
+  t.test_files = FileList['test/*_test.rb','test/*_acceptance.rb']
+  t.verbose = true
+end
+
+task :default => ["test"]

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

@@ -1,4 +1,20 @@
+def app_path
+  ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH)
+end
+
 Given /^I launch the app$/ do
-  app_path = ENV['APP_BUNDLE_PATH'] || (defined?(APP_BUNDLE_PATH) && APP_BUNDLE_PATH)
+  # latest sdk and iphone by default
   launch_app app_path
 end
+
+Given /^I launch the app using iOS (\d\.\d)$/ do |sdk|
+  # You can grab a list of the installed SDK with sim_launcher
+  # > run sim_launcher from the command line
+  # > open a browser to http://localhost:8881/showsdks
+  # > use one of the sdk you see in parenthesis (e.g. 4.2)
+  launch_app app_path, sdk
+end
+
+Given /^I launch the app using iOS (\d\.\d) and the (iphone|ipad) simulator$/ do |sdk, version|
+  launch_app app_path, sdk, version
+end

data/lib/frank-cucumber/launcher.rb

@@ -1,20 +1,37 @@
+require 'sim_launcher'
+require 'frank-cucumber/app_bundle_locator'
+
 module Frank module Cucumber
 
 module Launcher 
-  
-  def launch_app(app_path)
+  attr_accessor :application_path, :sdk, :version
+
+  def simulator_client
+    @simulator_client ||= SimLauncher::Client.new(@application_path, @sdk, @version)
+  end
+
+  def simulator_direct_client
+    @simulator_direct_client ||= SimLauncher::DirectClient.new(@application_path, @sdk, @version)
+  end
+
+  def enforce(app_path, locator = Frank::Cucumber::AppBundleLocator.new)
     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 )
+      possible_app_bundles = locator.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
+  end
+
+  def launch_app(app_path, sdk = nil, version = 'iphone')
+    @application_path = app_path
+    @sdk = sdk
+    @version = version
 
+    enforce(app_path)
 
     # 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 
@@ -24,13 +41,10 @@ module Launcher
     rescue Timeout::Error 
     end
 
-
-    require 'sim_launcher'
-
     if( ENV['USE_SIM_LAUNCHER_SERVER'] )
-      simulator = SimLauncher::Client.for_iphone_app( app_path )
+      simulator = simulator_client
     else
-      simulator = SimLauncher::DirectClient.for_iphone_app( app_path )
+      simulator = simulator_direct_client
     end
 
     num_timeouts = 0

data/lib/frank-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Frank
   module Cucumber
-    VERSION = "0.8.6"
+    VERSION = "0.8.7"
   end
 end

data/test/launcher_test.rb

@@ -0,0 +1,43 @@
+require_relative 'test_helper.rb'
+
+def wait_for_frank_to_come_up
+  # orig FrankHelper::wait_for_frank_to_come_up
+  # doing nothing
+end
+
+describe "frank cucumber launcher" do
+
+  describe "when the path is wrong" do
+  
+    it 'throws exception when no app path is given' do
+      assert_raises(RuntimeError) do
+        enforce(nil)
+      end
+    end
+
+    it 'prints suggestions if available' do
+        mock_locator = Mock.new
+        mock_locator.expect :guess_possible_app_bundles_for_dir, ['suggestion_1'], ['']
+        begin
+          enforce(nil, mock_locator)
+        rescue RuntimeError => e
+          e.message.must_match "suggestion_1"
+        end
+    end
+  end
+
+  describe "when starting the simulator with the specified params" do
+
+    before do
+      @simulator_direct_client = Mock.new 
+      @simulator_direct_client.expect :relaunch, nil, [] 
+    end
+    
+    it 'selects iphone mode by default' do
+      launch_app('test_path', 'X.Y')
+      @version.must_equal 'iphone'
+    end
+
+  end
+
+end

data/test/test_helper.rb

@@ -0,0 +1,10 @@
+require 'stringio'
+require 'minitest/autorun'
+require 'minitest/mock'
+require 'minitest/spec'
+include MiniTest
+require_relative '../lib/frank-cucumber/color_helper'
+require_relative '../lib/frank-cucumber/frank_helper'
+require_relative '../lib/frank-cucumber/launcher'
+include Frank::Cucumber::Launcher
+include Frank::Cucumber::FrankHelper

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: frank-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-02 00:00:00.000000000Z
+date: 2011-12-22 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2160510280 !ruby/object:Gem::Requirement
+  requirement: &70187491760960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160510280
+  version_requirements: *70187491760960
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2160490760 !ruby/object:Gem::Requirement
+  requirement: &70187491760440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160490760
+  version_requirements: *70187491760440
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &2160490260 !ruby/object:Gem::Requirement
+  requirement: &70187491760020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160490260
+  version_requirements: *70187491760020
 - !ruby/object:Gem::Dependency
   name: plist
-  requirement: &2160489700 !ruby/object:Gem::Requirement
+  requirement: &70187491759560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160489700
+  version_requirements: *70187491759560
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2160489260 !ruby/object:Gem::Requirement
+  requirement: &70187491759140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,7 +66,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2160489260
+  version_requirements: *70187491759140
 description: Use cucumber to test native iOS apps via Frank
 email:
 - gems@thepete.net
@@ -120,6 +120,8 @@ files:
 - lib/frank-cucumber/frank_helper.rb
 - lib/frank-cucumber/launcher.rb
 - lib/frank-cucumber/version.rb
+- test/launcher_test.rb
+- test/test_helper.rb
 homepage: http://rubygems.org/gems/frank-cucumber
 licenses: []
 post_install_message: 
@@ -144,4 +146,6 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Use cucumber to test native iOS apps via Frank
-test_files: []
+test_files:
+- test/launcher_test.rb
+- test/test_helper.rb