calabash-android 0.4.22.pre4 → 0.5.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b08ffe174ecf3dde1f1f58a609148b6f338b2114
-  data.tar.gz: f60f07366df805990cca8d49dc4516e9d3ad6c96
+  metadata.gz: 7a378465ba71fd03e09901a56b34e16b780d0753
+  data.tar.gz: 8e9117755d320057f9cc55e842c448d45db6c726
 SHA512:
-  metadata.gz: 846aa7dc192a504a2461c9e8d69f7f8d2c55854a0dd87bdf860d6964fa6d71b7af8aaef2848170c0b6111b8279a69f91bf3bd4269c02b344b50179903db11bc9
-  data.tar.gz: 41d381af7fb3f41bb805985b85508e4f40f5627dacf5d91f85f8a7bc5722b64807d07cf4fa5e1afddefd4e4d0b51f5e52699c90c40f699d8b36feaac290c3c08
+  metadata.gz: 14cbc8db152ca204468d1549cd7a96bc032198897eac5e9702941d6b3cc862025b7fc8792031937b97323046a8b3510543f435705ae0ea515559a8a19ab22ced
+  data.tar.gz: 4c2c2504a207311335d62e2680a1b582852278bfe106d1812622dcbb92866f56553ef7771eb20051ff2ede477f1311e602623da3852b86043f9678b3a2be47f9

data/bin/calabash-android

@@ -51,51 +51,72 @@ def relative_to_full_path(file_path)
   File.expand_path(file_path)
 end
 
-if (ARGV.length == 0)
+if ARGV.length == 0
   print_usage
-end
-cmd = ARGV.shift
-if cmd == 'help'
-  print_help
-elsif cmd == 'build'
-  Env.exit_if_env_not_set_up
-  puts "Please specify the app you want to build a test server for" if (ARGV.empty? or not is_apk_file?(ARGV.first))
-  while not ARGV.empty? and is_apk_file?(ARGV.first)
-    calabash_build(relative_to_full_path(ARGV.shift))
-  end
-elsif cmd == 'run'
-  Env.exit_if_env_not_set_up
-  if ARGV.empty? or not is_apk_file?(ARGV.first)
-    exit calabash_run()
+else
+  cmd = ARGV.shift
+
+  case cmd
+  when 'help'
+    print_help
+  when 'build'
+    Env.exit_if_env_not_set_up
+
+    if ARGV.empty?
+      puts "Please specify the app you want to build a test server for"
+      exit 1
+    elsif !File.exist?(ARGV.first)
+      puts "Could not find file '#{ARGV.first}'"
+      exit 1
+    elsif !is_apk_file?(ARGV.first)
+      puts "'#{ARGV.first}' is not a valid android application"
+      exit 1
+    else
+      while not ARGV.empty? and is_apk_file?(ARGV.first)
+        calabash_build(relative_to_full_path(ARGV.shift))
+      end
+    end
+  when 'run'
+    Env.exit_if_env_not_set_up
+    if ARGV.empty? or not is_apk_file?(ARGV.first)
+      puts "The first parameter must be the path to the apk file."
+      exit 1
+    else
+      exit calabash_run(relative_to_full_path(ARGV.shift))
+    end
+  when 'gen'
+    calabash_scaffold
+  when 'console'
+    Env.exit_if_env_not_set_up
+
+    if ARGV.empty? or not is_apk_file?(ARGV.first)
+      puts "The first parameter must be the path to the apk file."
+      exit 1
+    else
+      calabash_console(relative_to_full_path(ARGV.shift))
+    end
+  when 'setup'
+    Env.exit_if_env_not_set_up
+    calabash_setup
+  when 'resign'
+    Env.exit_if_env_not_set_up
+
+    if ARGV.empty?
+      puts "Please specify the app you want to resign"
+      exit 1
+    elsif !File.exist?(ARGV.first)
+      puts "Could not find file '#{ARGV.first}'"
+      exit 1
+    elsif !is_apk_file?(ARGV.first)
+      puts "'#{ARGV.first}' is not a valid android application"
+      exit 1
+    else
+      resign_apk(File.expand_path(ARGV.first))
+    end
+  when 'version'
+    puts Calabash::Android::VERSION
   else
-    exit calabash_run(relative_to_full_path(ARGV.shift))
-  end
-elsif cmd == 'gen'
-  calabash_scaffold
-elsif cmd == 'console'
-  Env.exit_if_env_not_set_up
-  if ARGV.empty?
-    puts "Please specify an app"
-    exit 1
+    puts "Invalid command '#{cmd}'"
+    print_usage
   end
