calabash-cucumber 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d6cbee30387774f5207e700fa487a5a65174c62f
-  data.tar.gz: 7cc8df83ee4c83491f0b53a596185f12c1d5254c
+  metadata.gz: ffa8aea9b8e03a9601bed26f7a30ad9243dfb930
+  data.tar.gz: df96dc379a76662a9a2f1a2610e51a9027099b75
 SHA512:
-  metadata.gz: 323d36e033c8fe0a9ee35abbd8c7d8843ef7f322b61e2b7a28a5a51737e4881bb47cb6bfeec77388e94bad20b6f99a029667fa9ade0ee2c4ff162461c5e9b16a
-  data.tar.gz: 957434b57174ff61a6dadbd399ef15b13d2388ea93ac4206e7204411fd271bf0d0394197dd44e096b50c9f0b4c2ef8e22437c2b5ad8ba29d0851905ae99280d1
+  metadata.gz: 4e981cc007418f8044f03ba925c79c3f71cc3c8dede0799c3b2629a0758ca5354d885b9ba82ce8152e62c10bf91fc13724d21fb943df84479238d32c442a3b46
+  data.tar.gz: 70e0f1c3188959ad2a45e34a4741fb6fed59f93544750bce3fb7c321da76f2513f6fe03a627a7ab07058fa08f190034070081c1bcea7b20f2b61ebab24b95d01

data/features-skeleton/support/01_launch.rb

@@ -15,7 +15,7 @@
 require 'calabash-cucumber/launcher'
 
 
-# APP_BUNDLE_PATH = "~/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app"
+# APP_BUNDLE_PATH = "#{ENV['HOME']}/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app"
 # You may uncomment the above to overwrite the APP_BUNDLE_PATH
 # However the recommended approach is to let Calabash find the app itself
 # or set the environment variable APP_BUNDLE_PATH

data/features/step_definitions/calabash_steps.rb

@@ -2,89 +2,85 @@ WAIT_TIMEOUT = (ENV['WAIT_TIMEOUT'] || 30).to_f
 STEP_PAUSE = (ENV['STEP_PAUSE'] || 0.5).to_f
 
 Given /^(my|the) app is running$/ do |_|
-  #no-op exists for backwards compatibility
+  # no-op exists for backwards compatibility
 end
 
-
-# -- Touch --#
+### Touch ###
 Then /^I (?:press|touch) on screen (\d+) from the left and (\d+) from the top$/ do |x, y|
-  touch(nil, {:offset => {:x => x.to_i, :y => y.to_i}})
+  touch(nil, { offset: { x: x.to_i, y: y.to_i } })
   sleep(STEP_PAUSE)
 end
 
 Then /^I (?:press|touch) "([^\"]*)"$/ do |name|
-  touch("view marked:'#{name}'")
+  touch("view marked: '#{name}'")
   sleep(STEP_PAUSE)
 end
 
-Then /^I (?:press|touch) (\d+)% right and (\d+)% down from "([^\"]*)"$/ do |x,y,name|
-  raise "This step is not yet implemented on iOS"
+Then /^I (?:press|touch) (\d+)% right and (\d+)% down from "([^\"]*)"$/ do |x, y, name|
+  raise 'This step is not yet implemented on iOS'
 end
 
 Then /^I (?:press|touch) button number (\d+)$/ do |index|
   index = index.to_i
-  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-  touch("button index:#{index-1}")
+  screenshot_and_raise("Index should be positive (was: #{index})") if index <= 0
+  touch("button index: #{index - 1}")
   sleep(STEP_PAUSE)
 end
 
 Then /^I (?:press|touch) the "([^\"]*)" button$/ do |name|
-  touch("button marked:'#{name}'")
+  touch("button marked: '#{name}'")
   sleep(STEP_PAUSE)
 end
 
 Then /^I (?:press|touch) (?:input|text) field number (\d+)$/ do |index|
   index = index.to_i
-  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-  touch("textField index:#{index-1}")
-  sleep(STEP_PAUSE)  
+  screenshot_and_raise("Index should be positive (was: #{index})") if index <= 0
+  touch("textField index: #{index - 1}")
+  sleep(STEP_PAUSE)
 end
 
-
 Then /^I (?:press|touch) the "([^\"]*)" (?:input|text) field$/ do |name|
