calabash 2.0.0.pre11 → 2.0.0.prelegacy

data/lib/calabash/android/device.rb

@@ -5,10 +5,6 @@ module Calabash
     # A representation of a Calabash Android device.
     # @!visibility private
     class Device < ::Calabash::Device
-      require 'calabash/android/device/helper_application'
-
-      include Calabash::Android::Device::HelperApplication
-
       attr_reader :adb
 
       def initialize(identifier, server)
@@ -70,28 +66,28 @@ module Calabash
 
       # @!visibility private
       def installed_packages
-        installed_apps.map{|e| e[:package]}
+        adb.shell('pm list packages').lines.map do |line|
+          line.sub('package:', '').chomp
+        end
       end
 
       # @!visibility private
       def installed_apps
-        @installed_apps_cache ||= lambda do
-          adb.shell('pm list packages -f').lines.map do |line|
-            # line will be package:<path>=<package>
-            # e.g. "package:/system/app/GoogleEars.apk=com.google.android.ears"
-            info = line.sub("package:", "")
+        adb.shell('pm list packages -f').lines.map do |line|
+          # line will be package:<path>=<package>
+          # e.g. "package:/system/app/GoogleEars.apk=com.google.android.ears"
+          info = line.sub("package:", "")
 
-            app_path, app_id = info.split('=').map(&:chomp)
+          app_path, app_id = info.split('=').map(&:chomp)
 
-            {package: app_id, path: app_path}
-          end
-        end.call
+          {package: app_id, path: app_path}
+        end
       end
 
       # @!visibility private
       def test_server_responding?
         begin
-          http_client.post(HTTP::Request.new('ping'), retries: 1).body == 'pong'
+          http_client.get(HTTP::Request.new('ping'), retries: 1).body == 'pong'
         rescue HTTP::Error => _
           false
         end
@@ -100,7 +96,7 @@ module Calabash
       # @!visibility private
       def test_server_ready?
         begin
-          http_client.post(HTTP::Request.new('ready')).body == 'true'
+          http_client.get(HTTP::Request.new('ready')).body == 'true'
         rescue HTTP::Error => _
           false
         end
@@ -170,9 +166,9 @@ module Calabash
         request = HTTP::Request.new('map', params_for_request(parameters))
 
         http_result = if method_name == :flash
-                        http_client.post(request, timeout: 30)
+                        http_client.get(request, timeout: 30)
                       else
-                        http_client.post(request)
+                        http_client.get(request)
                       end
 
         result = JSON.parse(http_result.body)
@@ -189,9 +185,9 @@ module Calabash
         @logger.log "Action: #{action} - Arguments: #{arguments.join(', ')}"
 
         parameters = {command: action, arguments: arguments}
-        request = HTTP::Request.new('', params_for_request(parameters))
+        request = HTTP::Request.new('/', params_for_request(parameters))
 
-        result = JSON.parse(http_client.post(request).body)
+        result = JSON.parse(http_client.get(request).body)
 
         unless result['success']
           message = result['message'] || result['bonusInformation']
@@ -215,17 +211,6 @@ module Calabash
         perform_action('keyboard_enter_text', text)
       end
 
-      # @!visibility private
-      def md5_checksum_for_app_package(package)
-        app = installed_apps.find{|app| app[:package] == package}
-
-        unless app
-          raise "Application with package '#{app}' not installed"
-        end
-
-        md5_checksum(app[:path])
-      end
-
       # @!visibility private
       def md5_checksum(file_path)
         result = adb.shell("#{md5_binary} '#{file_path}'")
@@ -244,7 +229,7 @@ module Calabash
         json = parameters.to_json
         request = HTTP::Request.new('/backdoor', json: json)
 
-        body = http_client.post(request).body
+        body = http_client.get(request).body
         result = JSON.parse(body)
 
         if result['outcome'] != 'SUCCESS'
@@ -381,7 +366,7 @@ module Calabash
         json = parameters.to_json
         request = HTTP::Request.new('/map', json: json)
 
-        body = http_client.post(request).body
+        body = http_client.get(request).body
         result = JSON.parse(body)
 
         if result['outcome'] != 'SUCCESS'
@@ -424,75 +409,25 @@ module Calabash
         adb.shell(cmd, no_exit_code_check: true).chomp == file
       end
 
