calabash-android 0.9.11 → 0.9.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/calabash-android/java_keystore.rb +4 -0
- data/lib/calabash-android/lib/AndroidManifest.xml +4 -3
- data/lib/calabash-android/lib/TestServer.apk +0 -0
- data/lib/calabash-android/operations.rb +14 -4
- data/lib/calabash-android/version.rb +1 -1
- data/lib/calabash-android/wait_helpers.rb +6 -1
- metadata +14 -20
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: cfafc1eb5044956ece10d8e1468e85a130daf89380d9b68edf42f49387088c82
|
4
|
+
data.tar.gz: cad92da7e126eac1370da80bea4cee54ded121089e04f0b240d70fd676c18dad
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 53c0b13682ad40bdb4afbddf13aec45ecc77579379d5b4f1a2dff942cdcaea83f7f2d6455c85f059ddb8490027f798efe293fe8e99cc237971ce38acbbeb0343
|
7
|
+
data.tar.gz: f58d9dc2407dc90df102a6a17744685e8f216d44f9cdbfcc6d1268ab2070e2a2a7d32622a79be7a0f6c7cd356c18ac32f58bc7b1934e9d2dc3a87ce082d2cc40
|
@@ -51,6 +51,10 @@ class JavaKeystore
|
|
51
51
|
|
52
52
|
# E.g. MD5withRSA or MD5withRSAandMGF1
|
53
53
|
encryption = signature_algorithm_name.split('with')[1].split('and')[0]
|
54
|
+
|
55
|
+
# keytool with newer java versions has "Signature algorithm name: SHA1withRSA (weak)"
|
56
|
+
encryption.gsub!(' (weak)', '')
|
57
|
+
|
54
58
|
signing_algorithm = "SHA1with#{encryption}"
|
55
59
|
digest_algorithm = 'SHA1'
|
56
60
|
|
@@ -2,10 +2,10 @@
|
|
2
2
|
|
3
3
|
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
|
4
4
|
package="#testPackage#"
|
5
|
-
android:versionCode="
|
6
|
-
android:versionName="0.9.
|
5
|
+
android:versionCode="15"
|
6
|
+
android:versionName="0.9.15">
|
7
7
|
|
8
|
-
<uses-sdk android:minSdkVersion="
|
8
|
+
<uses-sdk android:minSdkVersion="18" android:targetSdkVersion="28" />
|
9
9
|
|
10
10
|
<application android:label="instrumentation_backend"
|
11
11
|
android:largeHeap="true"
|
@@ -44,6 +44,7 @@
|
|
44
44
|
<instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner" />
|
45
45
|
<instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearAppData" />
|
46
46
|
<instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearAppData2" />
|
47
|
+
<instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearAppData3" />
|
47
48
|
<instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.ClearPreferences" />
|
48
49
|
<instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.SetPreferences" />
|
49
50
|
<instrumentation android:targetPackage="#targetPackage#" android:name="sh.calaba.instrumentationbackend.GetPreferences" />
|
Binary file
|
@@ -733,11 +733,17 @@ module Calabash module Android
|
|
733
733
|
|
734
734
|
cmd_arr << "#{package_name(@test_server_path)}/sh.calaba.instrumentationbackend.CalabashInstrumentationTestRunner"
|
735
735
|
|
736
|
-
|
736
|
+
if options[:with_uiautomator]
|
737
|
+
cmd_arr.insert(2, "-w")
|
738
|
+
shutdown_test_server
|
739
|
+
@adb_shell_pid = Process.spawn(cmd_arr.join(" "), :in => '/dev/null') rescue "Could not execute command to start test server with uiautomator"
|
740
|
+
else
|
741
|
+
cmd = cmd_arr.join(" ")
|
737
742
|
|
738
|
-
|
739
|
-
|
740
|
-
|
743
|
+
log "Starting test server using:"
|
744
|
+
log cmd
|
745
|
+
raise "Could not execute command to start test server" unless system("#{cmd} 2>&1")
|
746
|
+
end
|
741
747
|
|
742
748
|
Calabash::Android::Retry.retry :tries => 600, :interval => 0.1 do
|
743
749
|
raise "App did not start see adb logcat for details" unless app_running?
|
@@ -832,6 +838,10 @@ Run 'reinstall_test_server' to make sure you have the correct version
|
|
832
838
|
|
833
839
|
def shutdown_test_server
|
834
840
|
begin
|
841
|
+
unless @adb_shell_pid.nil?
|
842
|
+
Process.kill("HUP",@adb_shell_pid)
|
843
|
+
@adb_shell_pid = nil
|
844
|
+
end
|
835
845
|
http("/kill")
|
836
846
|
Timeout::timeout(3) do
|
837
847
|
sleep 0.3 while app_running?
|
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.9.
|
4
|
+
version: 0.9.18
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Jonas Maturana Larsen
|
8
|
-
autorequire:
|
8
|
+
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date:
|
11
|
+
date: 2021-05-06 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: json
|
@@ -56,22 +56,16 @@ dependencies:
|
|
56
56
|
name: rubyzip
|
57
57
|
requirement: !ruby/object:Gem::Requirement
|
58
58
|
requirements:
|
59
|
-
- -
|
60
|
-
- !ruby/object:Gem::Version
|
61
|
-
version: 1.2.2
|
62
|
-
- - "<"
|
59
|
+
- - '='
|
63
60
|
- !ruby/object:Gem::Version
|
64
|
-
version:
|
61
|
+
version: 1.3.0
|
65
62
|
type: :runtime
|
66
63
|
prerelease: false
|
67
64
|
version_requirements: !ruby/object:Gem::Requirement
|
68
65
|
requirements:
|
69
|
-
- -
|
70
|
-
- !ruby/object:Gem::Version
|
71
|
-
version: 1.2.2
|
72
|
-
- - "<"
|
66
|
+
- - '='
|
73
67
|
- !ruby/object:Gem::Version
|
74
|
-
version:
|
68
|
+
version: 1.3.0
|
75
69
|
- !ruby/object:Gem::Dependency
|
76
70
|
name: awesome_print
|
77
71
|
requirement: !ruby/object:Gem::Requirement
|
@@ -124,16 +118,16 @@ dependencies:
|
|
124
118
|
name: rake
|
125
119
|
requirement: !ruby/object:Gem::Requirement
|
126
120
|
requirements:
|
127
|
-
- -
|
121
|
+
- - '='
|
128
122
|
- !ruby/object:Gem::Version
|
129
|
-
version:
|
123
|
+
version: 13.0.3
|
130
124
|
type: :development
|
131
125
|
prerelease: false
|
132
126
|
version_requirements: !ruby/object:Gem::Requirement
|
133
127
|
requirements:
|
134
|
-
- -
|
128
|
+
- - '='
|
135
129
|
- !ruby/object:Gem::Version
|
136
|
-
version:
|
130
|
+
version: 13.0.3
|
137
131
|
- !ruby/object:Gem::Dependency
|
138
132
|
name: yard
|
139
133
|
requirement: !ruby/object:Gem::Requirement
|
@@ -372,7 +366,7 @@ homepage: http://github.com/calabash
|
|
372
366
|
licenses:
|
373
367
|
- EPL-1.0
|
374
368
|
metadata: {}
|
375
|
-
post_install_message:
|
369
|
+
post_install_message:
|
376
370
|
rdoc_options: []
|
377
371
|
require_paths:
|
378
372
|
- lib
|
@@ -387,8 +381,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
387
381
|
- !ruby/object:Gem::Version
|
388
382
|
version: '0'
|
389
383
|
requirements: []
|
390
|
-
rubygems_version: 3.
|
391
|
-
signing_key:
|
384
|
+
rubygems_version: 3.1.4
|
385
|
+
signing_key:
|
392
386
|
specification_version: 4
|
393
387
|
summary: Client for calabash-android for automated functional testing on Android
|
394
388
|
test_files: []
|