-  placeholder_query = "textField placeholder:'#{name}'"
-  marked_query = "textField marked:'#{name}'"
+  placeholder_query = "textField placeholder: '#{name}'"
+  marked_query = "textField marked: '#{name}'"
   if !query(placeholder_query).empty?
     touch(placeholder_query)
   elsif !query(marked_query).empty?
     touch(marked_query)
   else
-    screenshot_and_raise "could not find text field with placeholder '#{name}' or marked as '#{name}'"
+    screenshot_and_raise "Could not find text field with placeholder '#{name}' or marked as '#{name}'"
   end
   sleep(STEP_PAUSE)
 end
 
-#Note in tables views: this means visible cell index!
+# Note in tables views: this means visible cell index!
 Then /^I (?:press|touch) list item number (\d+)$/ do |index|
-   index = index.to_i
-   screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-   touch("tableViewCell index:#{index-1}")
-   sleep(STEP_PAUSE)
+  index = index.to_i
+  screenshot_and_raise("Index should be positive (was: #{index})") if index <= 0
+  touch("tableViewCell index: #{index - 1}")
+  sleep(STEP_PAUSE)
 end
 
 Then /^I (?:press|touch) list item "([^\"]*)"$/ do |cell_name|
-  if
-  query("tableViewCell marked:'#{cell_name}'").empty?
-  then
-    touch("tableViewCell text:'#{cell_name}'")
+  if query("tableViewCell marked: '#{cell_name}'").empty?
+    touch("tableViewCell text:' #{cell_name}'")
   else
-    touch("tableViewCell marked:'#{cell_name}'")
+    touch("tableViewCell marked: '#{cell_name}'")
   end
   sleep(STEP_PAUSE)
 end
 
 Then /^I toggle the switch$/ do
-  touch("switch")
+  touch('switch')
   sleep(STEP_PAUSE)
 end
 
 Then /^I toggle the "([^\"]*)" switch$/ do |name|
-  touch("switch marked:'#{name}'")
+  touch("switch marked: '#{name}'")
   sleep(STEP_PAUSE)
 end
 
 Then /^I touch (?:the)? user location$/ do
-  touch("view:'MKUserLocationView'")
+  touch("view: 'MKUserLocationView'")
   sleep(STEP_PAUSE)
 end
 
@@ -93,54 +89,51 @@ Then /^I (?:touch|press) (?:done|search)$/ do
   sleep(STEP_PAUSE)
 end
 
-
-## -- Entering text -- ##
-
+### Entering text ###
 Then /^I enter "([^\"]*)" into the "([^\"]*)" field$/ do |text_to_type, field_name|
-  touch("textField marked:'#{field_name}'")
-  wait_for_keyboard()
+  touch("textField marked: '#{field_name}'")
+  wait_for_keyboard
   keyboard_enter_text text_to_type
   sleep(STEP_PAUSE)
 end
 
 Then /^I enter "([^\"]*)" into the "([^\"]*)" (?:text|input) field$/ do |text_to_type, field_name|
-  touch("textField marked:'#{field_name}'")
-  wait_for_keyboard()
+  touch("textField marked: '#{field_name}'")
+  wait_for_keyboard
   keyboard_enter_text text_to_type
   sleep(STEP_PAUSE)
 end
 
-# alias
+# Alias
 Then /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |text_field, text_to_type|
-  macro %Q|I enter "#{text_to_type}" into the "#{text_field}" text field|
+  macro %(I enter "#{text_to_type}" into the "#{text_field}" text field)
 end
 
 Then /^I use the native keyboard to enter "([^\"]*)" into the "([^\"]*)" (?:text|input) field$/ do |text_to_type, field_name|
-  macro %Q|I touch the "#{field_name}" text field|
-  wait_for_keyboard()
+  macro %(I touch the "#{field_name}" text field)
+  wait_for_keyboard
   keyboard_enter_text(text_to_type)
   sleep(STEP_PAUSE)
 end
 
 Then /^I fill in text fields as follows:$/ do |table|
   table.hashes.each do |row|
-    macro %Q|I enter "#{row['text']}" into the "#{row['field']}" text field|
+    macro %(I enter "#{row['text']}" into the "#{row['field']}" text field)
   end
 end
 
 Then /^I enter "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text, index|
   index = index.to_i
