lib/calabash-android/operations.rb in calabash-android-0.2.3 vs lib/calabash-android/operations.rb in calabash-android-0.2.4

@@ -169,10 +169,13 @@
         log "Result:'" + result.strip + "'"
         raise "Empty result from TestServer" if result.chomp.empty?
         result = JSON.parse(result)
         if not result["success"] then
           take_screenshot
-          raise result["message"].to_s
+          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
       end
     rescue Timeout::Error
       raise Exception, "Step timed out"