calabash-android 0.4.22.pre4 → 0.5.0.pre1

data/lib/calabash-android/removed_actions.txt

@@ -0,0 +1,52 @@
+inspect_current_dialog
+assert_view_property
+get_view_property
+press_image_button_description
+press_image_button_number
+click_on_view_by_id
+wait
+wait_for_text
+wait_for_no_progress_bars
+press_button_with_text
+press_button_number
+wait_for_view_by_id
+toggle_numbered_checkbox
+has_view
+is_enabled
+wait_for_button
+wait_for_view
+press
+click_on_text
+click_on_view_by_description
+press_long_on_text
+get_text_by_id
+click_by_selector
+select_item_from_named_spinner
+get_selected_spinner_item_text
+press_list_item
+long_press_list_item
+get_list_data
+get_list_item_text
+get_list_item_properties
+press_long_on_text_and_select_with_index
+press_long_on_text_and_select_with_text
+assert_text
+assert_text_in_textview
+long_press_on_view_by_id
+press_long_on_text_and_select_with_id
+enter_query_into_numbered_field
+select_from_menu
+clear_id_field
+clear_numbered_field
+clear_named_field
+enter_text_into_named_field
+enter_text_into_id_field
+enter_text_into_numbered_field
+assert_no_duplicates_in_grid
+select_tab
+wait_for_dialog_to_close
+wait_for_screen
+wait_for_tab
+set_text
+scroll_down
+scroll_up

data/lib/calabash-android/steps/assert_steps.rb

@@ -1,44 +1,29 @@
 Then /^I see the text "([^\"]*)"$/ do |text|
-  performAction('assert_text',text, true) 
+  wait_for_text(text, timeout: 10)
 end
 
 Then /^I see "([^\"]*)"$/ do |text|
-  performAction('assert_text', text, true) 
+  wait_for_text(text, timeout: 10)
 end
 
 Then /^I should see "([^\"]*)"$/ do |text|
-  performAction('assert_text', text, true) 
+  wait_for_text(text, timeout: 10)
 end
 
 Then /^I should see text containing "([^\"]*)"$/ do |text|
-  performAction('assert_text', text, true) 
+  wait_for_text(text, timeout: 10)
 end
 
 
 
 Then /^I should not see "([^\"]*)"$/ do |text|
-  performAction('assert_text', text, false) #second param indicated that the text should _not_ be found
+  wait_for_text_to_disappear(text, timeout: 10)
 end
 
-
-Then /^I don't see the text "([^\"]*)"$/ do |text|  
-  performAction('assert_text', text, false) #second param indicated that the text should _not_ be found
-end
-
-Then /^I don't see "([^\"]*)"$/ do |text|  
-  performAction('assert_text', text, false) #second param indicated that the text should _not_ be found
+Then /^I don't see the text "([^\"]*)"$/ do |text|
+  wait_for_text_to_disappear(text, timeout: 10)
 end
 
-# This step is more of an example or macro to be used within your own custom steps
-# Generally, assert_view_property takes 3 args, but for if 'property'='compoundDrawables', the next arg should be 'left'/'right'/'top'/'bottom', followed by the expected drawable ID.
-# @param view_id - the name of the view, eg: R.my_view_id
-# @param property - eg: 'visibility' (visible/invisible/gone), 'drawable' (expected drawable ID) 
-Then /^the view with id "([^\"]*)" should have property "([^\"]*)" = "([^\"]*)"$/ do | view_id, property, value |
-  # get_view_property is also available: performAction( 'get_view_property', 'my_view', 'visibility') 
-  performAction( 'assert_view_property', view_id, property, value )
+Then /^I don't see "([^\"]*)"$/ do |text|
+  wait_for_text_to_disappear(text, timeout: 10)
 end
-
-Then /^the "([^\"]*)" activity should be open$/ do | expected_activity |
-  actual_activity = performAction('get_activity_name')['message']
-  raise "The current activity is #{actual_activity}" unless( actual_activity == expected_activity || actual_activity == expected_activity + 'Activity' )
-end

data/lib/calabash-android/steps/check_box_steps.rb