-  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-  touch("textField index:#{index-1}")
-  wait_for_keyboard()
+  screenshot_and_raise("Index should be positive (was: #{index})") if index <= 0
+  touch("textField index: #{index - 1}")
+  wait_for_keyboard
   keyboard_enter_text text
   sleep(STEP_PAUSE)
 end
 
 Then /^I use the native keyboard to enter "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text_to_type, index|
-  idx = index.to_i
-  macro %Q|I touch text field number #{idx}|
-  wait_for_keyboard()
+  macro %(I touch text field number #{index})
+  wait_for_keyboard
   keyboard_enter_text(text_to_type)
   sleep(STEP_PAUSE)
 end
@@ -148,61 +141,58 @@ end
 When /^I clear "([^\"]*)"$/ do |name|
   msg = "When I clear <name>' will be deprecated because it is ambiguous - what should be cleared?"
   _deprecated('0.9.151', msg, :warn)
-  clear_text("textField marked:'#{name}'")
+  clear_text("textField marked: '#{name}'")
 end
 
 Then /^I clear (?:input|text) field number (\d+)$/ do |index|
   index = index.to_i
-  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-  clear_text("textField index:#{index-1}")
+  screenshot_and_raise("Index should be positive (was: #{index})") if index <= 0
+  clear_text("textField index: #{index - 1}")
 end
 
-# -- See -- #
+### See ###
 Then /^I wait to see "([^\"]*)"$/ do |expected_mark|
-  wait_for(WAIT_TIMEOUT) { view_with_mark_exists( expected_mark ) }
+  wait_for(WAIT_TIMEOUT) { view_with_mark_exists(expected_mark) }
 end
 
 Then /^I wait until I don't see "([^\"]*)"$/ do |expected_mark|
-  sleep 1## wait for previous screen to disappear
-  wait_for(WAIT_TIMEOUT) { not element_exists( "view marked:'#{expected_mark}'" )}
+  sleep 1 # wait for previous screen to disappear
+  wait_for(WAIT_TIMEOUT) { !element_exists("view marked: '#{expected_mark}'") }
 end
 
 Then /^I wait to not see "([^\"]*)"$/ do |expected_mark|
-  macro %Q|I wait until I don't see "#{expected_mark}"|
+  macro %(I wait until I don't see "#{expected_mark}")
 end
 
 Then /^I wait for "([^\"]*)" to appear$/ do |name|
-  macro %Q|I wait to see "#{name}"|
+  macro %(I wait to see "#{name}")
 end
 
 Then /^I wait for the "([^\"]*)" button to appear$/ do |name|
-  wait_for(WAIT_TIMEOUT) { element_exists( "button marked:'#{name}'" ) }
+  wait_for(WAIT_TIMEOUT) { element_exists("button marked: '#{name}'") }
 end
 
 Then /^I wait to see a navigation bar titled "([^\"]*)"$/ do |expected_mark|
-  msg = "waited for '#{WAIT_TIMEOUT}' seconds but did not see the navbar with title '#{expected_mark}'"
-  wait_for(:timeout => WAIT_TIMEOUT,
-           :timeout_message => msg ) do
-    all_items = query("navigationItemView marked:'#{expected_mark}'")
-    button_items = query("navigationItemButtonView")
+  msg = "Waited for '#{WAIT_TIMEOUT}' seconds but did not see the navbar with title '#{expected_mark}'"
+  wait_for(timeout: WAIT_TIMEOUT, timeout_message: msg ) do
+    all_items = query("navigationItemView marked: '#{expected_mark}'")
+    button_items = query('navigationItemButtonView')
     non_button_items = all_items.delete_if { |item| button_items.include?(item) }
     !non_button_items.empty?
   end
 end
 
 Then /^I wait for the "([^\"]*)" (?:input|text) field$/ do |placeholder_or_view_mark|
-  wait_for(WAIT_TIMEOUT) {
-    element_exists( "textField placeholder:'#{placeholder_or_view_mark}'") ||
-          element_exists( "textField marked:'#{placeholder_or_view_mark}'")
-  }
+  wait_for(WAIT_TIMEOUT) do
+    element_exists("textField placeholder: '#{placeholder_or_view_mark}'") ||
+    element_exists("textField marked: '#{placeholder_or_view_mark}'")
+  end
 end
 
 Then /^I wait for (\d+) (?:input|text) field(?:s)?$/ do |count|
-  count = count.to_i
-  wait_for(WAIT_TIMEOUT) { query(:textField).count >= count  }
+  wait_for(WAIT_TIMEOUT) { query(:textField).count >= count.to_i }
 end
 
-
 Then /^I wait$/ do
   sleep 2
 end
@@ -216,13 +206,11 @@ Then /^I wait and wait and wait...$/ do
 end
 
 When /^I wait for ([\d\.]+) second(?:s)?$/ do |num_seconds|
-  num_seconds = num_seconds.to_f
-  sleep num_seconds
+  sleep num_seconds.to_f
 end
 
-
 Then /^I go back$/ do
-  touch("navigationItemButtonView first")
+  touch('navigationItemButtonView first')
   sleep(STEP_PAUSE)
 end
 
@@ -238,194 +226,179 @@ 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}"})
+  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}"})
+  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|
-    swipe(dir, {:query => "view marked:'#{mark}'"})
-    sleep(STEP_PAUSE)
+  swipe(dir, { query: "view marked: '#{mark}'" })
+  sleep(STEP_PAUSE)
 end
 
 Then /^I swipe on cell number (\d+)$/ do |index|
   index = index.to_i
