calabash-android 0.3.4 → 0.3.5

data/CHANGES.txt

@@ -1,3 +1,20 @@
+0.3.5:
+      No longer takes screenshots when perform_action fails.
+      If you want to take screenshots when a scenario fails you can use a hook:
+
+      After do |scenario|
+        if scenario.failed?
+          screenshot_embed
+        end
+      end
+
+      This hook is now part of the generated skeleton.
+
+      Upgraded to Robotium 3.6 to support api level 17.
+
+      Fixed mock location.
+
+
 0.3.4:
       Removed maps_unsupported
       The test will fail at run time if the device does not have

data/features-skeleton/support/app_life_cycle_hooks.rb

@@ -10,6 +10,12 @@ Before do |scenario|
   start_test_server_in_background
 end
 
+After do |scenario|
+  if scenario.failed?
+    screenshot_embed
+  end
+end
+
 After do
     shutdown_test_server
 end

data/lib/calabash-android/operations.rb

@@ -182,13 +182,9 @@ module Operations
         raise "Empty result from TestServer" if result.chomp.empty?
         result = JSON.parse(result)
         if not result["success"] then
-          @cucumber_world.screenshot_embed
-          if result["bonusInformation"] && result["bonusInformation"].size > 0 && result["bonusInformation"][0].include?("Exception")
-            log result["bonusInformation"][0]
-          end
           raise "Step unsuccessful: #{result["message"]}"
         end
-        return result
+        result
       end
     rescue Timeout::Error
       raise Exception, "Step timed out"
@@ -453,7 +449,7 @@ module Operations
   def backdoor(sel, arg)
     ni
   end
-  
+
   def map( query, method_name, *method_args )
     ni
   end

data/lib/calabash-android/version.rb

@@ -1,5 +1,5 @@
 module Calabash
   module Android
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
   end
 end

data/test-server/AndroidManifest.xml

@@ -18,5 +18,9 @@
     </application>
     <uses-sdk android:minSdkVersion="4" />
     <instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner" />
+
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
-</manifest> 
+
+</manifest>

data/test-server/instrumentation-backend/AndroidManifest.xml

@@ -14,9 +14,4 @@
     <instrumentation
         android:name="android.test.InstrumentationTestRunner"
         android:targetPackage="sh.calaba" />
-
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
-    <uses-permission android:name="android.permission.ACCESS_MOCK_LOCATION" />
-    <uses-permission android:name="android.permission.INTERNET" />
-
 </manifest>

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

@@ -1,5 +1,7 @@
 package sh.calaba.instrumentationbackend;
 
+import android.Manifest;
+import android.content.pm.PackageManager;
 import sh.calaba.instrumentationbackend.actions.Actions;
 import sh.calaba.instrumentationbackend.actions.HttpServer;
 import android.app.Activity;
@@ -71,11 +73,14 @@ public class InstrumentationBackend extends ActivityInstrumentationTestCase2 {
         Log.e(TAG, message);
     }
 
-    private static void removeTestLocationProviders(Activity activity) {
-        final LocationManager locationService =
-            (LocationManager) activity.getSystemService(Context.LOCATION_SERVICE);
-        for (final String provider : locationService.getAllProviders()) {
-            locationService.removeTestProvider(provider);
+    private void removeTestLocationProviders(Activity activity) {
+        int hasPermission = solo.getCurrentActivity().checkCallingOrSelfPermission(Manifest.permission.ACCESS_MOCK_LOCATION);
+
+        if (hasPermission == PackageManager.PERMISSION_GRANTED) {
+            LocationManager locationService = (LocationManager) activity.getSystemService(Context.LOCATION_SERVICE);
+            for (final String provider : locationService.getAllProviders()) {
+                locationService.removeTestProvider(provider);
+            }
         }
     }
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calabash-android
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-22 00:00:00.000000000 Z
+date: 2012-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
@@ -161,7 +161,7 @@ files:
 - test-server/instrumentation-backend/.settings/org.eclipse.jdt.core.prefs
 - test-server/instrumentation-backend/AndroidManifest.xml
 - test-server/instrumentation-backend/assets/foo.bar
-- test-server/instrumentation-backend/libs/robotium-solo-3.3.jar
+- test-server/instrumentation-backend/libs/robotium-solo-3.6.jar
 - test-server/instrumentation-backend/project.properties
 - test-server/instrumentation-backend/res/drawable-hdpi/ic_launcher.png
 - test-server/instrumentation-backend/res/drawable-ldpi/ic_launcher.png