calabash-android 0.4.3.pre2 → 0.4.3.pre3

data/lib/calabash-android/operations.rb

@@ -72,7 +72,7 @@ module Operations
   end
 
   def start_test_server_in_background(options={})
-    default_device.start_test_server_in_background()
+    default_device.start_test_server_in_background(options)
   end
 
   def shutdown_test_server
@@ -319,12 +319,13 @@ module Operations
         wake_up
       end
 
-      puts "app_path: #{@app_path}"
-      env_options = {:target_package => options[:target_package] || package_name(@app_path),
-                     :main_activity => options[:main_activity] || main_activity(@app_path),
+      env_options = {:target_package => package_name(@app_path),
+                     :main_activity => main_activity(@app_path),
                      :test_server_port => @test_server_port,
-                     :debug => options[:debug] || false,
-                     :class => options[:class] || "sh.calaba.instrumentationbackend.InstrumentationBackend"}
+                     :debug => false,
+                     :class => "sh.calaba.instrumentationbackend.InstrumentationBackend"}
+
+      env_options = env_options.merge(options)
 
       cmd_arr = [adb_command, "shell am instrument"]
 

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.4.3.pre2"
+    VERSION = "0.4.3.pre3"
   end
 end

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/CalabashInstrumentationTestRunner.java

@@ -9,7 +9,7 @@ import sh.calaba.instrumentationbackend.actions.HttpServer;
 
 public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner {
 	@Override
-    public void onCreate(Bundle arguments) {		
+    public void onCreate(Bundle arguments) {
 		try {
 			Context context = getTargetContext ();
 			Class<?> c = Class.forName("mono.MonoPackageManager");
@@ -24,6 +24,7 @@ public class CalabashInstrumentationTestRunner extends InstrumentationTestRunner
         HttpServer.instantiate(Integer.parseInt(arguments.getString("test_server_port")));
 
         InstrumentationBackend.testPackage = arguments.getString("target_package");
+        InstrumentationBackend.extras = arguments;
 
         try {
             InstrumentationBackend.mainActivity = Class.forName(arguments.getString("main_activity"));

data/test-server/instrumentation-backend/src/sh/calaba/instrumentationbackend/InstrumentationBackend.java

@@ -1,5 +1,7 @@
 package sh.calaba.instrumentationbackend;
 
+import android.content.Intent;
+import android.os.Bundle;
 import sh.calaba.instrumentationbackend.actions.Actions;
 import sh.calaba.instrumentationbackend.actions.HttpServer;
 import android.Manifest;
@@ -17,6 +19,7 @@ import com.jayway.android.robotium.solo.SoloEnhanced;
 public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
     public static String testPackage;
     public static Class mainActivity;
+    public static Bundle extras;
     
     private static final String TAG = "InstrumentationBackend";
     
@@ -32,7 +35,10 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        
+        Intent i = new Intent();
+        i.setClassName(testPackage, mainActivity.getName());
+        i.putExtras(extras);
+        setActivityIntent(i);
         solo = new SoloEnhanced(getInstrumentation(), this.getActivity());
         viewFetcher = new PublicViewFetcher(getInstrumentation(), this.getActivity());
         actions = new Actions(getInstrumentation(), this);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.4.3.pre2
+  version: 0.4.3.pre3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-03 00:00:00.000000000 Z
+date: 2013-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber