calabash-android 0.7.4.pre1 → 0.8.0.pre1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa0cfe63104c21ad765b7c31c5373ef87d1f9d1f
-  data.tar.gz: ffe297e230feabd12b36a6370256142ce8ad3b2b
+  metadata.gz: 4f3c04184513136f46a2e22bdee2267e6a0197d2
+  data.tar.gz: 308434d9e8d514059c51e8c3af29d9da6d0f2ab2
 SHA512:
-  metadata.gz: 515a7148b5d315a2a9a6a2ae82c2cf46972c6ee0b316db48f8c5e0c537a579e3bd1a71b9f88d335af3ab3a0ad0de3ab9cf1248d096f6c9e3117117cd67b07884
-  data.tar.gz: 317d94877251e277060edff38deca49a17d6a727adc7848be6600793b70583ff57abe4ff1258746d90bd4135c6311b463db97d66e3a1d04cb74d739c0402387d
+  metadata.gz: c4d55875019e0c5e5906d05648b3e6f96ee2dd22a85f30a7827a244992b841b633561433a0b54aa52a6d4b49a540c976a3e5dce049edff292a135451fe1a0266
+  data.tar.gz: 98082ec475eec0c11a73c085c4112a7ef92a77c67d3e343c9e62768682ed090ad799c623ad894dac03218189cef6e41e6edd14f8b6f76e45639e1f5559143808

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/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
@@ -357,6 +357,7 @@ module Calabash module Android
 
         unless succeeded
           ::Cucumber.wants_to_quit = true
+          pn = package_name(app_path)
           raise "#{pn} did not get updated. Aborting!"
         end
       end
@@ -637,16 +638,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 +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}))
+
+        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.4.pre1"
+    VERSION = "0.8.0.pre1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.7.4.pre1
+  version: 0.8.0.pre1
 platform: ruby
 authors:
 - Jonas Maturana Larsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-13 00:00:00.000000000 Z
+date: 2016-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber