calabash 1.9.9.pre3 → 2.0.0.prelegacy

data/lib/calabash/android/application.rb

@@ -8,7 +8,7 @@ module Calabash
         application_path = Environment::APP_PATH
 
         if application_path.nil?
-          raise 'No application path is set'
+          raise 'No application path is set. Specify application with environment variable CAL_APP'
         end
 
         unless File.exist?(application_path)
@@ -20,8 +20,12 @@ module Calabash
         end
 
         build_test_server = Build::TestServer.new(application_path)
-        test_server_path = Environment::TEST_SERVER_PATH ||
-            build_test_server.path
+        test_server_path = Environment::TEST_SERVER_PATH
+
+        unless test_server_path
+          test_server_path = build_test_server.path
+          Logger.info "No test-server specified. Defaulting to path '#{test_server_path}'"
+        end
 
         unless File.exist?(test_server_path)
           Logger.error "Test-server '#{test_server_path}' does not exist."
@@ -38,6 +42,13 @@ module Calabash
         @test_server = Application.new(test_server_path, nil, options) if test_server_path
       end
 
+      # Is this application an android application
+      #
+      # @return [Boolean] Always returns true
+      def android_application?
+        true
+      end
+
       def extract_identifier
         package_line = aapt_dump('package').first
         raise "'package' not found in aapt output" unless package_line

data/lib/calabash/android/build/builder.rb

@@ -16,7 +16,8 @@ module Calabash
           end
         end
 
-        def build
+        # @!visibility private
+        def build(out_file = nil)
           apk_fingerprint = fingerprint_from_apk
           @logger.log "#{@application_path} was signed with a certificate with fingerprint #{apk_fingerprint}", :debug
 
@@ -37,7 +38,7 @@ module Calabash
             end
             @logger.log ""
             @logger.log "You can resign the app with #{keystores.first.location} by running:
-      calabash resign #{@application_path}"
+      calabash resign \"#{@application_path}\""
 
             @logger.log ""
             @logger.log "Notice that resigning an app might break some functionality."
@@ -48,7 +49,7 @@ module Calabash
 
           application = Calabash::Application.from_path(@application_path)
 
-          test_server_file_name = TestServer.new(@application_path).path
+          test_server_file_name = out_file || TestServer.new(@application_path).path
           FileUtils.mkdir_p File.dirname(test_server_file_name) unless File.exist? File.dirname(test_server_file_name)
 
           Dir.mktmpdir do |workspace_dir|
@@ -69,6 +70,17 @@ module Calabash
 
               Zip::File.new("dummy.apk").extract("AndroidManifest.xml","customAndroidManifest.xml")
               Zip::File.open("TestServer.apk") do |zip_file|
+                begin
+                  check_file("AndroidManifest.xml")
+                  manifest_exists = true
+                rescue
+                  manifest_exists = false
+                end
+
+                if manifest_exists
+                  zip_file.remove("AndroidManifest.xml")
+                end
+
                 zip_file.add("AndroidManifest.xml", "customAndroidManifest.xml")
               end
             end
@@ -83,6 +95,7 @@ module Calabash
           @logger.log "Done signing the test server. Moved it to #{test_server_file_name}"
         end
 
+        # @!visibility private
         def fingerprint_from_apk
           application_path = File.expand_path(@application_path)
 

data/lib/calabash/android/build/java_keystore.rb

@@ -5,6 +5,7 @@ module Calabash
     module Build
       # @!visibility private
       class JavaKeystore
+        # @!visibility private
         CALABASH_KEYSTORE_SETTINGS_FILENAME = 'calabash_keystore_settings.json'
 
         attr_reader :errors, :location, :keystore_alias, :store_password
@@ -68,6 +69,7 @@ module Calabash
           @logger.log "Signature algorithm name: #{signature_algorithm_name}", :debug
         end
 
+        # @!visibility private
         def sign_apk(apk_path, dest_path)
           raise "Cannot sign with a miss configured keystore" if errors
           raise "No such file: #{apk_path}" unless File.exists?(apk_path)
@@ -86,6 +88,7 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def system_with_stdout_on_success(cmd, *args)
           a = Escape.shell_command(args)
           cmd = "#{cmd} #{a.gsub("'", '"')}"
@@ -98,10 +101,12 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def fail_wrong_info
           raise "Could not read keystore with the given credentials. Please ensure "
         end
 
+        # @!visibility private
         def self.read_keystore_with_default_password_and_alias(path)
           path = File.expand_path path
 
@@ -128,6 +133,7 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def self.get_keystores
           if keystore = keystore_from_settings
             [ keystore ]
