Merge branch 'release/0.2.6'

Author: JavonDavis

.gitignore

@@ -456,4 +456,10 @@ tmp/
 
 .vscode/
 
-*.sh
+*.sh
+
+apps
+
+*.apk
+*.app
+*.zip

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    parallel_appium (0.2.3)
+    parallel_appium (0.2.5)
 
 GEM
   remote: https://rubygems.org/

build.sh

@@ -30,13 +30,9 @@ def load_capabilities(caps)
         caps[:caps][:platformVersion] = device.fetch('os', caps[:caps][:platformVersion])
         caps[:caps][:deviceName] = device.fetch('name', caps[:caps][:deviceName])
         caps[:caps][:wdaLocalPort] = device.fetch('wdaPort', nil)
+        caps[:caps][:avd] = device.fetch('avd', nil)
       end
 
-      caps[:caps][:sessionOverride] = true
-      caps[:caps][:useNewWDA] = true
-      # TODO: Optionally set these capabilities below
-      caps[:caps][:noReset] = true
-      caps[:caps][:fullReset] = false
       caps[:appium_lib][:server_url] = ENV['SERVER_URL']
       caps
     end

lib/parallel_appium.rb

@@ -6,8 +6,10 @@ def start_emulators
       emulators = `emulator -list-avds`.split("\n")
       emulators = emulators[0, ENV['THREADS'].to_i]
       Parallel.map(emulators, in_threads: emulators.size) do |emulator|
-        spawn("emulator -avd #{emulator} -scale 100dpi -no-boot-anim -no-audio -accel on &", out: '/dev/null')
+        spawn("emulator -avd #{emulator} -no-snapshot-load -scale 100dpi -no-boot-anim -no-audio -accel on &", out: '/dev/null')
       end
+
+      emulators
     end
 
     # Get additional information for the Android device with unique identifier udid
@@ -23,9 +25,9 @@ def get_android_device_data(udid)
 
     # Devices after cleanup and supplemental data included
     def devices
-      start_emulators
+      emulators = start_emulators
       sleep 10
-      devices = `adb devices`.split("\n").select { |x| x.include? "\tdevice" }.map.each_with_index { |d, i| {platform: 'android', name: 'android', udid: d.split("\t")[0], wdaPort: 8100 + i, thread: i + 1} }
+      devices = `adb devices`.split("\n").select { |x| x.include? "\tdevice" }.map.each_with_index { |d, i| {avd: emulators[i], platform: 'android', name: 'android', udid: d.split("\t")[0], wdaPort: 8100 + i, thread: i + 1} }
       devices = devices.map { |x| x.merge(get_android_device_data(x[:udid])) }
 
       ENV['DEVICES'] = JSON.generate(devices)

lib/parallel_appium/android.rb

@@ -1,3 +1,3 @@
 module ParallelAppium
-  VERSION = '0.2.4'.freeze
+  VERSION = '0.2.6'.freeze
 end