calabash-cucumber 0.9.144 → 0.9.145.pre1

data/bin/calabash-ios-build.rb

@@ -48,8 +48,8 @@ def console
   path = ENV['CALABASH_IRBRC']
   unless path
     path = File.expand_path(File.join(@script_dir,".irbrc"))
-    ENV['IRBRC'] = path
   end
+  ENV['IRBRC'] = path
   puts "Running irb..."
   exec("irb")
 end
@@ -93,4 +93,4 @@ def run(options={:build_dir=>"Calabash",
   end
   system(cmd)
   puts "Done..."
-end
+end

data/features/step_definitions/calabash_steps.rb

@@ -171,7 +171,7 @@ Then /^I wait to see a navigation bar titled "([^\"]*)"$/ do |expected_mark|
 end
 
 Then /^I wait for the "([^\"]*)" (?:input|text) field$/ do |placeholder|
-  wait_for(WAIT_TIMEOUT) { element_exists( "textField placeholder:'#{placeholder}'") }
+  wait_for(WAIT_TIMEOUT) { element_exists( "textField placeholder:'#{placeholder}'") || element_exists( "textField marked:'#{placeholder}'") }
 end
 
 Then /^I wait for (\d+) (?:input|text) field(?:s)?$/ do |count|
@@ -381,7 +381,7 @@ Then /^I see (\d+) (?:input|text) field(?:s)?$/ do |count|
 end
 
 Then /^I should see a "([^\"]*)" (?:input|text) field$/ do |expected_mark|
-  res = element_exists("textField placeholder:'#{expected_mark}'") or
+  res = element_exists("textField placeholder:'#{expected_mark}'") ||
           element_exists("textField marked:'#{expected_mark}'")
   unless res
     screenshot_and_raise "Expected textfield with placeholder or accessibilityLabel: #{expected_mark}"

data/lib/calabash-cucumber/core.rb

@@ -356,9 +356,17 @@ EOF
 
         if data.nil? and os=="ios6"
           recording = recording_name_for(recording_name, "ios5", device)
+          data = load_recording(recording, rec_dir)
+        end
+
+        if data.nil? and device=='ipad'
+          if ENV['FULL_CONSOLE_OUTPUT'] == '1'
+            puts "Unable to find recording for #{os} and #{device}. Trying with #{os} iphone"
+          end
+          recording = recording_name_for(recording_name, os, 'iphone')
+          data = load_recording(recording, rec_dir)
         end
 
-        data = load_recording(recording, rec_dir)
 
         if data.nil?
           screenshot_and_raise "Playback not found: #{recording} (searched for #{recording} in #{Dir.pwd}, #{rec_dir}, #{DATA_PATH}/resources"

data/lib/calabash-cucumber/version.rb

@@ -1,6 +1,6 @@
 module Calabash
   module Cucumber
-    VERSION = '0.9.144'
-    FRAMEWORK_VERSION = '0.9.144'
+    VERSION = '0.9.145.pre1'
+    FRAMEWORK_VERSION = '0.9.145.pre1'
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.144
-  prerelease: 
+  version: 0.9.145.pre1
+  prerelease: 8
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -318,9 +318,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23