@@ -141,6 +147,7 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def self.keystore_from_settings
           if File.exist?(CALABASH_KEYSTORE_SETTINGS_FILENAME)
             Logger.info "Reading keystore information specified in #{CALABASH_KEYSTORE_SETTINGS_FILENAME}"
@@ -157,16 +164,19 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def self.fail_if_key_missing(map, key)
           raise "Found #{CALABASH_KEYSTORE_SETTINGS_FILENAME} but no #{key} defined." unless map[key]
         end
 
+        # @!visibility private
         def self.extract_md5_fingerprint(fingerprints)
           m = fingerprints.scan(/MD5.*((?:[a-fA-F\d]{2}:){15}[a-fA-F\d]{2})/).flatten
           raise "No MD5 fingerprint found:\n #{fingerprints}" if m.empty?
           m.first
         end
 
+        # @!visibility private
         def self.extract_signature_algorithm_name(fingerprints)
           m = fingerprints.scan(/Signature algorithm name: (.*)/).flatten
           raise "No signature algorithm names found:\n #{fingerprints}" if m.empty?

data/lib/calabash/android/build/resigner.rb

@@ -14,6 +14,7 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def resign!
           Dir.mktmpdir do |tmp_dir|
             @logger.log 'Resigning apk', :debug
@@ -26,8 +27,27 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def unsign(unsigned_path)
-          files_to_remove = `"#{Environment.aapt_path}" list "#{unsigned_path}"`.lines.collect(&:strip).grep(/^META-INF\//)
+          meta_files = `"#{Environment.aapt_path}" list "#{unsigned_path}"`.lines.collect(&:strip).grep(/^META-INF\//)
+
+          signing_file_names = ['.mf', '.rsa', '.dsa', '.ec', '.sf']
+
+          files_to_remove = meta_files.select do |file|
+            # other will be:
+            # META-INF/foo/bar
+            #  other #=> bar
+            directory, file_name, other = file.split('/')
+
+            if other != nil || file_name.nil?
+              false
+            else
+              if signing_file_names.include?(File.extname(file_name).downcase)
+                true
+              end
+            end
+          end
+
           if files_to_remove.empty?
             @logger.log "App wasn't signed. Will not try to unsign it.", :debug
           else
@@ -35,12 +55,14 @@ module Calabash
           end
         end
 
+        # @!visibility private
         def zipalign(unaligned_path, app_path)
           cmd = %Q("#{Environment.zipalign_path}" -f 4 "#{unaligned_path}" "#{app_path}")
           @logger.log "Zipaligning using: #{cmd}", :debug
           system(cmd)
         end
 
+        # @!visibility private
         def sign(app_path, dest_path)
           java_keystore = JavaKeystore.get_keystores.first
 

data/lib/calabash/android/build/test_server.rb

@@ -7,10 +7,12 @@ module Calabash
           @application_path = application_path
         end
 
+        # @!visibility private
         def path
           File.expand_path("test_servers/#{checksum(@application_path)}_#{VERSION}.apk")
         end
 
+        # @!visibility private
         def exists?
           File.exists?(path)
         end

data/lib/calabash/android/defaults.rb

@@ -1,5 +1,6 @@
 module Calabash
   module Android
+    # Runtime defaults for Android.
     module Defaults
       # Sets up the default device and the default application based on the
       # environment.

data/lib/calabash/android/device.rb

@@ -22,6 +22,7 @@ module Calabash
         port_forward(new_server.endpoint.port, new_server.test_server_port)
       end
 
+      # @!visibility private
       def self.default_serial
         serials = list_serials
 
@@ -46,6 +47,7 @@ module Calabash
         end
       end
 
+      # @!visibility private
       def self.list_serials
         output = ADB.command('devices')
         lines = output.lines
@@ -62,12 +64,14 @@ module Calabash
         end
       end
 
+      # @!visibility private
       def installed_packages
         adb.shell('pm list packages').lines.map do |line|
           line.sub('package:', '').chomp
         end
       end
 
+      # @!visibility private
       def installed_apps
         adb.shell('pm list packages -f').lines.map do |line|
           # line will be package:<path>=<package>
@@ -80,6 +84,7 @@ module Calabash
         end
       end
 
+      # @!visibility private
       def test_server_responding?
         begin
           http_client.get(HTTP::Request.new('ping'), retries: 1).body == 'pong'
@@ -88,6 +93,7 @@ module Calabash
         end
       end
 
+      # @!visibility private
       def test_server_ready?
         begin
           http_client.get(HTTP::Request.new('ready')).body == 'true'
@@ -96,6 +102,7 @@ module Calabash
         end
       end
 
+      # @!visibility private
       def port_forward(host_port, test_server_port = nil)
         if test_server_port.nil?
           test_server_port = server.test_server_port
@@ -105,6 +112,7 @@ module Calabash
         adb.command(*adb_forward_cmd)
       end
 
+      # @!visibility private
       def make_map_parameters(query, map_method_name, *method_args)
         converted_args = []
 
@@ -157,7 +165,13 @@ module Calabash
 
         request = HTTP::Request.new('map', params_for_request(parameters))
 
-        result = JSON.parse(http_client.get(request).body)
+        http_result = if method_name == :flash
+                        http_client.get(request, timeout: 30)
+                      else
+                        http_client.get(request)
+                      end
+
+        result = JSON.parse(http_result.body)
 
         if result['outcome'] != 'SUCCESS'
           raise "mapping \"#{query}\" with \"#{method_name}\" failed because: #{result['reason']}\n#{result['details']}"
@@ -166,6 +180,7 @@ module Calabash
         Calabash::QueryResult.create(result['results'], query)
       end
 
+      # @!visibility private
       def perform_action(action, *arguments)
         @logger.log "Action: #{action} - Arguments: #{arguments.join(', ')}"
 
@@ -191,10 +206,12 @@ module Calabash
         result
       end
 
+      # @!visibility private
       def enter_text(text)
         perform_action('keyboard_enter_text', text)
       end
 
+      # @!visibility private
       def md5_checksum(file_path)
         result = adb.shell("#{md5_binary} '#{file_path}'")
         captures = result.match(/(\w+)/).captures
@@ -228,15 +245,41 @@ module Calabash
         result['result']
       end
 
+
+      # @!visibility private
+      def keyboard_visible?
+        input_method = adb.shell("dumpsys input_method")
+        input_method.lines.each do |line|
+          match = line.match(/mInputShown\s*=\s*(.*)/)
+
+          if match && match.captures.length != 0
+            shown = match.captures.first.chomp
+
+            if shown == "true"
+              return true
+            elsif shown == "false"
+              return false
+            else
+              raise "Could not detect keyboard visibility. '#{shown}'"
+            end
+          end
+        end
+
+        raise "Could not detect keyboard visibility. Could not find 'mInputShown'"
+      end
+
+      # @!visibility private
       def go_home
         adb.shell("input keyevent 3")
       end
 
+      # @!visibility private
       def set_location(location)
         perform_action('set_gps_coordinates',
                        location[:latitude], location[:longitude])
       end
 
+      # @!visibility private
       def resume_app(path_or_application)
         application = parse_path_or_app_parameters(path_or_application)
 
@@ -257,6 +300,7 @@ module Calabash
         true
       end
 
+      # @!visibility private
       def resume_activity(package, activity)
         if package_running?(package)
           if info[:sdk_version] >= 11
@@ -273,12 +317,14 @@ module Calabash
         end
       end
 
+      # @!visibility private
       def app_running?(path_or_application)
         application = parse_path_or_app_parameters(path_or_application)
 
         package_running?(application.identifier)
       end
 
+      # @!visibility private
       def current_focus
         # Example: mFocusedApp=AppWindowToken{42c52610 token=Token{42b5d048 ActivityRecord{42a7bcc8 u0 com.example/.MainActivity t3}}}
         result = adb.shell('dumpsys window windows')
@@ -308,6 +354,7 @@ module Calabash
         raise "Unexpected output from `dumpsys window windows`"
       end
 
+      # @!visibility private
       def evaluate_javascript_in(query, javascript)
         parameters =
             {
@@ -699,7 +746,7 @@ module Calabash
           installed_app_md5_checksum = md5_checksum(installed_app[:path])
 
           if application.md5_checksum != installed_app_md5_checksum
-            @logger.log("The md5 checksum has changed (#{application.md5_checksum} != #{installed_app_md5_checksum}.", :info)
+            @logger.log("The md5 checksum has changed (#{application.md5_checksum} != #{installed_app_md5_checksum}).", :info)
             _install_app(application)
           end
         else
@@ -819,9 +866,14 @@ module Calabash
         gesture.gestures.first.touches[0].query = query_from
         gesture.gestures.first.touches[1].query = query_to
 
-        execute_gesture(Gestures::Gesture.with_parameters(gesture,
+        result = execute_gesture(Gestures::Gesture.with_parameters(gesture,
                                                           query: query_to,
                                                           timeout: options[:timeout]))
+
+        {
+            :from => Calabash::QueryResult.create(result[0], query_from),
+            :to => Calabash::QueryResult.create(result[1], query_to)
+        }
       end
 
       # @!visibility private

data/lib/calabash/android/environment.rb

@@ -15,6 +15,16 @@ module Calabash
       # @!visibility private
       class InvalidJavaSDKHome < RuntimeError; end
 
+      # A URI that points to the embedded Calabash server in the app under test.
+      #
+      # The default value is 'http://localhost:34777'.
+      #
+      # You can control the value of this variable by setting the `CAL_ENDPOINT`
+      # variable.
+      #
+      # @todo Maybe rename this to CAL_SERVER_URL or CAL_SERVER?
+      DEVICE_ENDPOINT = URI.parse((variable('CAL_ENDPOINT') || 'http://127.0.0.1:34777'))
+
       private
 
       def self.set_android_dependencies(android_dependencies)

data/lib/calabash/android/interactions.rb

@@ -1,10 +1,14 @@
+require 'date'
+require 'time'
+
 module Calabash
   module Android
-    # @!visibility private
+
+    # Interactions with your app that are specific to Android.
     module Interactions
-      # Go back.
+      # Go back. If the keyboard is shown, it will be dismissed.
       def go_back
-        dismiss_keyboard
+        Device.default.perform_action('hide_soft_keyboard')
         press_back_button
       end
 
@@ -37,6 +41,105 @@ module Calabash
         Device.default.current_focus[:package]
       end
 
+      # Sets the date of the first visible date picker widget.
+      #
+      # @example
+      #  set_date('2012-04-24')
+      #
+      # @example
+      #  date = Date.parse('3rd Feb 2012')
+      #  set_date(date)
+      #
+      # @param [Date, String] date The date to set. If given a String,
+      #  `Date.parse` is called on the string.
+      #
+      # @see #set_date_in
+      def set_date(date)
+        set_date_in("android.widget.DatePicker index:0", date)
+      end
+
+      # Sets the date of a date picker widget. If `query` matches multiple date
+      # pickers, the date is set for all of them.
+      #
+      # @param [String, Hash, Calabash::Query] query The query to match the
+      #  date picker.
+      # @param [Date, String] date The date to set. If given a String,
+      #  `Date.parse` is called on the string.
+      # @see #set_date
+      def set_date_in(query, date)
+        if date.is_a?(String)
+          date = Date.parse(date)
+        end
+
+        wait_for_view(query, timeout: Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT)
+        result = query(query, updateDate: [date.year, date.month, date.day])
+
+        if result.length != 1
+          raise "Failed to set the date of '#{query}'"
+        end
+
+        if result.first.is_a?(Hash) && result.first.has_key?('error')
+          raise result.first['error']
+        end
+
+        true
+      end
+
+      # Sets the time of the first visible time picker widget.
+      #
+      # @example
+      #  set_time('14:42')
+      #
+      # @example
+      #  time = Time.parse('8:30 AM')
+      #  set_time(time)
+      #
+      # @param [Time, String] time The time to set. If given a String,
+      #  `Time.parse` is called on the string.
+      #
+      # @see #set_time_in
+      def set_time(time)
+        set_time_in("android.widget.TimePicker index:0", time)
+      end
+
+      # Sets the time of a time picker widget. If `query` matches multiple time
+      # pickers, the time is set for all of them.
+      #
+      # @param [String, Hash, Calabash::Query] query The query to match the
+      #  time picker.
+      # @param [Time, String] time The time to set. If given a String,
+      #  `Time.parse` is called on the string.
+      # @see #set_time
+      def set_time_in(query, time)
+        if time.is_a?(String)
+          time = Time.parse(time)
+        end
+
+        wait_for_view(query, timeout: Calabash::Gestures::DEFAULT_GESTURE_WAIT_TIMEOUT)
+        result = query(query, setCurrentHour: time.hour)
+
+        if result.length != 1
+          raise "Failed to set the time of '#{query}'"
+        end
+
+        if result.first.is_a?(Hash) && result.first.has_key?('error')
+          raise result.first['error']
+        end
+
+        result = query(query, setCurrentMinute: time.min)
+
+        if result.length != 1
+          raise "Failed to set the time of '#{query}'"
+        end
+
+        if result.first.is_a?(Hash) && result.first.has_key?('error')
+          raise result.first['error']
+        end
+
+        true
+      end
+
+
       # @!visibility private
       def _evaluate_javascript_in(query, javascript)
         Device.default.evaluate_javascript_in(query, javascript)