calabash-android 0.8.1 → 0.8.2

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9ec647f9c577d97b9a1432d89d51fed63406de7d
4
- data.tar.gz: 032a9fd2df25729235077f01c728d1745fd8eddf
3
+ metadata.gz: aa3663285a474865b4f6a21abb902e14bdeb3d5b
4
+ data.tar.gz: faa0ec4e08a8eaf54c938d2f027907d68f2e5e22
5
5
  SHA512:
6
- metadata.gz: 033eb8012e03ee8d32d7672c94cf9095d19044ea94dee803975343e4c1822398db1705ec50ab8230c88fdd86bcf04f58d4ba14e1048994bad0542992364aecef
7
- data.tar.gz: d2d2739435aa413485e3c2f93d06a9945636e24c15bd46c85b60cba5a65c6c41e400c1a1decdc7f7d6d490380babbc96ac75ed3b982fea7ac847aa48dd8c1d0a
6
+ metadata.gz: 1039f2886af768ea0b55bc33e5d1fdd3783ca240877b372d87cfdf6e3c83e1409d735aecba923f532755af303c3027e07ed75f0be07996957f17f0f6859e3f56
7
+ data.tar.gz: f84eba70004f291a111f985e8322d1204a8f9831723c24d3cab357787aa86804e05fd2d7314aa646ff56f828460b705c527abf5175aa8a4ed29c580087b1eaa5
@@ -398,7 +398,12 @@ module Calabash
398
398
  if File.exist?('~/Library/Developer/Xamarin/android-sdk-macosx/')
399
399
  return '~/Library/Developer/Xamarin/android-sdk-macosx/'
400
400
  end
401
-
401
+
402
+ # Default location when installing with Android Studio
403
+ if File.exist?('~/Library/Android/sdk/')
404
+ return '~/Library/Android/sdk/'
405
+ end
406
+
402
407
  if File.exist?('C:\\Android\\android-sdk')
403
408
  return 'C:\\Android\\android-sdk'
404
409
  end
@@ -749,7 +749,11 @@ module Calabash module Android
749
749
  end
750
750
 
751
751
  def start_application(intent)
752
- result = JSON.parse(http("/start-application", {intent: intent}))
752
+ begin
753
+ result = JSON.parse(http("/start-application", {intent: intent}, {read_timeout: 60}))
754
+ rescue HTTPClient::ReceiveTimeoutError => e
755
+ raise "Failed to start application. Starting took more than 60 seconds: #{e.class} - #{e.message}"
756
+ end
753
757
 
754
758
  if result['outcome'] != 'SUCCESS'
755
759
  raise result['detail']
@@ -1,5 +1,5 @@
1
1
  module Calabash
2
2
  module Android
3
- VERSION = "0.8.1"
3
+ VERSION = "0.8.2"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: calabash-android
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.1
4
+ version: 0.8.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Jonas Maturana Larsen
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-08-29 00:00:00.000000000 Z
11
+ date: 2016-09-15 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cucumber