@@ -1,3 +1,3 @@
-Then /^I toggle checkbox number (\d+)$/ do |checkboxNumber|
-  performAction('toggle_numbered_checkbox', checkboxNumber) 
+Then /^I toggle checkbox number (\d+)$/ do |index|
+  tap_when_element_exists("android.widget.CheckBox index:#{index.to_i-1}")
 end

data/lib/calabash-android/steps/context_menu_steps.rb

@@ -1,12 +1,19 @@
+Then /^I long press "([^\"]*)" and select item number (\d+)$/ do |text_to_press, index|
+  step_deprecated
 
-Then /^I long press "([^\"]*)" and select item number "([^\"]*)"$/ do |text_to_press, index|
-  performAction('press_long_on_text_and_select_with_index', text_to_press, index)
+  long_press_when_element_exists("* {text CONTAINS '#{text_to_press}'}")
+
+  touch_index = index.to_i - 1
+  tap_when_element_exists("com.android.internal.view.menu.ListMenuItemView android.widget.TextView index:#{touch_index}")
 end
 
 Then /^I long press "([^\"]*)" and select "([^\"]*)"$/ do |text_to_press, context_text|
-  performAction('press_long_on_text_and_select_with_text', text_to_press, context_text)
+  step_deprecated
+
+  long_press_when_element_exists("* {text CONTAINS '#{text_to_press}'}")
+  tap_when_element_exists("com.android.internal.view.menu.ListMenuItemView android.widget.TextView marked:'#{context_text}'")
 end
 
 Then /^I long press "([^\"]*)"$/ do |text_to_press|
-  performAction('press_long_on_text', text_to_press)
+  long_press_when_element_exists("* {text CONTAINS '#{text_to_press}'}")
 end

data/lib/calabash-android/steps/date_picker_steps.rb

@@ -1,8 +1,8 @@
 
 Given /^I set the date to "(\d\d-\d\d-\d\d\d\d)" on DatePicker with index "([^\"]*)"$/ do |date, index|
-  performAction('set_date_with_index', date, index)
+  perform_action('set_date_with_index', date, index)
 end
 
 Given /^I set the "([^\"]*)" date to "(\d\d-\d\d-\d\d\d\d)"$/ do |content_description, date|
-  performAction('set_date_with_description', content_description, date)
+  perform_action('set_date_with_description', content_description, date)
 end

data/lib/calabash-android/steps/enter_text_steps.rb

@@ -1,27 +1,27 @@
-Then /^I enter "([^\"]*)" as "([^\"]*)"$/ do |text, target|
-  performAction('enter_text_into_named_field', text, target)
+Then /^I enter "([^\"]*)" as "([^\"]*)"$/ do |text, content_description|
+  enter_text("android.widget.EditText contentDescription:'#{content_description}'", text)
 end
 
-Then /^I enter "([^\"]*)" into input field number (\d+)$/ do |text, number|
-  performAction('enter_text_into_numbered_field',text, number)
+Then /^I enter "([^\"]*)" into "([^\"]*)"$/ do |text, content_description|
+  enter_text("android.widget.EditText {contentDescription LIKE[c] '#{content_description}'}", text)
 end
 
-Then /^I enter "([^\"]*)" into "([^\"]*)"$/ do |text, name|
-  performAction('enter_text_into_named_field',text, name)
+Then /^I enter "([^\"]*)" into input field number (\d+)$/ do |text, index|
+  enter_text("android.widget.EditText index:#{index.to_i-1}", text)
+end
+
+Then /^I enter text "([^\"]*)" into field with id "([^\"]*)"$/ do |text, id|
+  enter_text("android.widget.EditText id:'#{id}'", text)
 end
 
 Then /^I clear "([^\"]*)"$/ do |name|
-  performAction('clear_named_field',name)
+  clear_text("android.widget.EditText marked:'#{name}'}")
 end
 
 Then /^I clear input field number (\d+)$/ do |number|
-  performAction('clear_numbered_field',number)
+  clear_text("android.widget.EditText index:#{number.to_i-1}")
 end
 
 Then /^I clear input field with id "([^\"]*)"$/ do |view_id|
