calabash-cucumber 0.9.6 → 0.9.8

data/features-skeleton/.irbrc

@@ -0,0 +1,15 @@
+require 'irb/completion'
+require 'irb/ext/save-history'
+
+ARGV.concat [ "--readline",
+              "--prompt-mode",
+              "simple" ]
+
+# 25 entries in the list
+IRB.conf[:SAVE_HISTORY] = 50
+
+# Store results in home directory with specified file name
+IRB.conf[:HISTORY_FILE] = ".irb-history"
+
+require 'calabash-cucumber/operations'
+include Calabash::Cucumber::Operations

data/features-skeleton/irb_ios4.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+IRBRC=.irbrc OS=ios4 DEVICE=iphone irb

data/features-skeleton/irb_ios5.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+IRBRC=.irbrc OS=ios5 DEVICE=iphone irb

data/lib/calabash-cucumber/calabash_steps.rb

@@ -1,5 +1,5 @@
 WAIT_TIMEOUT = ENV['WAIT_TIMEOUT'] || 30
-STEP_PAUSE = ENV['STEP_PAUSE'].to_f || 0.3
+STEP_PAUSE = (ENV['STEP_PAUSE'] || 0.5).to_f
 
 require 'rspec/expectations'
 
@@ -9,40 +9,39 @@ end
 
 
 # -- Touch --#
-Then /^I (press|touch) on screen (\d+) from the left and (\d+) from the top$/ do |_, x, y|
-  touch(nil, {:x => x, :y => y})
+Then /^I (?:press|touch) on screen (\d+) from the left and (\d+) from the top$/ do |x, y|
+  touch(nil, {:x => x.to_i, :y => y.to_i})
   sleep(STEP_PAUSE)
 end
 
-Then /^I (press|touch) "([^\"]*)"$/ do |_,name|
+Then /^I (?:press|touch) "([^\"]*)"$/ do |name|
   touch("view marked:'#{name}'")
-
   sleep(STEP_PAUSE)
 end
 
-#Then /^I (press|touch) (\d+)% right and (\d+)% down from "([^\"]*)" $/ do |_,x,y,name|
-#  touch({:query => "view marked:'#{name}'", :offset => {:x => x, :y => y}})
-#end
+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|
+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}")
   sleep(STEP_PAUSE)
 end
 
-Then /^I (press|touch) the "([^\"]*)" button$/ do |_,name|
+Then /^I (?:press|touch) the "([^\"]*)" button$/ do |name|
   touch("button marked:'#{name}'")
   sleep(STEP_PAUSE)
 end
 
-# /^I press view with name "([^\"]*)"$/
-# like touch "..."
-#  /^I press image button number (\d+)$/
-# iOS doesn't have image buttons'
+Then /^I (?:press|touch) the "([^\"]*)" (?:input|text) field$/ do |name|
+  touch("textField placeholder:'#{name}'")
+  sleep(STEP_PAUSE)
+end
 
-##TODO note in tables views: this means visible cell index!
-Then /^I (press|touch) list item number (\d+)$/ do |_,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}")
@@ -50,101 +49,115 @@ Then /^I (press|touch) list item number (\d+)$/ do |_,index|
 end
 
 Then /^I toggle the switch$/ do
-  touch("view:'UISwitch'")
+  touch("switch")
   sleep(STEP_PAUSE)
 end
 
 Then /^I toggle the "([^\"]*)" switch$/ do |name|
-  touch("view:'UISwitch' marked:'#{name}'")
+  touch("switch marked:'#{name}'")
+  sleep(STEP_PAUSE)
+end
+
+Then /^I touch (?:the)? user location$/ do
+  touch("view:'MKUserLocationView'")
+  sleep(STEP_PAUSE)
+end
+
+Then /^I (?:touch|press) (?:done|search)$/ do
+  done
   sleep(STEP_PAUSE)
 end
 
- #/^I enter "([^\"]*)" as "([^\"]*)"$/
-## -- Entering text directly --##
-When /^I enter "([^\"]*)" into the "([^\"]*)" text field$/ do |text_to_type, field_name|
+
+## -- Entering text -- ##
+Then /^I enter "([^\"]*)" into the "([^\"]*)" (?:text|input) field$/ do |text_to_type, field_name|
   set_text("textField placeholder:'#{field_name}'", text_to_type)
   sleep(STEP_PAUSE)
 end
 
 # alias