-      def file_exists?(file)
-        ensure_helper_application_started
-
-        request = HTTP::Request.new('file-exists', params_for_request(fileName: file))
-        response = helper_application_http_client.post(request)
-
-        if response.status != 200
-          result = JSON.parse(response.body)
-          raise "Failed to find out if file exists #{result['reason']}"
-        end
-
-        case response.body
-          when 'true'
-            return true
-          when 'false'
-            return false
-          else
-            raise "Invalid resposne '#{response.body}'"
-        end
-      end
-
-      def read_file(file)
-        ensure_helper_application_started
-
-        request = HTTP::Request.new('read-file', params_for_request(fileName: file))
-        response = helper_application_http_client.post(request)
-
-        if response.status != 200
-          result = JSON.parse(response.body)
-          raise "Failed to read file. Reason: #{result['reason']}"
-        end
-
-        response.body
-      end
-
       def calabash_server_failure_exists?(application)
-        file_exists?(calabash_server_failure_file_path(application))
+        adb_file_exists?(calabash_server_failure_file_path(application))
       end
 
       def calabash_server_finished_exists?(application)
-        file_exists?(calabash_server_finished_file_path(application))
+        adb_file_exists?(calabash_server_finished_file_path(application))
       end
 
       def read_calabash_sever_failure(application)
-        read_file(calabash_server_failure_file_path(application))
+        adb.shell("cat #{calabash_server_failure_file_path(application)}")
       end
 
       def read_calabash_sever_finished(application)
-        read_file(calabash_server_finished_file_path(application))
+        adb.shell("cat #{calabash_server_finished_file_path(application)}")
       end
 
       def clear_calabash_server_report(application)
         if installed_packages.include?(application.test_server.identifier)
-          parameters =
-              {
-                  intent: {
-                      flags: 0x10000000,
-                      component: {
-                          packageName: application.test_server.identifier,
-                          className: 'sh.calaba.instrumentationbackend.StatusReporterActivity',
-                      },
-                      extras: {
-                          method: 'clear'
-                      }
-                  }
-              }
-
-          ensure_helper_application_started
-          start_activity(parameters)
+          adb.shell("am start -e method clear -n #{application.test_server.identifier}/sh.calaba.instrumentationbackend.StatusReporterActivity")
         end
       end
 
@@ -504,13 +439,12 @@ module Calabash
         end
 
         env_options[:test_server_port] = server.test_server_port
+        env_options[:target_package] = application.identifier
 
         env_options[:class] = options.fetch(:class, 'sh.calaba.instrumentationbackend.InstrumentationBackend')
 
         if options[:activity]
           env_options[:main_activity] = options[:activity]
-        else
-          env_options[:main_activity] = 'null'
         end
 
         if application.test_server.nil?
@@ -525,13 +459,15 @@ module Calabash
           raise "The test-server '#{application.test_server.identifier}' is not installed"
         end
 
-        installed_app_md5_checksum = md5_checksum_for_app_package(application.identifier)
+        installed_app = installed_apps.find{|app| app[:package] == application.identifier}
+        installed_app_md5_checksum = md5_checksum(installed_app[:path])
 
         if application.md5_checksum != installed_app_md5_checksum
           raise "The specified app is not the same as the installed app (#{application.md5_checksum} != #{installed_app_md5_checksum})."
         end
 
-        installed_test_server_md5_checksum = md5_checksum_for_app_package(application.test_server.identifier)
+        installed_test_server = installed_apps.find{|app| app[:package] == application.test_server.identifier}
+        installed_test_server_md5_checksum = md5_checksum(installed_test_server[:path])
 
         if application.test_server.md5_checksum != installed_test_server_md5_checksum
           raise "The specified test-server is not the same as the installed test-server (#{application.test_server.md5_checksum} != #{installed_test_server_md5_checksum})."
@@ -539,6 +475,9 @@ module Calabash
 
         ensure_screen_on
 
+        # Clear any old error reports
+        clear_calabash_server_report(application)
+
         # We have to forward the port ourselves, as an old test-server could be
         # running on the old port. If the retriable client was able to
         # determine if the port had been forwarded, we would not need this.
@@ -558,17 +497,14 @@ module Calabash
           end
         end
 
-        # Clear any old error reports
-        clear_calabash_server_report(application)
-
         extras = ''
 
         env_options.each_pair do |key, val|
-          extras = "#{extras} -e #{key.to_s} #{val.to_s}"
+          extras = "#{extras} -e \"#{key.to_s}\" \"#{val.to_s}\""
         end
 
         begin