-  unless File.exist? ARGV.first
-    puts "No such file #{ARGV.first}"
-    exit 1
-  end
-  calabash_console(relative_to_full_path(ARGV.shift))
-elsif cmd == 'setup'
-  Env.exit_if_env_not_set_up
-  calabash_setup
-elsif cmd == 'resign'
-  Env.exit_if_env_not_set_up
-  unless File.exist?(File.expand_path(ARGV.first))
-    puts "No such file #{ARGV.first}"
-    exit 1
-  end
-  resign_apk(File.expand_path(ARGV.first))
-
-elsif cmd == 'version'
-  puts Calabash::Android::VERSION
-else
-  print_usage
-end
+end

data/lib/calabash-android/calabash_steps.rb

@@ -1,9 +1,3 @@
-
-WAIT_TIMEOUT = (ENV['WAIT_TIMEOUT'] || 30).to_f
-STEP_PAUSE = (ENV['STEP_PAUSE'] || 0.5).to_f
-
-require 'calabash-android/steps/additions_manual_steps'
-require 'calabash-android/steps/app_steps'
 require 'calabash-android/steps/assert_steps'
 require 'calabash-android/steps/check_box_steps'
 require 'calabash-android/steps/context_menu_steps'
@@ -13,10 +7,8 @@ require 'calabash-android/steps/location_steps'
 require 'calabash-android/steps/navigation_steps'
 require 'calabash-android/steps/press_button_steps'
 require 'calabash-android/steps/progress_steps'
-require 'calabash-android/steps/rotation_steps'
 require 'calabash-android/steps/screenshot_steps'
 require 'calabash-android/steps/search_steps'
 require 'calabash-android/steps/spinner_steps'
 require 'calabash-android/steps/time_picker_steps'
-require 'calabash-android/steps/list_steps'
 

data/lib/calabash-android/canned_steps.md

@@ -23,7 +23,7 @@ To assert that specified text cannot be found use any of the following steps.
 Input steps
 -----------
 
-    Then /^I toggle checkbox number (\d+)$/ do |checkboxNumber|
+    Then /^I toggle checkbox number (\d+)$/ do |checkbox_number|
 Toggles checkout with the specified index.
 
     Then /^I long press "([^\"]*)"$/ do |text_to_press|