-  screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
-  cell_swipe({:query => "tableViewCell index:#{index-1}"})
+  screenshot_and_raise("Index should be positive (was: #{index})") if index <= 0
+  cell_swipe({ query: "tableViewCell index: #{index - 1}" })
   sleep(STEP_PAUSE)
 end
 
-
-##pinch##
+### Pinch ###
 Then /^I pinch to zoom (in|out)$/ do |in_out|
   pinch(in_out)
   sleep(STEP_PAUSE)
 end
 
 Then /^I pinch to zoom (in|out) on "([^\"]*)"$/ do |in_out, name|
-  pinch(in_out,{:query => "view marked:'#{name}'"})
+  pinch(in_out, { query: "view marked: '#{name}'" })
   sleep(STEP_PAUSE)
 end
 
-#   Note "up/left/right" seems to be missing on the web base
+# Note "up/left/right" seems to be missing on the web base
 Then /^I scroll (left|right|up|down)$/ do |dir|
-  scroll("scrollView index:0", dir)
+  scroll('scrollView index: 0', dir)
   sleep(STEP_PAUSE)
 end
 
-Then /^I scroll (left|right|up|down) on "([^\"]*)"$/ do |dir,name|
-  scroll("view marked:'#{name}'", dir)
+Then /^I scroll (left|right|up|down) on "([^\"]*)"$/ do |dir, name|
+  scroll("view marked: '#{name}'", dir)
   sleep(STEP_PAUSE)
 end
 
-
-
 ### Playback ###
 Then /^I playback recording "([^\"]*)"$/ do |filename|
-    playback(filename)
-    sleep(STEP_PAUSE)
+  playback(filename)
+  sleep(STEP_PAUSE)
 end
 
 Then /^I playback recording "([^\"]*)" on "([^\"]*)"$/ do |filename, name|
-    playback(filename, {:query => "view marked:'#{name}'"})
-    sleep(STEP_PAUSE)
+  playback(filename, { query: "view marked: '#{name}'" })
+  sleep(STEP_PAUSE)
 end
 
 Then /^I playback recording "([^\"]*)" on "([^\"]*)" with offset (\d+),(\d+)$/ do |filename, name, x, y|
-  x = x.to_i
-  y = y.to_i
-  playback(filename, {:query => "view marked:'#{name}'", :offset => {:x => x, :y => y}})
+  playback(filename, { query: "view marked:'#{name}'", offset: { x: x.to_i, y: y.to_i } })
   sleep(STEP_PAUSE)
 end
 
 Then /^I reverse playback recording "([^\"]*)"$/ do |filename|
-  playback(filename, {:reverse => true})
+  playback(filename, { reverse: true })
   sleep(STEP_PAUSE)
 end
 
 Then /^I reverse playback recording "([^\"]*)" on "([^\"]*)"$/ do |filename, name|
-  playback(filename, {:query => "view marked:'#{name}'",:reverse => true})
+  playback(filename, { query: "view marked: '#{name}'", reverse: true })
   sleep(STEP_PAUSE)
 end
 
 Then /^I reverse playback recording "([^\"]*)" on "([^\"]*)" with offset (\d+),(\d+)$/ do |filename, name, x, y|
