calabash-android 0.7.3.pre3 → 0.7.3.preintentstart1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6f2060b5f9a4091bdfa818737799ee9de3e7631
-  data.tar.gz: 62bf5ce157fa90ba541763660faf92389f292d98
+  metadata.gz: b318f68b7441a38baf7bc4898677e13a9c40472a
+  data.tar.gz: 5e9e6c60c4978bada21a7e3d4768d80c2dcef8cd
 SHA512:
-  metadata.gz: 6c7822d097054783bdf78eb101660e1eecb0ede01f43d34d6b0d2ace8f8d6cdb23c21961f784334abb274802b8ea9640eb694a0f8352f15794e46db362c360ed
-  data.tar.gz: 90ce2bd879dc42b3908fb4995e5a6b7e59291859716935a1b354b1175f94fdfbe9d88cb16a416a133a7a53bbaf85b95de2f8d2675b9d6af328026d15781bf72b
+  metadata.gz: 10c0579fba3fe651cf14fe860a7e46488697eb1720d45b0743e4152d3975370465e9bdda0fdc924b66cfdc77878fca7200bc15462c0806d3db1c80cd48bfc570
+  data.tar.gz: c90be72108c623261e7713e89f60be0d955170403042a8f6ca1b891999adf74c2612aeb7e5a13ab99347770768ead6d74306a787f8e61f915fe58298d2936116

data/lib/calabash-android/monkey_helpers.rb

@@ -26,8 +26,6 @@ module Calabash
 
         sleep(args.fetch(:hang_time))
         monkey_touch(:up, to_x, to_y)
-
-        kill_existing_monkey_processes
       end
 
       def get_monkey_port
@@ -67,7 +65,6 @@ module Calabash
       end
 
       def kill_monkey_processes_on_device
-        perform_action('send_tcp', @@monkey_port, "quit", true) unless @@monkey_port.nil?
         existing_monkey_pids.each do |pid|
           `#{adb_command} shell kill -9 #{pid}`
         end
@@ -105,7 +102,6 @@ module Calabash
         start_monkey if should_start_monkey
         monkey_touch(:down, x, y)
         monkey_touch(:up, x, y)
-        kill_existing_monkey_processes
       end
 
       def monkey_touch(touch_type, x, y)

data/lib/calabash-android/operations.rb

@@ -139,8 +139,8 @@ module Calabash module Android
       default_device.push(local, remote)
     end
 
-    def start_test_server_in_background(options={})
-      default_device.start_test_server_in_background(options)
+    def start_test_server_in_background(options={}, &block)
+      default_device.start_test_server_in_background(options, &block)
     end
 
     def shutdown_test_server
@@ -637,14 +637,15 @@ module Calabash module Android
         raise "Could not push #{local} to #{remote}" unless system(cmd)
       end
 
-      def start_test_server_in_background(options={})
+      def start_test_server_in_background(options={}, &block)
         raise "Will not start test server because of previous failures." if ::Cucumber.wants_to_quit
 
         if keyguard_enabled?
           wake_up
         end
 
-        env_options = options
+        env_options = options.clone
+        env_options.delete(:intent)
 
         env_options[:target_package] ||= package_name(@app_path)
         env_options[:main_activity] ||= main_activity(@app_path)
@@ -719,12 +720,26 @@ module Calabash module Android
 
         log("Client and server versions match (client: #{client_version}, server: #{server_version}). Proceeding...")
 
+        block.call if block
+
+        start_application(options[:intent])
+
         # What is Calabash tracking? Read this post for information
         # No private data (like ip addresses) are collected
         # https://github.com/calabash/calabash-android/issues/655
         Calabash::Android::UsageTracker.new.post_usage_async
       end
 
+      def start_application(intent)
+        result = JSON.parse(http("/start-application", {intent: intent.to_json}))
+
+        if result['outcome'] != 'SUCCESS'
+          raise result['detail']
+        end
+
+        result['result']
+      end
+
       def shutdown_test_server
         begin
           http("/kill")

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.7.3.pre3"
+    VERSION = "0.7.3.preintentstart1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.7.3.pre3
+  version: 0.7.3.preintentstart1
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber