calabash-cucumber 0.9.21 → 0.9.22

data/lib/calabash-cucumber/calabash_steps.rb

@@ -4,7 +4,7 @@ STEP_PAUSE = (ENV['STEP_PAUSE'] || 0.5).to_f
 require 'rspec/expectations'
 
 Given /^(my|the) app is running$/ do |_|
-  #no-op on iOS
+  #no-op exists for backwards compatibility
 end
 
 
@@ -158,7 +158,7 @@ Then /^I wait and wait$/ do
   sleep 4
 end
 
-Then /^I wait and wait and wait\.\.\.$/ do
+Then /^I wait and wait and wait...$/ do
   sleep 10
 end
 
@@ -173,14 +173,28 @@ Then /^I go back$/ do
   sleep(STEP_PAUSE)
 end
 
-Then /^take picture$/ do
+Then /^(?:I\s)?take (?:picture|screenshot)$/ do
   sleep(STEP_PAUSE)
   screenshot
 end
 
 Then /^I swipe (left|right|up|down)$/ do |dir|
-    swipe(dir)
-    sleep(STEP_PAUSE)
+  swipe(dir)
+  sleep(STEP_PAUSE)
+end
+
+Then /^I swipe (left|right|up|down) on number (\d+)$/ do |dir, index|
+  index = index.to_i
+  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
+  swipe(dir, {:query => "scrollView index:#{index-1}"})
+  sleep(STEP_PAUSE)
+end
+
+Then /^I swipe (left|right|up|down) on number (\d+) at x (\d+) and y (\d+)$/ do |dir, index, x, y|
+  index = index.to_i
+  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
+  swipe(dir, {:offset => {:x => x.to_i, :y => y.to_i}, :query => "scrollView index:#{index-1}"})
+  sleep(STEP_PAUSE)
 end
 
 Then /^I swipe (left|right|up|down) on "([^\"]*)"$/ do |dir, mark|

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

@@ -33,7 +33,23 @@ module Calabash
           p_dir = dir.downcase
           ws_dir == p_dir
         }
-        File.dirname(info_plist) unless info_plist.nil?
+        if not info_plist.nil?
+          File.dirname(info_plist)
+        else
+          msg = ["Unable to find your built app."]
+          msg << "This means that Calabash can't automatically launch iOS simulator."
+          msg << "Searched in Xcode 4.x default: #{DEFAULT_DERIVED_DATA}"
+          msg << ""
+          msg << "To fix there are a couple of options:\n"
+          msg << "Option 1) Make sure you are running this command from your project directory, "
+          msg << "i.e., the directory containing your .xcodeproj file."
+          msg << "In Xcode, build your calabash target or scheme for simulator."
+          msg << "Check that your app can be found in\n #{File.expand_path("~/Library/Developer/Xcode/DerivedData")}"
+          msg << "\n\nOption 2). In features/support/launch.rb set APP_BUNDLE_PATH to"
+          msg << "the path where Xcode has built your Calabash target or scheme."
+          msg << "Alternatively you can use the environment variable APP_BUNDLE_PATH.\n"
+          raise msg.join("\n")
+        end
       end
 
       def self.project_dir

data/lib/calabash-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.21"
+    VERSION = "0.9.22"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.21
+  version: 0.9.22
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-02 00:00:00.000000000 Z
+date: 2012-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70174271608780 !ruby/object:Gem::Requirement
+  requirement: &70329976661400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174271608780
+  version_requirements: *70329976661400
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70174271608340 !ruby/object:Gem::Requirement
+  requirement: &70329976660760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174271608340
+  version_requirements: *70329976660760
 - !ruby/object:Gem::Dependency
   name: CFPropertyList
-  requirement: &70174271607880 !ruby/object:Gem::Requirement
+  requirement: &70329976660080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174271607880
+  version_requirements: *70329976660080
 - !ruby/object:Gem::Dependency
   name: sim_launcher
-  requirement: &70174271607380 !ruby/object:Gem::Requirement
+  requirement: &70329976659660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174271607380
+  version_requirements: *70329976659660
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
-  requirement: &70174271606840 !ruby/object:Gem::Requirement
+  requirement: &70329976659240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174271606840
+  version_requirements: *70329976659240
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70174271606200 !ruby/object:Gem::Requirement
+  requirement: &70329976675180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174271606200
+  version_requirements: *70329976675180
 - !ruby/object:Gem::Dependency
   name: pbxproject
-  requirement: &70174271605320 !ruby/object:Gem::Requirement
+  requirement: &70329976674760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70174271605320
+  version_requirements: *70329976674760
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email:
@@ -110,7 +110,6 @@ files:
 - bin/calabash-ios-setup.rb
 - bin/calabash-ios-sim.rb
 - calabash-cucumber.gemspec
-- copy_resources.sh
 - doc/calabash-ios-help.txt
 - epl-v10.html
 - features-skeleton/.irbrc

data/copy_resources.sh

@@ -1,2 +0,0 @@
-#!/bin/bash
-cp ../resources/* lib/calabash-cucumber/resources/