-  x = x.to_i
-  y = y.to_i
-  playback(filename, {:query => "view marked:'#{name}'", :offset => {:x => x, :y => y},:reverse => true})
+  playback(filename, { query: "view marked: '#{name}'", offset: { x: x.to_i, y: y.to_i }, reverse: true })
   sleep(STEP_PAUSE)
 end
 
-
 ### Device orientation ###
 Then /^I rotate device (left|right)$/ do |dir|
-  dir = dir.to_sym
-  rotate(dir)
-  sleep(5)#SERVO wait
+  rotate(dir.to_sym)
+  sleep 5 # Servo wait
 end
 
 Then /^I send app to background for (\d+) seconds$/ do |secs|
   secs = secs.to_f
   send_app_to_background(secs)
-  sleep(secs+10)
+  sleep(secs + 10)
 end
 
 ### Assertions ###
 Then /^I should see "([^\"]*)"$/ do |expected_mark|
-  res = (element_exists( "view marked:'#{expected_mark}'" ) or
-         element_exists( "view text:'#{expected_mark}'"))
-  if not res
+  until element_exists("view marked:'#{expected_mark}'") ||
+        element_exists("view text:'#{expected_mark}'")
     screenshot_and_raise "No element found with mark or text: #{expected_mark}"
   end
 end
 
 Then /^I should not see "([^\"]*)"$/ do |expected_mark|
-  res = query("view marked:'#{expected_mark}'")
-  res.concat query("view text:'#{expected_mark}'")
+  res = query("view marked: '#{expected_mark}'")
+  res.concat query("view text: '#{expected_mark}'")
   unless res.empty?
-    screenshot_and_raise "Expected no element with text nor accessibilityLabel: #{expected_mark}, found #{res.join(", ")}"
+    screenshot_and_raise "Expected no element with text nor accessibilityLabel: #{expected_mark}, found #{res.join(', ')}"
   end
 end
 
 Then /^I should see a "([^\"]*)" button$/ do |expected_mark|
-  check_element_exists("button marked:'#{expected_mark}'")
+  check_element_exists("button marked: '#{expected_mark}'")
 end
 Then /^I should not see a "([^\"]*)" button$/ do |expected_mark|
-  check_element_does_not_exist("button marked:'#{expected_mark}'")
+  check_element_does_not_exist("button marked: '#{expected_mark}'")
 end
 
 Then /^I don't see the text "([^\"]*)"$/ do |text|
-  macro %Q|I should not see "#{text}"|
+  macro %(I should not see "#{text}")
 end
 Then /^I don't see the "([^\"]*)"$/ do |text|
-  macro %Q|I should not see "#{text}"|
+  macro %(I should not see "#{text}")
 end
 
 Then /^I see the text "([^\"]*)"$/ do |text|
-  macro %Q|I should see "#{text}"|
+  macro %(I should see "#{text}")
 end
+
 Then /^I see the "([^\"]*)"$/ do |text|
-  macro %Q|I should see "#{text}"|
+  macro %(I should see "#{text}")
 end
 
 Then /^I (?:should)? see text starting with "([^\"]*)"$/ do |text|
-  res = query("view {text BEGINSWITH '#{text}'}").empty?
-  if res
+  if query("view {text BEGINSWITH '#{text}'}").empty?
     screenshot_and_raise "No text found starting with: #{text}"
   end
 end
 
 Then /^I (?:should)? see text containing "([^\"]*)"$/ do |text|
-  res = query("view {text LIKE '*#{text}*'}").empty?
-  if res
+  if query("view {text LIKE '*#{text}*'}").empty?
     screenshot_and_raise "No text found containing: #{text}"
   end
 end
 
 Then /^I (?:should)? see text ending with "([^\"]*)"$/ do |text|
-  res = query("view {text ENDSWITH '#{text}'}").empty?
-  if res
+  if query("view {text ENDSWITH '#{text}'}").empty?
     screenshot_and_raise "No text found ending with: #{text}"
   end
 end
 
 Then /^I see (\d+) (?:input|text) field(?:s)?$/ do |count|
-  count = count.to_i
   cnt = query(:textField).count
-  if cnt < count
-      screenshot_and_raise "Expected at least #{count} text/input fields, found #{cnt}"
+  if cnt < count.to_i
+    screenshot_and_raise "Expected at least #{count} text/input fields, found #{cnt}"
   end
 end
 
 Then /^I should see a "([^\"]*)" (?:input|text) field$/ do |expected_mark|