-When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |text_field, text_to_type|
+Then /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |text_field, text_to_type|
   When %Q|I enter "#{text_to_type}" into the "#{text_field}" text field|
 end
 
-When /^I fill in text fields as follows:$/ do |table|
+Then /^I use the native keyboard to enter "([^\"]*)" into the "([^\"]*)" (?:text|input) field$/ do |text_to_type, field_name|
+  raise "Native keyboard entering is not yet implemented on iOS"
+end
+
+Then /^I fill in text fields as follows:$/ do |table|
   table.hashes.each do |row|
-    When %Q|I enter "#{row['text']}" into the "#{row['field']}" text field|
+    macro %Q|I enter "#{row['text']}" into the "#{row['field']}" text field|
   end
 end
 
-Then /^I enter "([^\"]*)" into input field number (\d+)$/ do |text, index|
+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)
   set_text("textField index:#{index-1}",text)
-  sleep(STEP_PAUSE)
 end
 
+Then /^I use the native keyboard to enter "([^\"]*)" into (?:input|text) field number (\d+)$/ do |text, index|
+  raise "Native keyboard entering is not yet implemented on iOS"
+end
+
+
 When /^I clear "([^\"]*)"$/ do |name|
-  When %Q|I enter "" into the "#{name}" text field|
+  macro %Q|I enter "" into the "#{name}" text field|
 end
 
 Then /^I clear input field number (\d+)$/ do |index|
   index = index.to_i
   screenshot_and_raise "Index should be positive (was: #{index})" if (index<=0)
   set_text("textField index:#{index-1}","")
-  sleep(STEP_PAUSE)
 end
 
-
-
-
 # -- See -- #
 Then /^I wait to see "([^\"]*)"$/ do |expected_mark|
-  Timeout::timeout(WAIT_TIMEOUT) do
-    until view_with_mark_exists( expected_mark )
-      sleep 0.3
-    end
-  end
+  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}'" )}
 end
 
 Then /^I wait to not see "([^\"]*)"$/ do |expected_mark|
-  sleep 2
-  Timeout::timeout(WAIT_TIMEOUT) do
-    while element_exists( "view marked:'#{expected_mark}'" )
-      sleep 0.3
-    end
-  end
+  macro %Q|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}"|
 end
 
-When /^I wait for ([\d\.]+) second(?:s)?$/ do |num_seconds|
-  num_seconds = num_seconds.to_f
-  sleep num_seconds
+Then /^I wait for the "([^\"]*)" button to appear$/ do |name|
+  wait_for(WAIT_TIMEOUT) { element_exists( "button marked:'#{name}'" ) }
 end
-#/^I wait for dialog to close$/
-#/^I wait for progress$/
 
 Then /^I wait for the "([^\"]*)" button to appear$/ do |name|
-  Timeout::timeout(WAIT_TIMEOUT) do
-    until element_exists( "button marked:'#{name}'" )
-      sleep 0.3
-    end
-  end
+  wait_for(WAIT_TIMEOUT) {element_exists( "button marked:'#{name}'" )}
 end
 
+
 Then /^I wait to see a navigation bar titled "([^\"]*)"$/ do |expected_mark|
-    Timeout::timeout(30) do
-      values = query('navigationItemView', :accessibilityLabel)
-      until values.include?(expected_mark)
-        values = query('navigationItemView', :accessibilityLabel)
-        sleep 0.3
-      end
-    end
+  wait_for(WAIT_TIMEOUT) do
+     query('navigationItemView', :accessibilityLabel).include?(expected_mark)
+  end
 end
 
+Then /^I wait for the "([^\"]*)" button to appear$/ do |name|
+  wait_for(WAIT_TIMEOUT) { element_exists( "button marked:'#{name}'" ) }
+end
+
+Then /^I wait for the "([^\"]*)" (?:input|text) field$/ do |placeholder|
+  wait_for(WAIT_TIMEOUT) { element_exists( "textField placeholder:'#{placeholder}'") }
+end
+
+Then /^I wait for (\d+) (?:input|text) field(?:s)?$/ do |count|
+  count = count.to_i
+  wait_for(WAIT_TIMEOUT) { query(:textField).count >= count  }
+end
+
+
 Then /^I wait$/ do
   sleep 2
 end