-  performAction('clear_id_field', view_id)
-end
-
-Then /^I enter text "([^\"]*)" into field with id "([^\"]*)"$/ do |text, view_id|
-  performAction('enter_text_into_id_field', text, view_id)
+  clear_text("android.widget.EditText id:'#{view_id}'")
 end

data/lib/calabash-android/steps/l10n_steps.rb

@@ -1,19 +1,19 @@
 Then /^I press text of translated l10key (\d+)$/ do |l10key|
-  performAction('press_l10n_element', l10key) 
+  perform_action('press_l10n_element', l10key)
 end
 
 Then /^I press button of translated l10key (\d+)$/ do |l10key|
-  performAction('press_l10n_element', l10key,'button') 
+  perform_action('press_l10n_element', l10key,'button')
 end
 
 Then /^I press menu item of translated l10key (\d+)$/ do |l10key|
-  performAction('press_l10n_element', l10key,'menu_item') 
+  perform_action('press_l10n_element', l10key,'menu_item')
 end
 
 Then /^I press toggle button of translated l10key (\d+)$/ do |l10key|
-  performAction('press_l10n_element', l10key,'toggle_button') 
+  perform_action('press_l10n_element', l10key,'toggle_button')
 end
 
 Then /^I wait for the translated "([^\"]*)" l10nkey to appear$/ do |l10nkey|
-  performAction('wait_for_l10n_element', l10nkey)
+  perform_action('wait_for_l10n_element', l10nkey)
 end

data/lib/calabash-android/steps/map_steps.rb

@@ -1,39 +1,39 @@
 When /^I centre the map at (-?\d+\.\d+), (-?\d+\.\d+)$/ do | lat, lon |
-  performAction('set_map_center', lat, lon)
+  perform_action('set_map_center', lat, lon)
 end
 
 When /^I pan the map to (-?\d+\.\d+), (-?\d+\.\d+)$/ do | lat, lon |
-  performAction('pan_map_to', lat, lon)
-  performAction('wait', 1)
+  perform_action('pan_map_to', lat, lon)
+  sleep(1)
 end
 
 When /^(?:I )?set the map zoom level to (\d+)$/ do | zoom |
-  performAction('set_map_zoom', zoom)
+  perform_action('set_map_zoom', zoom)
   sleep(0.2)
 end
 
 When /^(?:I )?zoom (in|out) on the map$/ do | zoom |
-  performAction('set_map_zoom', zoom)
+  perform_action('set_map_zoom', zoom)
   sleep(0.2)
 end
 
 Then /^the map zoom level should be (\d+)$/ do | zoom |
-  result = performAction('get_map_zoom')
+  result = perform_action('get_map_zoom')
   raise StandardError.new( "The map's zoom level should be #{zoom} but is #{result['message']}"  ) unless zoom.eql?( result['message'] )
 end
 
 When /^I tap the map marker "([^\"]*)"$/ do | marker_title |
-  performAction('tap_map_marker_by_title', marker_title, 60000)
+  perform_action('tap_map_marker_by_title', marker_title, 60000)
 end
 
 When /^I double tap the map marker "([^\"]*)"$/ do | marker_title |
-  performAction('tap_map_marker_by_title', marker_title, 60000)
+  perform_action('tap_map_marker_by_title', marker_title, 60000)
   sleep(0.4)
-  performAction('tap_map_marker_by_title', marker_title, 100)
+  perform_action('tap_map_marker_by_title', marker_title, 100)
 end
 
 When /^I tap away from the markers$/ do
-  performAction('tap_map_away_from_markers')
+  perform_action('tap_map_away_from_markers')
 end
 
 Then /^I should see the following markers:$/ do | marker_table |
@@ -41,7 +41,7 @@ Then /^I should see the following markers:$/ do | marker_table |
 end
 
 Then /^the map should be centred at (-?\d+\.\d+), (-?\d+\.\d+)$/ do | lat, lon |
-  result = performAction('get_map_center')
+  result = perform_action('get_map_center')
   bonus_info = result['bonusInformation']
   actual_lat = bonus_info[0].to_f
   actual_lon = bonus_info[1].to_f