-  res = element_exists("textField placeholder:'#{expected_mark}'") ||
-          element_exists("textField marked:'#{expected_mark}'")
-  unless res
+  unless element_exists("textField placeholder: '#{expected_mark}'") ||
+         element_exists("textField marked: '#{expected_mark}'")
     screenshot_and_raise "Expected textfield with placeholder or accessibilityLabel: #{expected_mark}"
   end
 end
 
 Then /^I should not see a "([^\"]*)" (?:input|text) field$/ do |expected_mark|
-  res = query("textField placeholder:'#{expected_mark}'")
-  res.concat query("textField marked:'#{expected_mark}'")
+  res = query("textField placeholder: '#{expected_mark}'")
+  res.concat query("textField marked: '#{expected_mark}'")
   unless res.empty?
     screenshot_and_raise "Expected no textfield with placeholder nor accessibilityLabel: #{expected_mark}, found #{res}"
   end
 end
 
-
 Then /^I should see a map$/ do
-  check_element_exists("view:'MKMapView'")
+  check_element_exists("view: 'MKMapView'")
 end
 
 Then /^I should see (?:the)? user location$/ do
-  check_element_exists("view:'MKUserLocationView'")
+  check_element_exists("view: 'MKUserLocationView'")
 end
 
 ### Date Picker ###
@@ -433,7 +406,7 @@ end
 # time_str can be in any format that Time can parse
 Then(/^I change the date picker time to "([^"]*)"$/) do |time_str|
   target_time = Time.parse(time_str)
-  current_date = date_time_from_picker()
+  current_date = date_time_from_picker
   current_date = DateTime.new(current_date.year,
                               current_date.mon,
                               current_date.day,
@@ -448,7 +421,7 @@ end
 # date_str can be in any format that Date can parse
 Then(/^I change the date picker date to "([^"]*)"$/) do |date_str|
   target_date = Date.parse(date_str)