@@ -157,9 +170,15 @@ Then /^I wait and wait and wait\.\.\.$/ do
   sleep 10
 end
 
+When /^I wait for ([\d\.]+) second(?:s)?$/ do |num_seconds|
+  num_seconds = num_seconds.to_f
+  sleep num_seconds
+end
+
+
 Then /^I go back$/ do
-    touch("navigationItemButtonView first")
-    sleep(STEP_PAUSE)
+  touch("navigationItemButtonView first")
+  sleep(STEP_PAUSE)
 end
 
 Then /^take picture$/ do
@@ -167,14 +186,12 @@ Then /^take picture$/ do
   screenshot
 end
 
-#   Note "up/down" seems to be missing on the web page?
-#   Should be /^I swipe (left|right|up|down)$/
-Then /^I swipe (left|right)$/ do |dir|
+Then /^I swipe (left|right|up|down)$/ do |dir|
     swipe(dir)
     sleep(STEP_PAUSE)
 end
 
-Then /^I swipe (left|right) on "([^\"]*)"$/ do |dir, mark|
+Then /^I swipe (left|right|up|down) on "([^\"]*)"$/ do |dir, mark|
     swipe(dir, {:query => "view marked:'#{mark}'"})
     sleep(STEP_PAUSE)
 end
@@ -186,16 +203,15 @@ Then /^I swipe on cell number (\d+)$/ do |index|
   sleep(STEP_PAUSE)
 end
 
-
 ##pinch##
 Then /^I pinch to zoom (in|out)$/ do |in_out|
   pinch(in_out)
-  sleep([STEP_PAUSE+4,6].max)
+  sleep(STEP_PAUSE)
 end
 
 Then /^I pinch to zoom (in|out) on "([^\"]*)"$/ do |in_out, name|
   pinch(in_out,{:query => "view marked:'#{name}'"})
-  sleep([STEP_PAUSE+4,6].max)
+  sleep(STEP_PAUSE)
 end
 
 #   Note "up/left/right" seems to be missing on the web page
@@ -230,13 +246,13 @@ Then /^I playback recording "([^"]*) on "([^"]*)" with offset (\d+),(\d+)$/ do |
 end
 
 Then /^I reverse playback recording "([^"]*)"$/ do |filename|
-    playback(filename, {:reverse => true})
-    sleep(STEP_PAUSE)
+  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})
-    sleep(STEP_PAUSE)
+  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|
@@ -251,23 +267,27 @@ end
 Then /^I rotate device (left|right)$/ do |dir|
   dir = dir.to_sym
   rotate(dir)
-  sleep(STEP_PAUSE)
+  sleep(5)#SERVO wait
 end
 
 Then /^I send app to background for (\d+) seconds$/ do |secs|
   secs = secs.to_f
   background(secs)
+  sleep(secs+10)
 end
 
 ### Assertions ###
 Then /^I should see "([^\"]*)"$/ do |expected_mark|
   res = (element_exists( "view marked:'#{expected_mark}'" ) ||
          element_exists( "view text:'#{expected_mark}'"))
-  res.should be_true
+  if not res
+    screenshot_and_raise "No element found with mark or text: #{expected_mark}"
+  end
 end
 
 Then /^I should not see "([^\"]*)"$/ do |expected_mark|
-  check_element_does_not_exist("view marked:'#{expected_mark}'")
+  check_element_does_not_exist("view marked:'#{expected_mark}'") &&
+      check_element_does_not_exist("view text:'#{expected_mark}'")
 end
 
 Then /^I should see a "([^\"]*)" button$/ do |expected_mark|
@@ -291,17 +311,43 @@ Then /^I see the "([^\"]*)"$/ do |text|
   macro %Q|I should see "#{text}"|
 end
 
+Then /^I see text starting with "([^\"]*)"$/ do |text|
+  res = query("view {text BEGINSWITH '#{text}'}").empty?
+  if res
+    screenshot_and_raise "No text found starting with: #{text}"
+  end
+end
 
-Then /^I should see a map$/ do
-  check_element_exists("view:'MKMapView'")
+Then /^I see text ending with "([^\"]*)"$/ do |text|
+  res = query("view {text ENDSWITH '#{text}'}").empty?
+  if res
+    screenshot_and_raise "No text found ending with: #{text}"
+  end
 end
 