@@ -54,7 +54,7 @@ Then /^the map should be centred at (-?\d+\.\d+), (-?\d+\.\d+)$/ do | lat, lon |
 end
 
 Then /^the map marker "([^\"]*)" should be highlighted$/ do | marker_title |
-  result = performAction('get_map_marker', marker_title)
+  result = perform_action('get_map_marker', marker_title)
   result = result['message']
   result = JSON.parse( result )
   raise StandardError.new( "The marker '#{marker_title}' was found, but is not highlighted" ) unless result['focused']

data/lib/calabash-android/steps/navigation_steps.rb

@@ -1,46 +1,46 @@
 Then /^I go back$/ do
-  performAction('go_back')
+  press_back_button
 end
 
 Then /^I press the menu key$/ do
-  performAction('press_menu')
+  press_menu_button
 end
 
 Then /^I press the enter button$/ do
-  performAction('send_key_enter')
+  perform_action('send_key_enter')
 end
 
 
 Then /^I swipe left$/ do
-  performAction('swipe', 'left')
+  perform_action('swipe', 'left')
 end
 
 Then /^I swipe right$/ do
-  performAction('swipe', 'right')
+  perform_action('swipe', 'right')
 end
 
-Then /^I select "([^\"]*)" from the menu$/ do |item|  
-  performAction('select_from_menu', item)
+Then /^I select "([^\"]*)" from the menu$/ do |text|
+  select_options_menu_item(text)
 end
 
 Then /^I select tab number (\d+)$/ do | tab |
-  performAction('select_tab', tab)
+  touch("android.widget.TabWidget descendant TextView index:#{tab.to_i-1}")
 end
 
 # @param - the "tag" associated with the tab, or the text within the tab label
 Then /^I select the "([^\"]*)" tab$/ do | tab |
-  performAction('select_tab', tab)
+  touch("android.widget.TabWidget descendant TextView {text LIKE[c] '#{tab}'}")
 end
 
 Then /^I scroll down$/ do
-  performAction('scroll_down')
+  scroll_down
 end
 
 Then /^I scroll up$/ do
-  performAction('scroll_up')
+  scroll_up
 end
 
 Then /^I drag from (\d+):(\d+) to (\d+):(\d+) moving with (\d+) steps$/ do |fromX, fromY, toX, toY, steps|
-  performAction('drag',fromX,toX,fromY,toY,steps)
+  perform_action('drag',fromX,toX,fromY,toY,steps)
 end
    

data/lib/calabash-android/steps/press_button_steps.rb

@@ -1,35 +1,39 @@
-Given /^I press the "([^\"]*)" button$/ do |buttonText|
-  performAction('press_button_with_text', buttonText)
+Given /^I press the "([^\"]*)" button$/ do |button_text|
+  tap_when_element_exists("android.widget.Button {text CONTAINS[c] '#{button_text}'}")
 end
 
-Then /^I press button number (\d+)$/ do |buttonNumber|
-  performAction('press_button_number', buttonNumber) 
+Then /^I press button number (\d+)$/ do |button_number|
+  tap_when_element_exists("android.widget.Button index:#{button_number.to_i-1}")
 end
 
-Then /^I press image button number (\d+)$/ do |buttonNumber|
-  performAction('press_image_button_number', buttonNumber) 
+Then /^I press image button number (\d+)$/ do |button_number|
+  tap_when_element_exists("android.widget.ImageButton index:#{button_number.to_i-1}")
 end
 
 Then /^I press view with id "([^\"]*)"$/ do |view_id|
-  performAction('click_on_view_by_id',view_id)
+  tap_when_element_exists("* id:'#{view_id}'")
 end
 
 Then /^I press "([^\"]*)"$/ do |identifier|
-  performAction('press',identifier)
+  tap_when_element_exists("* marked:'#{identifier}'")
 end
 
 Then /^I click on screen (\d+)% from the left and (\d+)% from the top$/ do |x, y|
-  performAction('click_on_screen',x, y)
+  perform_action('click_on_screen',x, y)
 end
 
 Then /^I touch the "([^\"]*)" text$/ do |text|