@@ -246,7 +246,7 @@ Waits until the text of the translated l10nkey is displayed.
 
 Note: you can assert or press interface elements using [Android's String resources](http://developer.android.com/reference/android/R.string.html) by passing a package in a custom step:
 
-    performAction('press_l10n_element', 'ok', nil, 'android')
+    perform_action('press_l10n_element', 'ok', nil, 'android')
 
 Rotation
 --------
@@ -257,31 +257,3 @@ If you run the test on [LessPainful](https://www.lesspainful.com) they will actu
     Then /^I rotate the device to landscape$/
     Then /^I rotate the device to portrait$/
 
-Manual Steps
-------------
-
-These steps are useful for allowing mixed manual and automated tests and to be documented 
-and kept together. These steps do nothing when the tests are run automatically but are still
-documented in Cucumber output formatters such as the HTML report. This allows a 
-manual tester to perform the same test case but with extra manual steps such as manual image verification.
-
-To manually request a manual tester to compare the screen with a reference image
-
-    Then /^I compare the current screen with the reference image "([^\"]*) manually"$/ do |name|
-
-    For example:
-
-    Then I compare the current screen with the reference image "features/ref1.png" manually
-
-To manually perform a custom step    
-
-    Then /^I manually (.*)$/ do |action|
-
-    For example:
-
-    Then I manually check that the list scrolls smoothly
-
-
-    
-
-

data/lib/calabash-android/operations.rb

@@ -49,6 +49,20 @@ module Operations
   end
 
   def performAction(action, *arguments)
+    puts "Warning: The method performAction is deprecated. Please use perform_action instead."
+
+    perform_action(action, *arguments)
+  end
+
+  def perform_action(action, *arguments)
+    @removed_actions = File.readlines(File.join(File.dirname(__FILE__), 'removed_actions.txt')) unless @removed_actions
+    @removed_actions.map! &:chomp
+
+    if @removed_actions.include?(action)
+      puts "Error: The action '#{action}' was removed in calabash-android x.x.x"
+      puts 'For more information visit: https://github.com/calabash-android/foo/bar'
+    end
+    
     default_device.perform_action(action, *arguments)
   end
 
@@ -134,7 +148,13 @@ module Operations
     converted_args = []
     args.each do |arg|
       if arg.is_a?(Hash) and arg.count == 1
-        converted_args << {:method_name => arg.keys.first, :arguments => [ arg.values.first ]}
+        if arg.values.is_a?(Array) && arg.values.count == 1
+          values = arg.values.flatten
+        else
+          values = [arg.values]
+        end
+
+        converted_args << {:method_name => arg.keys.first, :arguments => values}
       else
         converted_args << arg
       end
@@ -393,7 +413,7 @@ module Operations
           f.write res
         end
       else
-        screenshot_cmd = "java -jar #{File.join(File.dirname(__FILE__), 'lib', 'screenshotTaker.jar')} #{serial} #{path}"
+        screenshot_cmd = "java -jar #{File.join(File.dirname(__FILE__), 'lib', 'screenshotTaker.jar')} #{serial} \"#{path}\""
         log screenshot_cmd
         raise "Could not take screenshot" unless system(screenshot_cmd)
       end
@@ -704,50 +724,90 @@ module Operations
     raise(msg)
   end
 
+  def has_text?(text)
+    !query("* {text CONTAINS[c] '#{text}'}").empty?
+  end
+
+  def assert_text(text, should_find = true)
+    raise "Text \"#{text}\" was #{should_find ? 'not ' : ''}found." if has_text?(text) ^ should_find
+
+    true
+  end
+
   def double_tap(uiquery, options = {})
     center_x, center_y = find_coordinate(uiquery)
 
-    performAction("double_tap_coordinate", center_x, center_y)
+    perform_action("double_tap_coordinate", center_x, center_y)
   end
 
+  # Performs a "long press" operation on a selected view
+  # Params:
+  # +uiquery+: a uiquery identifying one view
+  # +options[:length]+: the length of the long press in milliseconds (optional)
+  #
+  # Examples:
+  #   - long_press("* id:'my_id'")
+  #   - long_press("* id:'my_id'", {:length=>5000})
   def long_press(uiquery, options = {})
     center_x, center_y = find_coordinate(uiquery)
-
-    performAction("long_press_coordinate", center_x, center_y)
+    length = options[:length]
+    perform_action("long_press_coordinate", center_x, center_y, *(length unless length.nil?))
   end
 
   def touch(uiquery, options = {})
     center_x, center_y = find_coordinate(uiquery)
 
-    performAction("touch_coordinate", center_x, center_y)
+    perform_action("touch_coordinate", center_x, center_y)
   end
 
   def keyboard_enter_text(text, options = {})
-    performAction('keyboard_enter_text', text)
+    perform_action('keyboard_enter_text', text)
   end
 
   def enter_text(uiquery, text, options = {})
-    touch(uiquery, options)
+    tap_when_element_exists(uiquery, options)
     sleep 0.5
     keyboard_enter_text(text, options)
   end
 
+  def clear_text(query_string, options={})
+    result = query(query_string, setText: '')
+
+    raise "No elements found. Query: #{query_string}" if result.empty?
+
+    true
+  end
+
   def find_coordinate(uiquery)
     raise "Cannot find nil" unless uiquery
 
+    element = execute_uiquery(uiquery)
+
+    raise "No elements found. Query: #{uiquery}" if element.nil?
+
+    center_x = element["rect"]["center_x"]
+    center_y = element["rect"]["center_y"]
+
+    [center_x, center_y]
+  end
+
+  def execute_uiquery(uiquery)
     if uiquery.instance_of? String
       elements = query(uiquery)
-      raise "No elements found. Query: #{uiquery}" if elements.empty?
-      element = elements.first
+
+      return elements.first unless elements.empty?
     else
-      element = uiquery
-      element = element.first if element.instance_of?(Array)
+      elements = uiquery
+
+      return elements.first if elements.instance_of?(Array)
+      return elements if elements.instance_of?(Hash)
     end
 
-    center_x = element["rect"]["center_x"]
-    center_y = element["rect"]["center_y"]
+    nil
+  end
 
-    [center_x, center_y]
+  def step_deprecated
+    puts 'Warning: This predefined step is deprecated.'
   end
 
   def http(path, data = {}, options = {})
@@ -759,16 +819,52 @@ module Operations
   end
 
   def set_text(uiquery, txt)
-    view,arguments = uiquery.split(" ",2)
-    raise "Currently queries are only supported for webviews" unless view.downcase == "webview"
+    puts "set_text is deprecated. Use enter_text instead"
+    enter_text(uiquery, txt)
+  end
+
+  def press_back_button
+    perform_action('go_back')
+  end
+
+  def press_menu_button
+    perform_action('press_menu')
+  end
+
+  def select_options_menu_item(text, options={})
+    press_menu_button
+    tap_when_element_exists("DropDownListView * marked:'#{text}'", options)
+  end
+
+  def select_context_menu_item(view_uiquery, menu_item_query_string)
+    long_press(view_uiquery)
+
+    container_class = 'com.android.internal.view.menu.ListMenuItemView'
+    wait_for_element_exists(container_class)
+
+    combined_query_string = "#{container_class} descendant #{menu_item_query_string}"
+    touch(combined_query_string)
+  end
+
+  def tap_when_element_exists(query_string, options={})
+    options.merge!({action: lambda {|q| touch(q)}})
 
-    if arguments =~ /(css|xpath):\s*(.*)/
-      r = performAction("set_text", $1, $2, txt)
+    if options[:scroll] == true
+      scroll_to(query_string, options)
     else
-     raise "Invalid query #{arguments}"
+      when_element_exists(query_string, options)
     end
   end
 
+  def long_press_when_element_exists(query_string, options={})
+    options.merge!({action: lambda {|q| long_press(q)}})
+
+    if options[:scroll] == true
+      scroll_to(query_string, options)
+    else
+      when_element_exists(query_string, options)
+    end
+  end
 
   def swipe(dir,options={})
       ni
@@ -782,8 +878,82 @@ module Operations
     ni
   end
 
-  def scroll(uiquery,direction)
-    ni
+  def scroll_up
+    scroll("android.widget.ScrollView", :up)
+  end
+
+  def scroll_down
+    scroll("android.widget.ScrollView", :down)
+  end
+
+  def scroll(query_string, direction)
+    if direction != :up && direction != :down
+      raise 'Only upwards and downwards scrolling is supported for now'
+    end
+
+    scroll_x = 0
+    scroll_y = 0
+
+    action = lambda do
+      element = query(query_string).first
+      raise "No elements found. Query: #{query_string}" if element.nil?
+
+      width = element['rect']['width']
+      height = element['rect']['height']
+
+      if direction == :up
+        scroll_y = -height/2
+      else
+        scroll_y = height/2
+      end
+
+      query(query_string, {scrollBy: [scroll_x.to_i, scroll_y.to_i]})
+    end
+
+    when_element_exists(query_string, action: action)
+  end
+
+  def scroll_to(query_string, options={})
+    options[:action] ||= lambda {}
+
+    all_query_string = query_string
+
+    unless all_query_string.chomp.downcase.start_with?('all')
+      all_query_string = "all #{all_query_string}"
+    end
+
+    wait_for_element_exists(all_query_string)
+
+    visibility_query_string = all_query_string[4..-1]
+
+    unless query(visibility_query_string).empty?
+      when_element_exists(visibility_query_string, options)
+      return
+    end
+
+    element = query(all_query_string).first
+    raise "No elements found. Query: #{all_query_string}" if element.nil?
+    element_center_y = element['rect']['center_y']
+
+    scroll_view_query_string = "#{all_query_string} parent android.widget.ScrollView index:0"
+    scroll_element = query(scroll_view_query_string).first
+
+    raise "Could not find parent scroll view. Query: #{scroll_view_query_string}" if element.nil?
+
+    scroll_element_y = scroll_element['rect']['y']
+    scroll_element_height = scroll_element['rect']['height']
+
+    if element_center_y > scroll_element_y + scroll_element_height
+      scroll_by_y = element_center_y - (scroll_element_y + scroll_element_height) + 2
+    else
+      scroll_by_y = element_center_y - scroll_element_y - 2
+    end
+
+    result = query(scroll_view_query_string, {scrollBy: [0, scroll_by_y.to_i]}).first
+    raise 'Could not scroll parent view' if result != '<VOID>'
+
+    visibility_query_string = all_query_string[4..-1]
+    when_element_exists(visibility_query_string, options)
   end
 
   def scroll_to_row(uiquery,number)
@@ -858,7 +1028,13 @@ module Operations
   end
 
   def backdoor(sel, arg)
-    ni
+    result = perform_action("backdoor", sel, arg)
+    if !result["success"]
+      screenshot_and_raise(result["message"])
+    end
+
+    # for android results are returned in bonusInformation
+    result["bonusInformation"].first
   end
 
   def map(query, method_name, *method_args)