-Then /^I touch user location$/ do
-  touch("view:'MKUserLocationView'")
+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}"
+  end
 end
 
-Then /^I (touch|press) (done|search)$/ do  |_,__|
-  done
-  sleep(STEP_PAUSE)
+Then /^I should see a "([^\"]*)" (?:input|text) field$/ do |expected_mark|
+  check_element_exists("textField placeholder:'#{expected_mark}'") ||
+      check_element_exists("textField marked:'#{expected_mark}'")
+end
+
+Then /^I should not see a "([^\"]*)" (?:input|text) field$/ do |expected_mark|
+  check_element_does_not_exist("textField placeholder:'#{expected_mark}'") &&
+      check_element_does_not_exist("textField marked:'#{expected_mark}'")
 end
 
+
+Then /^I should see a map$/ do
+  check_element_exists("view:'MKMapView'")
+end
+
+Then /^I should see (?:the)? user location$/ do
+  check_element_exists("view:'MKUserLocationView'")
+end

data/lib/calabash-cucumber/operations.rb

@@ -1,6 +1,14 @@
 require 'net/http/persistent'
 require 'json'
 
+if not Object.const_defined?(:CALABASH_COUNT)
+  #compatability with IRB
+  CALABASH_COUNT = {:step_index => 0, :step_line => "irb"}
+end
+
+
+
+
 module Calabash module Cucumber
 
 module Operations
@@ -15,10 +23,22 @@ module Operations
     end
   end
 
+  def wait_for(timeout, &block)
+    Timeout::timeout(timeout) do
+      until block.call
+        sleep 0.3
+      end
+    end
+  end
+
   def query(uiquery, *args)
     map(uiquery, :query, *args)
   end
 
+  def label(uiquery)
+    query(uiquery, :accessibilityLabel)
+  end
+
   def screenshot_and_raise(msg)
     screenshot
     sleep 5
@@ -124,7 +144,7 @@ module Operations
   end
 
   def background(secs)
-    screenshot_and_raise "Not implemented yet"
+    res = http({:method=>:post, :path=>'background'}, {:duration => secs})
   end
 
   def element_exists(uiquery)
@@ -136,11 +156,15 @@ module Operations
   end
 
   def check_element_exists( query )
-    element_exists( query ).should be_true
+    if not element_exists( query )
+      screenshot_and_raise "No element found for query: #{query}"
+    end
   end
 
   def check_element_does_not_exist( query )
-    element_exists( query ).should be_false
+    if not element_exists( query ).should be_false
+      screenshot_and_raise "Expected no elements to match query: #{query}"
+    end
   end
 
   def check_view_with_mark_exists(expected_mark)

data/lib/calabash-cucumber/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Cucumber
-    VERSION = "0.9.6"
+    VERSION = "0.9.8"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-cucumber
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-27 00:00:00.000000000 Z
+date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70312339656540 !ruby/object:Gem::Requirement
+  requirement: &70106252462660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70312339656540
+  version_requirements: *70106252462660
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70312339655440 !ruby/object:Gem::Requirement
+  requirement: &70106252462080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70312339655440
+  version_requirements: *70106252462080
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70312339654480 !ruby/object:Gem::Requirement
+  requirement: &70106252461540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70312339654480
+  version_requirements: *70106252461540
 - !ruby/object:Gem::Dependency
   name: slowhandcuke
-  requirement: &70312339644820 !ruby/object:Gem::Requirement
+  requirement: &70106252460880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70312339644820
+  version_requirements: *70106252460880
 - !ruby/object:Gem::Dependency
   name: net-http-persistent
-  requirement: &70312339644160 !ruby/object:Gem::Requirement
+  requirement: &70106252460180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70312339644160
+  version_requirements: *70106252460180
 description: calabash-cucumber drives tests for native iOS apps. You must link your
   app with calabash-ios-server framework to execute tests.
 email:
@@ -86,6 +86,9 @@ files:
 - calabash-cucumber.gemspec
 - copy_resources.sh
 - epl-v10.html
+- features-skeleton/.irbrc
+- features-skeleton/irb_ios4.sh
+- features-skeleton/irb_ios5.sh
 - features-skeleton/my_first.feature
 - features-skeleton/step_definitions/calabash_steps.rb
 - features-skeleton/support/env.rb