-  performAction('click_on_text',text)
+  tap_when_element_exists("* {text LIKE[c] '#{text}'}")
 end
 
 Then /^I press list item number (\d+)$/ do |line_index|
-  performAction('press_list_item', line_index, 0)
+  step_deprecated
+
+  tap_when_element_exists("android.widget.ListView index:0 android.widget.TextView index:#{line_index.to_i-1}")
 end
 
 Then /^I long press list item number (\d+)$/ do |line_index|
-  performAction('long_press_list_item', line_index, 0)
+  step_deprecated
+
+  long_press_when_element_exists("android.widget.ListView index:0 android.widget.TextView index:#{line_index.to_i-1}")
 end

data/lib/calabash-android/steps/progress_steps.rb

@@ -1,71 +1,68 @@
 Then /^I wait for progress$/ do
-  performAction('wait_for_no_progress_bars') 
+  wait_for_element_do_not_exist("android.widget.ProgressBar", :timeout => 60)
 end
 
 Then /^I wait$/ do
-  performAction('wait', 2)
-end
-
-Then /^I wait for dialog to close$/ do
-  performAction('wait_for_dialog_to_close')
+  sleep 2
 end
 
 
 Then /^I wait for (\d+) seconds$/ do |seconds|
-  performAction('wait', seconds)
+  sleep(seconds.to_i)
 end
 
 Then /^I wait for 1 second$/ do
-  performAction('wait', 1)
+  sleep 1
 end
 
 Then /^I wait for a second$/ do
-  performAction('wait', 1)
+  sleep 1
 end
 
-
 Then /^I wait for "([^\"]*)" to appear$/ do |text|
-  performAction('wait_for_text', text)
+  wait_for_text(text)
 end
 
 Then /^I wait up to (\d+) seconds for "([^\"]*)" to appear$/ do |timeout, text|
-  performAction('wait_for_text', text, timeout)
+  wait_for_text(text, timeout: timeout.to_i)
 end
 
 Then /^I wait to see "([^\"]*)"$/ do |text|
-  performAction('wait_for_text', text)
+  wait_for_text(text)
 end
 
 Then /^I wait up to (\d+) seconds to see "([^\"]*)"$/ do |timeout, text|
-  performAction('wait_for_text', text, timeout)
+  wait_for_text(text, timeout: timeout.to_i)
 end
 
 Then /^I wait for the "([^\"]*)" button to appear$/ do |text|
-  performAction('wait_for_button', text)
+  wait_for_element_exists("android.widget.Button marked:'#{text}'");
 end
 
-Then /^I wait for the view with id "([^\"]*)" to appear$/ do |text|
-  performAction('wait_for_view_by_id', text)
+Then /^I wait for the view with id "([^\"]*)" to appear$/ do |id|
+  wait_for_element_exists("* id:'#{id}'", {:timeout => 60})
 end
 
 Then /^I wait for the "([^\"]*)" view to appear$/ do |text|
-  performAction('wait_for_view', text)
+  wait_for_element_exists("* marked:'#{text}'")
 end
 
 
 Then /^I wait for the "([^\"]*)" screen to appear$/ do |text|
-    performAction('wait_for_screen', text)
+  wait_for_activity(text)
 end
 
 Then /^I wait upto (\d+) seconds for the "([^\"]*)" screen to appear$/ do |timeout, text|
-    performAction('wait_for_screen', text, timeout)
+  wait_for_activity(text, timeout: timeout.to_i)
 end
 
 Then /^I wait up to (\d+) seconds for the "([^\"]*)" screen to appear$/ do |timeout, text|
-    performAction('wait_for_screen', text, timeout)
+  wait_for_activity(text, timeout: timeout.to_i)
 end
 
 # @param - the "tag" associated with the tab, or the text within the tab label
 Then /^I wait for the "([^\"]*)" tab to appear$/ do | tab |
-  performAction('wait_for_tab', tab)
+  wait_for do
+    query("android.widget.TabWidget descendant TextView {text LIKE[c] '#{tab}'}", :isSelected).first
+  end
 end