-          adb_instrument(application,
+          instrument(application,
                      'sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner',
                      extras)
         rescue ADB::ADBCallError => e
@@ -576,7 +512,7 @@ module Calabash
         end
 
         begin
-          Calabash::Retry.retry(retries: 30, interval: 1, timeout: 30, on_errors: [RetryError]) do
+          Retriable.retriable(tries: 30, interval: 1, timeout: 30, on: RetryError) do
             unless test_server_responding?
               # Read any message the test-server might have
               if calabash_server_failure_exists?(application)
@@ -595,7 +531,7 @@ module Calabash
         end
 
         begin
-          Calabash::Retry.retry(retries: 10, interval: 1, timeout: 10, on_errors: [RetryError]) do
+          Retriable.retriable(tries: 10, interval: 1, timeout: 10) do
             unless test_server_ready?
               raise RetryError
             end
@@ -606,31 +542,15 @@ module Calabash
           raise 'Test-server was never ready'
         end
 
-        start_application(options[:intent])
-
         # Return true to avoid cluttering the console
         true
       end
 
-      # @!visibility private
-      def start_application(intent)
-        request = HTTP::Request.new('start-application', params_for_request(intent: intent))
-        body = http_client.post(request).body
-
-        result = JSON.parse(body)
-
-        if result['outcome'] != 'SUCCESS'
-          raise "Failed to start application. Reason: #{result['reason']}"
-        end
-
-        result['result']
-      end
-
       # @!visibility private
       def _stop_app
-        Calabash::Retry.retry(retries: 5, interval: 1) do
+        Retriable.retriable(tries: 5, interval: 1) do
           begin
-            http_client.post(HTTP::Request.new('kill'), retries: 1, interval: 0)
+            http_client.get(HTTP::Request.new('kill'), retries: 1, interval: 0)
           rescue HTTP::Error => _
             # It's fine that we can't contact the test-server, as it might already have been shut down
             if test_server_responding?
@@ -674,7 +594,7 @@ module Calabash
       end
 
       # @!visibility private
-      def adb_instrument(application, test_server_activity, extras = '')
+      def instrument(application, test_server_activity, extras = '')
         unless application.is_a?(Android::Application)
           raise ArgumentError, "Invalid application type '#{application.class}'"
         end
@@ -702,45 +622,11 @@ module Calabash
       class EnsureInstrumentActionError < RuntimeError; end
 
       # @!visibility private
-      def ensure_adb_instrument_action(application, test_server_activity, extras = '')
+      def ensure_instrument_action(application, test_server_activity, extras = '')
         clear_calabash_server_report(application)
 
         begin
-          adb_instrument(application, test_server_activity, extras)
-        rescue ADB::ADBCallError => e
-          raise EnsureInstrumentActionError, e
-        end
-
-        begin
-          Timeout.timeout(10) do
-            loop do
-              if calabash_server_failure_exists?(application)
-                failure_message = read_calabash_sever_failure(application)
-
-                raise EnsureInstrumentActionError, parse_failure_message(failure_message)
-              end
-
-              if calabash_server_finished_exists?(application)
-                output = read_calabash_sever_finished(application)
-
-                if output == 'SUCCESSFUL'
-                  break
-                end
-              end
-            end
-          end
-        rescue Timeout::Error => _
-          raise EnsureInstrumentActionError, 'Timed out waiting for status'
-        end
-      end
-
-      # @!visibility private
-      def ensure_instrument_action(application, parameters)
-        ensure_helper_application_started
-        clear_calabash_server_report(application)
-
-        begin
-          instrument(parameters)
+          instrument(application, test_server_activity, extras)
         rescue ADB::ADBCallError => e
           raise EnsureInstrumentActionError, e
         end
@@ -770,18 +656,8 @@ module Calabash
 
       # @!visibility private
       def ts_clear_app_data(application)
-        parameters =
-            {
-                intent: {
-                    component: {
-                        className: 'sh.calaba.instrumentationbackend.ClearAppData2',
-                        packageName: application.test_server.identifier
-                    }
-                }
-            }
-
         begin
-          ensure_instrument_action(application, parameters)
+          ensure_instrument_action(application, 'sh.calaba.instrumentationbackend.ClearAppData2')
         rescue EnsureInstrumentActionError => e
           raise "Failed to clear app data: #{e.message}"
         end
@@ -866,10 +742,11 @@ module Calabash
         if installed_packages.include?(application.identifier)
           @logger.log 'Application is already installed. Ensuring right checksum'
 
-          installed_app_md5_checksum = md5_checksum_for_app_package(application.identifier)
+          installed_app = installed_apps.find{|app| app[:package] == application.identifier}
+          installed_app_md5_checksum = md5_checksum(installed_app[:path])
 
           if application.md5_checksum != installed_app_md5_checksum
-            @logger.log("The md5 checksum has changed for '#{application.identifier}' (#{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
@@ -1027,7 +904,6 @@ module Calabash
 
       # @!visibility private
       def adb_uninstall_app(package)
-        @installed_apps_cache = nil
         @logger.log "Uninstalling #{package}"
         result = adb.command('uninstall', package, timeout: 60).lines.last
 
@@ -1042,7 +918,6 @@ module Calabash
 
       # @!visibility private
       def adb_install_app(application)
-        @installed_apps_cache = nil
         # Because of a bug in the latest version of ADB
         # https://github.com/android/platform_system_core/blob/0f91887868e51de67bdf9aedc97fbcb044dc1969/adb/commandline.cpp#L1466
         # ADB now uses rm -f ... to remove the temporary application on the
@@ -1113,9 +988,9 @@ module Calabash
 
       # @!visibility private
       def execute_gesture(multi_touch_gesture)
-        request = HTTP::Request.new('gesture', params_for_request(multi_touch_gesture))
+        request = HTTP::Request.new('gesture', json: multi_touch_gesture.to_json)
 
-        body = http_client.post(request, timeout: multi_touch_gesture.timeout + 10).body
+        body = http_client.get(request, timeout: multi_touch_gesture.timeout + 10).body
         result = JSON.parse(body)
 
         if result['outcome'] != 'SUCCESS'
@@ -1139,36 +1014,6 @@ module Calabash
         end
       end
 
-      class InstrumentationError < RuntimeError; end
-
-      def instrument(parameters, http_client = helper_application_http_client)
-        request = HTTP::Request.new('instrument', params_for_request(parameters))
-
-        body = http_client.post(request).body
-        result = JSON.parse(body)
-
-        if result['outcome'] != 'SUCCESS'
-          raise InstrumentationError, "Failed to instrument. Reason: #{result['reason']}"
-        end
-
-        true
-      end
-
-      class StartActivityError < RuntimeError; end
-
-      def start_activity(parameters, http_client = helper_application_http_client)
-        request = HTTP::Request.new('start-activity', params_for_request(parameters))
-
-        body = http_client.post(request).body
-        result = JSON.parse(body)
-
-        if result['outcome'] != 'SUCCESS'
-          raise StartActivityError, "Failed to start activity. Reason: #{result['reason']}"
-        end
-
-        true
-      end
-
       # @!visibility private
       def params_for_request(parameters)
         {json: parameters.to_json}
@@ -1181,9 +1026,6 @@ module Calabash
         else
           if adb.shell('md5', no_exit_code_check: true).chomp == 'md5 file ...'
             @md5_binary = 'md5'
-          elsif (r = adb.shell('md5sum _cal_no_such_file', no_exit_code_check: true)) && r.chomp.start_with?('md5sum:') &&
-              !r.include?('permission denied')
-            @md5_binary = 'md5sum'
           else
             # The device does not have 'md5'
             calmd5 = Calabash::Android.binary_location('calmd5', info[:cpu_architecture], can_handle_pie_binaries?)

data/lib/calabash/android/environment.rb

@@ -1,11 +1,6 @@
 require 'rexml/document'
 require 'timeout'
-
-# We sometimes want to require a Ruby gem without having our IDE auto-complete
-# using it. For example awesome_print adds a ton of methods to 'Object'
-alias :cal_require_without_documentation :require
-cal_require_without_documentation 'luffa'
-
+require 'luffa'
 require 'timeout'
 
 if RbConfig::CONFIG['host_os'] =~ /mswin|mingw|cygwin/
@@ -30,14 +25,6 @@ module Calabash
       # @todo Maybe rename this to CAL_SERVER_URL or CAL_SERVER?
       DEVICE_ENDPOINT = URI.parse((variable('CAL_ENDPOINT') || 'http://127.0.0.1:34777'))
 
-      # A URI that points to the helper server on the device.
-      #
-      # The default value is 'http://localhost:34778'.
-      #
-      # You can control the value of this variable by setting the `CAL_HELPER_ENDPOINT`
-      # variable.
-      DEVICE_HELPER_ENDPOINT = URI.parse((variable('CAL_HELPER_ENDPOINT') || 'http://127.0.0.1:34778'))
-
       private
 
       def self.set_android_dependencies(android_dependencies)

data/lib/calabash/android/gestures.rb

@@ -314,7 +314,7 @@ module Calabash
       end
 
       # @!visibility private
-      define_method(:_pan_screen_up) do |options={}|
+      def _pan_screen_up(options={})
         from = {x: 50, y: 90}
         to = {x: 50, y: 10}
 
@@ -322,7 +322,7 @@ module Calabash
       end
 
       # @!visibility private
-      define_method(:_pan_screen_down) do |options={}|
+      def _pan_screen_down(options={})
         from = {x: 50, y: 10}
         to = {x: 50, y: 90}
 
@@ -330,7 +330,7 @@ module Calabash
       end
 
       # @!visibility private
-      define_method(:_flick_screen_up) do |options={}|
+      def _flick_screen_up(options={})
         from = {x: 50, y: 90}
         to = {x: 50, y: 10}
 
@@ -338,7 +338,7 @@ module Calabash
       end
 
       # @!visibility private
-      define_method(:_flick_screen_down) do |options={}|
+      def _flick_screen_down(options={})
         from = {x: 50, y: 10}
         to = {x: 50, y: 90}
 
@@ -346,8 +346,24 @@ module Calabash
       end
 
       # @!visibility private
-      define_method(:_pinch_screen) do |options={}|
-        Calabash::Internal.with_default_device(required_os: :android) {|device| device.pinch(direction, "* id:'content'", options)}
+      def _pinch_screen(direction, options={})
+        Device.default.pinch(direction, "* id:'content'", options)
+      end
+
+      # @!visibility private
+      def _pinch_to_zoom(direction, query, options={})
+        if direction == :out
+          Device.default.pinch(:in, query, options)
+        elsif direction == :in
+          Device.default.pinch(:out, query, options)
+        else
+          raise "Invalid direction '#{direction}'"
+        end
+      end
+
+      # @!visibility private
+      def _pinch_screen_to_zoom(direction, options={})
+        _pinch_to_zoom(direction, "* id:'content'", options)
       end
     end
   end

data/lib/calabash/android/interactions.rb

@@ -8,16 +8,13 @@ module Calabash
     module Interactions
       # Go back. If the keyboard is shown, it will be dismissed.
       def go_back
-        Calabash::Internal.with_default_device(required_os: :android) do |device|
-          device.perform_action('hide_soft_keyboard')
-        end
-
-        press_physical_back_button
+        Device.default.perform_action('hide_soft_keyboard')
+        press_back_button
       end
 
       # Go to the home screen.
       def go_home
-        Calabash::Internal.with_default_device(required_os: :android) {|device| device.go_home}
+        Device.default.go_home
 
         true
       end
@@ -25,33 +22,33 @@ module Calabash
       # Get the name of the currently focused activity
       #
       # @example
-      #  puts cal_android.focused_activity
+      #  puts focused_activity
       #  # => com.example.MainActivity
       #
       # @return [String] The name of the currently focused activity.
       def focused_activity
-        Calabash::Internal.with_default_device(required_os: :android) {|device| device.current_focus[:activity]}
+        Device.default.current_focus[:activity]
       end
 
       # Get the name of the currently focused package
       #
       # @example
-      #  puts cal_android.focused_package
+      #  puts focused_package
       #  # => com.example
       #
       # @return [String] The name of the currently focused package
       def focused_package
-        Calabash::Internal.with_default_device(required_os: :android) {|device| device.current_focus[:package]}
+        Device.default.current_focus[:package]
       end
 
       # Sets the date of the first visible date picker widget.
       #
       # @example
-      #  cal_android.set_date('2012-04-24')
+      #  set_date('2012-04-24')
       #
       # @example
       #  date = Date.parse('3rd Feb 2012')
-      #  cal_android.set_date(date)
+      #  set_date(date)
       #
       # @param [Date, String] date The date to set. If given a String,
       #  `Date.parse` is called on the string.
@@ -91,11 +88,11 @@ module Calabash
       # Sets the time of the first visible time picker widget.
       #
       # @example
-      #  cal_android.set_time('14:42')
+      #  set_time('14:42')
       #
       # @example
       #  time = Time.parse('8:30 AM')
-      #  cal_android.set_time(time)
+      #  set_time(time)
       #
       # @param [Time, String] time The time to set. If given a String,
       #  `Time.parse` is called on the string.
@@ -141,6 +138,12 @@ module Calabash
 
         true
       end
+
+
+      # @!visibility private
+      def _evaluate_javascript_in(query, javascript)
+        Device.default.evaluate_javascript_in(query, javascript)
+      end
     end
   end
 end