calabash-android 0.7.3.pre3 → 0.7.3.preintentstart4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6f2060b5f9a4091bdfa818737799ee9de3e7631
-  data.tar.gz: 62bf5ce157fa90ba541763660faf92389f292d98
+  metadata.gz: eaed2b6b40b9135b792d92c25e89c14426e57898
+  data.tar.gz: f09dbe2a2dbc66785a5c4b72e3abddf839dde076
 SHA512:
-  metadata.gz: 6c7822d097054783bdf78eb101660e1eecb0ede01f43d34d6b0d2ace8f8d6cdb23c21961f784334abb274802b8ea9640eb694a0f8352f15794e46db362c360ed
-  data.tar.gz: 90ce2bd879dc42b3908fb4995e5a6b7e59291859716935a1b354b1175f94fdfbe9d88cb16a416a133a7a53bbaf85b95de2f8d2675b9d6af328026d15781bf72b
+  metadata.gz: 8fbac058043bd623857e56084cc6a1e01d19131f37421915af1144ca215ad9ce9d0afb8f99ba02791fee71fc6585f4bab5d070e462585f4f887c22b39290a237
+  data.tar.gz: c497e74f19d215552291a5a197263f78e55cb3060d9fff5e4734f6de7700cfeccc08087aadfe4905a1c76ed46f9cea8fd0e7889fc73085821b4e7c438da2e23a

data/lib/calabash-android/lib/AndroidManifest.xml

@@ -3,7 +3,9 @@
       package="#testPackage#"
       android:versionCode="3"
       android:versionName="0.3.0">
-    <application android:label="instrumentation_backend">
+    <application android:label="instrumentation_backend"
+        android:largeHeap="true">
+
       <uses-library android:name="android.test.runner" />
       <uses-library android:name="com.google.android.maps" android:required="false" />
       <activity
@@ -31,8 +33,26 @@
             android:stateNotNeeded="true"
             android:noHistory="true"
             android:excludeFromRecents="true"/>
+    <activity
+        android:name="sh.calaba.instrumentationbackend.FakeCameraActivity"
+        android:label="FakeCameraActivity"
+        android:exported="true"
+        android:finishOnTaskLaunch="true"
+        android:stateNotNeeded="true"
+        android:noHistory="true"
+        android:excludeFromRecents="true"
+        android:theme="@android:style/Theme.NoTitleBar.Fullscreen"/>
+    <activity
+        android:name="sh.calaba.instrumentationbackend.FakePickerActivity"
+        android:label="FakePickerActivity"
+        android:exported="true"
+        android:finishOnTaskLaunch="true"
+        android:stateNotNeeded="true"
+        android:noHistory="true"
+        android:excludeFromRecents="true"/>
     </application>
-    <uses-sdk android:minSdkVersion="4" />
+    <uses-sdk android:minSdkVersion="4"
+        android:targetSdkVersion="21"/>
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearAppData" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearAppData2" />
@@ -47,5 +67,6 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.GET_TASKS" />
     <uses-permission android:name="android.permission.REORDER_TASKS" />
+    <uses-permission android:name="android.permission.CAMERA" />
 
 </manifest>

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,16 +637,16 @@ 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)
         env_options[:test_server_port] ||= @test_server_port
         env_options[:class] ||= "sh.calaba.instrumentationbackend.InstrumentationBackend"
@@ -719,12 +719,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.preintentstart4"
   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.preintentstart4
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber