calabash-android 0.7.3.preintentstart5 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0981e947fa0d7b5ac2fb31f2cde526a464a5308
-  data.tar.gz: 7c68bf51bb34cd0255d9e3db26ae676fa37d0c3a
+  metadata.gz: 72cb718ac59ea123871ad75921668b4b2d587aab
+  data.tar.gz: acea14151fd1f5f0fd83fca1c0006fbb71b611b8
 SHA512:
-  metadata.gz: e41143ea406a4d2760c66fce62b08651c3820a5bf3a51baa362451f85dc6ced094fa186e0260e9cb69936fc34779b761e2cd19f4cb7da14b27177cad2b2bb56b
-  data.tar.gz: 9542b8aa09ac0e2e06f65ab0927637afd2f6068ad175c0b973ad4bd00f6226013b43e86680d83d556a6f6ce58ca948dffc1fb575163db4fb4c70bebcdcacf0a1
+  metadata.gz: 8e4bf76ec803f3ca02103b410de1f8f15d6a8549e9e5fbf9948e57a7fb56c5aaa9214be05a4e19b689bde17ed69fc5be3a047adcf4e1271dbfdc22831a1509a3
+  data.tar.gz: b4b13f2a8b80c4a44add234e290c8117cba9a7a3bb131807525bb4659236477b422f735e94910a2b9b700a9b7aa19ecf1079529efb374c3e09de27b7bc1085f6

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

@@ -3,9 +3,7 @@
       package="#testPackage#"
       android:versionCode="3"
       android:versionName="0.3.0">
-    <application android:label="instrumentation_backend"
-        android:largeHeap="true">
-
+    <application android:label="instrumentation_backend">
       <uses-library android:name="android.test.runner" />
       <uses-library android:name="com.google.android.maps" android:required="false" />
       <activity
@@ -33,26 +31,8 @@
             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"
-        android:targetSdkVersion="21"/>
+    <uses-sdk android:minSdkVersion="4" />
     <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" />
@@ -67,6 +47,5 @@
     <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,6 +26,8 @@ module Calabash
 
         sleep(args.fetch(:hang_time))
         monkey_touch(:up, to_x, to_y)
+
+        kill_existing_monkey_processes
       end
 
       def get_monkey_port
@@ -65,6 +67,7 @@ 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
@@ -102,6 +105,7 @@ 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={}, &block)
-      default_device.start_test_server_in_background(options, &block)
+    def start_test_server_in_background(options={})
+      default_device.start_test_server_in_background(options)
     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={}, &block)
+      def start_test_server_in_background(options={})
         raise "Will not start test server because of previous failures." if ::Cucumber.wants_to_quit
 
         if keyguard_enabled?
           wake_up
         end
 
-        env_options = options.clone
-        env_options.delete(:intent)
+        env_options = options
 
+        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,26 +719,12 @@ 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.preintentstart5"
+    VERSION = "0.7.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.7.3.preintentstart5
+  version: 0.7.3
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-27 00:00:00.000000000 Z
+date: 2016-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -389,9 +389,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.5.1