zip test app (#152)

Author: KazuCocoa

lib/appium_lib_core/common/base/bridge.rb

@@ -57,7 +57,7 @@ def self.handshake(**opts)
         #     caps: {
         #       platformName: :ios,
         #       automationName: 'XCUITest',
-        #       app: 'test/functional/app/UICatalog.app',
+        #       app: 'test/functional/app/UICatalog.app.zip',
         #       platformVersion: '11.4',
         #       deviceName: 'iPhone Simulator',
         #       useNewWDA: true,
@@ -76,7 +76,7 @@ def self.handshake(**opts)
         #     caps: {
         #       platformName: :ios,
         #       automationName: 'XCUITest',
-        #       app: 'test/functional/app/UICatalog.app',
+        #       app: 'test/functional/app/UICatalog.app.zip',
         #       platformVersion: '11.4',
         #       deviceName: 'iPhone Simulator',
         #       useNewWDA: true,

lib/appium_lib_core/common/base/driver.rb

@@ -747,7 +747,7 @@ def get_timeouts
         #   #      "desired"=>
         #   #          {"platformName"=>"android",
         #   #           "automationName"=>"uiautomator2",
-        #   #           "app"=>"/path/to/app/api.apk",
+        #   #           "app"=>"/path/to/app/api.apk.zip",
         #   #           "platformVersion"=>"8.1.0",
         #   #           "deviceName"=>"Android Emulator",
         #   #           "appPackage"=>"io.appium.android.apis",
@@ -756,7 +756,7 @@ def get_timeouts
         #   #           "unicodeKeyboard"=>true,
         #   #           "resetKeyboard"=>true},
         #   #      "automationName"=>"uiautomator2",
-        #   #      "app"=>"/path/to/app/api.apk",
+        #   #      "app"=>"/path/to/app/api.apk.zip",
         #   #      "platformVersion"=>"8.1.0",
         #   #      "deviceName"=>"emulator-5554",
         #   #      "appPackage"=>"io.appium.android.apis",

test/functional/app/UICatalog.app.zip

@@ -55,7 +55,7 @@ def ios
         caps: {
           platformName: :ios,
           automationName: 'XCUITest',
-          app: 'test/functional/app/UICatalog.app',
+          app: 'test/functional/app/UICatalog.app.zip',
           platformVersion: '11.4',
           deviceName: device_name,
           useNewWDA: true,
@@ -84,7 +84,7 @@ def android
           # chromeOptions: {androidPackage: 'com.android.chrome'},
           platformName: :android,
           automationName: 'uiautomator2',
-          app: 'test/functional/app/api.apk',
+          app: 'test/functional/app/api.apk.zip',
           platformVersion: '8.1',
           deviceName: 'Android Emulator',
           appPackage: 'io.appium.android.apis',
@@ -186,7 +186,7 @@ def android_mock_create_session_w3c
           capabilities: {
             platformName: :android,
             automationName: 'uiautomator2',
-            app: 'test/functional/app/api.apk',
+            app: 'test/functional/app/api.apk.zip',
             platformVersion: '7.1.1',
             deviceName: 'Android Emulator',
             appPackage: 'io.appium.android.apis',

test/functional/app/UICatalog.app/12-6AM.png

@@ -20,7 +20,7 @@ def test_no_session_id
                 capabilities: {
                   platformName: :android,
                   automationName: 'uiautomator2',
-                  app: 'test/functional/app/api.apk',
+                  app: 'test/functional/app/api.apk.zip',
                   platformVersion: '7.1.1',
                   deviceName: 'Android Emulator',
                   appPackage: 'io.appium.android.apis',

test/functional/app/UICatalog.app/12-6PM.png

@@ -16,7 +16,7 @@ def setup
         capabilities: {
           platformName: :android,
           automationName: 'uiautomator2',
-          app: 'test/functional/app/api.apk',
+          app: 'test/functional/app/api.apk.zip',
           platformVersion: '7.1.1',
           deviceName: 'Android Emulator',
           appPackage: 'io.appium.android.apis'
@@ -26,7 +26,7 @@ def setup
       CAPS = {
         platformName: :android,
         automationName: 'uiautomator2',
-        app: "#{Dir.pwd}/test/functional/app/api.apk",
+        app: "#{Dir.pwd}/test/functional/app/api.apk.zip",
         platformVersion: '7.1.1',
         deviceName: 'Android Emulator',
         appPackage: 'io.appium.android.apis'
@@ -35,7 +35,7 @@ def setup
       APPIUM_PREFIX_CAPS = {
         platformName: :android,
         'appium:automationName' => 'uiautomator2',
-        'appium:app' => "#{Dir.pwd}/test/functional/app/api.apk",
+        'appium:app' => "#{Dir.pwd}/test/functional/app/api.apk.zip",
         'appium:platformVersion' => '7.1.1',
         'appium:deviceName' => 'Android Emulator',
         'appium:appPackage' => 'io.appium.android.apis'
@@ -89,7 +89,7 @@ def test_create_session_force_mjsonwp_with_source_package
             capabilities: {
               platformName: :android,
               automationName: 'uiautomator2',
-              app: 'sauce-storage:test/functional/app/api.apk',
+              app: 'sauce-storage:test/functional/app/api.apk.zip',
               platformVersion: '7.1.1',
               deviceName: 'Android Emulator',
               appPackage: 'io.appium.android.apis'
@@ -99,7 +99,7 @@ def test_create_session_force_mjsonwp_with_source_package
         http_caps = {
           platformName: :android,
           automationName: 'uiautomator2',
-          app: 'sauce-storage:test/functional/app/api.apk',
+          app: 'sauce-storage:test/functional/app/api.apk.zip',
           platformVersion: '7.1.1',
           deviceName: 'Android Emulator',
           appPackage: 'io.appium.android.apis'
@@ -119,7 +119,7 @@ def test_create_session_force_mjsonwp_with_source_package
         assert_requested(:post, 'http://127.0.0.1:4723/wd/hub/session', times: 1)
         assert_requested(:post, "#{Mock::SESSION}/timeouts/implicit_wait", body: { ms: 20_000 }.to_json, times: 1)
 
-        assert_equal 'sauce-storage:test/functional/app/api.apk', core.caps[:app]
+        assert_equal 'sauce-storage:test/functional/app/api.apk.zip', core.caps[:app]
       end
 
       def test_create_session_w3c
@@ -195,7 +195,7 @@ def test_add_appium_prefix_compatible_with_oss
         cap = {
           platformName: :ios,
           automationName: 'XCUITest',
-          app: 'test/functional/app/UICatalog.app',
+          app: 'test/functional/app/UICatalog.app.zip',
           platformVersion: '11.4',
           deviceName: 'iPhone Simulator',
           useNewWDA: true,
@@ -209,7 +209,7 @@ def test_add_appium_prefix_compatible_with_oss
           proxy: nil,
           platformName: :ios,
           'appium:automationName' => 'XCUITest',
-          'appium:app' => 'test/functional/app/UICatalog.app',
+          'appium:app' => 'test/functional/app/UICatalog.app.zip',
           'appium:platformVersion' => '11.4',
           'appium:deviceName' => 'iPhone Simulator',
           'appium:useNewWDA' => true,
@@ -225,7 +225,7 @@ def test_add_appium_prefix_already_have_appium_prefix
         cap = {
           platformName: :ios,
           automationName: 'XCUITest',
-          'appium:app' => 'test/functional/app/UICatalog.app',
+          'appium:app' => 'test/functional/app/UICatalog.app.zip',
           platformVersion: '11.4',
           deviceName: 'iPhone Simulator',
           useNewWDA: true,
@@ -238,7 +238,7 @@ def test_add_appium_prefix_already_have_appium_prefix
           proxy: nil,
           platformName: :ios,
           'appium:automationName' => 'XCUITest',
-          'appium:app' => 'test/functional/app/UICatalog.app',
+          'appium:app' => 'test/functional/app/UICatalog.app.zip',
           'appium:platformVersion' => '11.4',
           'appium:deviceName' => 'iPhone Simulator',
           'appium:useNewWDA' => true,

test/functional/app/UICatalog.app/6-12AM.png

@@ -48,22 +48,22 @@ def test_verify_appium_core_base_capabilities_create_capabilities
                                                                     platformVersion: '11.4',
                                                                     automationName:  'XCUITest',
                                                                     deviceName:      'iPhone Simulator',
-                                                                    app:             'test/functional/app/UICatalog.app',
+                                                                    app:             'test/functional/app/UICatalog.app.zip',
                                                                     some_capability1: 'some_capability1',
                                                                     someCapability2: 'someCapability2')
 
       caps_with_json = JSON.parse(caps.to_json)
       assert_equal 'ios', caps_with_json['platformName']
       assert_equal '11.4', caps_with_json['platformVersion']
-      assert_equal 'test/functional/app/UICatalog.app', caps_with_json['app']
+      assert_equal 'test/functional/app/UICatalog.app.zip', caps_with_json['app']
       assert_equal 'XCUITest', caps_with_json['automationName']
       assert_equal 'iPhone Simulator', caps_with_json['deviceName']
       assert_equal 'some_capability1', caps_with_json['someCapability1']
       assert_equal 'someCapability2', caps_with_json['someCapability2']
 
       assert_equal 'ios', caps[:platformName]
       assert_equal '11.4', caps[:platformVersion]
-      assert_equal 'test/functional/app/UICatalog.app', caps[:app]
+      assert_equal 'test/functional/app/UICatalog.app.zip', caps[:app]
       assert_equal 'XCUITest', caps[:automationName]
       assert_equal 'iPhone Simulator', caps[:deviceName]
       assert_equal 'some_capability1', caps[:some_capability1]