-  current_time = date_time_from_picker()
+  current_time = date_time_from_picker
   date_time = DateTime.new(target_date.year,
                            target_date.mon,
                            target_date.day,
@@ -463,6 +436,6 @@ end
 
 # date_str can be in any format that Date can parse
 Then(/^I change the date picker date to "([^"]*)" at "([^"]*)"$/) do |date_str, time_str|
-  macro %Q|I change the date picker time to "#{time_str}"|
-  macro %Q|I change the date picker date to "#{date_str}"|
+  macro %(I change the date picker time to "#{time_str}")
+  macro %(I change the date picker date to "#{date_str}")
 end

data/lib/calabash-cucumber/device.rb

@@ -108,15 +108,17 @@ module Calabash
       # @return [Boolean] `true` if the app under test is emulated
       attr_reader :iphone_app_emulated_on_ipad
 
-      # Indicates whether or not this device has a 4in screen.
-      # @attribute [r] iphone_4in
-      # @return [Boolean] `true` if this device has a 4in screen.
-      attr_reader :iphone_4in
-
-      # @deprecated 0.10.0 no replacement
-      # @!attribute [rw] udid
-      # @return [String] The udid of this device.
-      attr_accessor :udid
+      # The form factor of this device.
+      # @attribute [r] form_factor
+      #
+      # Will be one of:
+      #   * ipad
+      #   * iphone 4in
+      #   * iphone 3.5in
+      #   * iphone 6
+      #   * iphone 6+
+      #   * "" # if no information can be found.
+      attr_reader :form_factor
 
       # For Calabash server version > 0.10.2 provides
       # device specific screen information.
@@ -134,6 +136,17 @@ module Calabash
       # @return [Hash] screen dimensions, scale and down/up sampling fraction.
       attr_reader :screen_dimensions
 
+      # @deprecated 0.13.1 no replacement
+      # Indicates whether or not this device has a 4in screen.
+      # @attribute [r] iphone_4in
+      # @return [Boolean] `true` if this device has a 4in screen.
+      attr_reader :iphone_4in
+
+      # @deprecated 0.10.0 no replacement
+      # @!attribute [rw] udid
+      # @return [String] The udid of this device.
+      attr_accessor :udid
+
       # Creates a new instance of Device.
       #
       # @see Calabash::Cucumber::Core#server_version
@@ -150,7 +163,6 @@ module Calabash
         @ios_version = version_data['iOS_version']
         @server_version = version_data['version']
         @iphone_app_emulated_on_ipad = version_data['iphone_app_emulated_on_ipad']
-        @iphone_4in = version_data['4inch']
         screen_dimensions = version_data['screen_dimensions']
         if screen_dimensions
           @screen_dimensions = {}
@@ -158,6 +170,10 @@ module Calabash
             @screen_dimensions[key.to_sym] = val
           end
         end
+        @form_factor = version_data['form_factor']
+
+        # Deprecated 0.13.0
+        @iphone_4in = version_data['4inch']
       end
 
       # Is this device a simulator or physical device?
@@ -193,17 +209,25 @@ module Calabash
       # Is this device a 4in iPhone?
       # @return [Boolean] true if this device is a 4in iphone
       def iphone_4in?
-        @iphone_4in
+        form_factor == 'iphone 4in'
       end
 
-      # @deprecated 0.9.168 replaced with iphone_4in?
-      # @see #iphone_4in?
-      # Is this device an iPhone 5?
-      # @note Deprecated because the iPhone 5S reports as an iPhone6,*.
-      # @return [Boolean] true if this device is an iPhone 5
-      def iphone_5?
-        _deprecated('0.9.168', "use 'iphone_4in?' instead", :warn)
-        iphone_4in?
+      # Is this device an iPhone 6?
+      # @return [Boolean] true if this device is an iPhone 6
+      def iphone_6?
+        form_factor == 'iphone 6'
+      end
+
+      # Is this device an iPhone 6+?
+      # @return [Boolean] true if this device is an iPhone 6+
+      def iphone_6_plus?
+        form_factor == 'iphone 6+'
+      end
+
+      # Is this device an iPhone 3.5in?
+      # @return [Boolean] true if this device is an iPhone 3.5in?
+      def iphone_35in?
+        form_factor == 'iphone 3.5in'
       end
 
       # @!visibility private
@@ -289,6 +313,25 @@ module Calabash
         _deprecated('0.10.0', 'no replacement', :warn)
         @udid = value
       end
+
+      # @deprecated 0.9.168 replaced with iphone_4in?
+      # @see #iphone_4in?
+      # Is this device an iPhone 5?
+      # @note Deprecated because the iPhone 5S reports as an iPhone6,*.
+      # @return [Boolean] true if this device is an iPhone 5
+      def iphone_5?
+        _deprecated('0.9.168', "use 'iphone_4in?' instead", :warn)
+        iphone_4in?
+      end
+
+      # @deprecated 0.13.1 - Call `iphone_4in?` instead.
+      # @see #iphone_4in?
+      # @note Deprecated after introducing new `form_factor` behavior.
+      # @return [Boolean] true if this device is an iPhone 5 or 5s
+      def iphone_4in
+        _deprecated('0.13.1', "use 'iphone_4in?' instead", :warn)
+        @iphone_4in
+      end
     end
   end
 end

data/lib/calabash-cucumber/environment_helpers.rb

@@ -56,57 +56,71 @@ module Calabash
 
       # Is the device under test an iPad?
       #
-      # @raise [RuntimeError] if the server cannot be reached
+      # @raise [RuntimeError] If the server cannot be reached.
       # @return [Boolean] true if device under test is an iPad.
       def ipad?
-        _default_device_or_create().ipad?
+        _default_device_or_create.ipad?
       end
 
       # Is the device under test an iPhone?
       #
-      # @raise [RuntimeError] if the server cannot be reached
+      # @raise [RuntimeError] If the server cannot be reached.
       # @return [Boolean] true if device under test is an iPhone.
       def iphone?
-        _default_device_or_create().iphone?
+        _default_device_or_create.iphone?
       end
 
       # Is the device under test an iPod?
       #
-      # @raise [RuntimeError] if the server cannot be reached
+      # @raise [RuntimeError] If the server cannot be reached.
       # @return [Boolean] true if device under test is an iPod.
       def ipod?
-        _default_device_or_create().ipod?
+        _default_device_or_create.ipod?
       end
 
       # Is the device under test an iPhone or iPod?
       #
-      # @raise [RuntimeError] if the server cannot be reached
-      # @return [Boolean] true if device under test is an iPhone or iPod.
+      # @raise [RuntimeError] If the server cannot be reached.
+      # @return [Boolean] true If device under test is an iPhone or iPod.
       def device_family_iphone?
         iphone? or ipod?
       end
 
       # Is the device under test a simulator?
       #
-      # @raise [RuntimeError] if the server cannot be reached
+      # @raise [RuntimeError] If the server cannot be reached.
       # @return [Boolean] true if device under test is a simulator.
       def simulator?
-        _default_device_or_create().simulator?
-      end
-
-      # @deprecated 0.9.168 replaced with `iphone_4in?`
-      # @see #iphone_4in?
-      def iphone_5?
-        _deprecated('0.9.168', "use 'iphone_4in?' instead", :warn)
-        iphone_4in?
+        _default_device_or_create.simulator?
       end
 
-      # Does the device under test have 4in screen?
+      # Is the device under test have a 4 inch screen?
       #
-      # @raise [RuntimeError] if the server cannot be reached
+      # @raise [RuntimeError] If the server cannot be reached.
       # @return [Boolean] true if device under test has a 4in screen.
       def iphone_4in?
-        _default_device_or_create().iphone_4in?
+        _default_device_or_create.iphone_4in?
+      end
+
+      # Is the device under test an iPhone 6.
+      # @raise [RuntimeError] If the server cannot be reached.
+      # @return [Boolean] true if this device is an iPhone 6
+      def iphone_6?
+        _default_device_or_create.iphone_6?
+      end
+
+      # Is the device under test an iPhone 6+?
+      # @raise [RuntimeError] If the server cannot be reached.
+      # @return [Boolean] true if this device is an iPhone 6+
+      def iphone_6_plus?
+        _default_device_or_create.iphone_6_plus?
+      end
+
+      # Is the device under test an iPhone 3.5in?
+      # @raise [RuntimeError] If the server cannot be reached.
+      # @return [Boolean] true if this device is an iPhone 3.5in?
+      def iphone_35in?
+        _default_device_or_create.iphone_35in?
       end
 
       # Is the device under test running iOS 5?
@@ -139,7 +153,6 @@ module Calabash
         _OS_ENV.eql?(_canonical_os_version(:ios6)) || _default_device_or_create().ios6?
       end
 
-
       # Is the device under test running iOS 7?
       #
       # @note
@@ -171,10 +184,17 @@ module Calabash
       #
       # @see Calabash::Cucumber::IPad
       #
-      # @raise [RuntimeError] if the server cannot be reached
+      # @raise [RuntimeError] If the server cannot be reached.
       # @return [Boolean] true if app is being emulated on an iPad.
       def iphone_app_emulated_on_ipad?
-        _default_device_or_create().iphone_app_emulated_on_ipad?
+        _default_device_or_create.iphone_app_emulated_on_ipad?
+      end
+
+      # @deprecated 0.9.168 replaced with `iphone_4in?`
+      # @see #iphone_4in?
+      def iphone_5?
+        _deprecated('0.9.168', "use 'iphone_4in?' instead", :warn)
+        iphone_4in?
       end
 
       private

data/lib/calabash-cucumber/version.rb

@@ -3,11 +3,10 @@ module Calabash
 
     # @!visibility public
     # The Calabash iOS gem version.
-    VERSION = '0.13.0'
+    VERSION = '0.14.0'
 
     # @!visibility public
-    # The minimum required version of the calabash.framework or, for Xamarin
-    # users, the Calabash component.
-    MIN_SERVER_VERSION = '0.13.0'
+    # The minimum required version of the Calabash embedded server.
+    MIN_SERVER_VERSION = '0.14.0'
   end
 end

data/scripts/launch.rb

@@ -17,7 +17,7 @@
 require 'calabash-cucumber/launcher'
 
 
-# APP_BUNDLE_PATH = "~/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app"
+# APP_BUNDLE_PATH = "#{ENV['HOME']}/Library/Developer/Xcode/DerivedData/??/Build/Products/Calabash-iphonesimulator/??.app"
 # You may uncomment the above to overwrite the APP_BUNDLE_PATH
 # However the recommended approach is to let Calabash find the app itself
 # or set the environment variable APP_BUNDLE_PATH

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Karl Krukow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-26 00:00:00.000000000 Z
+date: 2015-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -144,16 +144,22 @@ dependencies:
   name: run_loop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.7
+        version: '1.3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -224,6 +230,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.2.0
+- !ruby/object:Gem::Dependency
+  name: luffa
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -326,16 +346,16 @@ dependencies:
   name: stub_env
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email:
@@ -531,7 +551,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.3.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Client for calabash-ios-server for automated functional testing on iOS