From 9a7a596701699dd93d130cbe31d49ff528820151 Mon Sep 17 00:00:00 2001
From: Alex Plischke <alex.plischke@saucelabs.com>
Date: Thu, 23 Jan 2025 12:21:58 -0800
Subject: [PATCH] remove xctest simulators from schema

---
 api/saucectl.schema.json                 | 34 ------------------------
 api/v1alpha/framework/xctest.schema.json | 34 ------------------------
 internal/cmd/ini/initializer.go          |  6 ++++-
 3 files changed, 5 insertions(+), 69 deletions(-)

diff --git a/api/saucectl.schema.json b/api/saucectl.schema.json
index 46a6ecd75..c01ae450c 100644
--- a/api/saucectl.schema.json
+++ b/api/saucectl.schema.json
@@ -2529,35 +2529,6 @@
                     }
                   }
                 },
-                "simulators": {
-                  "description": "Defines details for running this suite on virtual devices using a simulator.",
-                  "type": "array",
-                  "items": {
-                    "properties": {
-                      "name": {
-                        "description": "The name of the simulator. To ensure name accuracy, check the list of supported virtual devices (https://app.saucelabs.com/live/web-testing/virtual).",
-                        "type": "string"
-                      },
-                      "orientation": {
-                        "$ref": "#/allOf/1/then/properties/suites/items/properties/emulators/items/properties/orientation"
-                      },
-                      "platformVersions": {
-                        "description": "The set of one or more versions of the device platform on which to run the test suite.",
-                        "type": "array",
-                        "minItems": 1
-                      },
-                      "armRequired": {
-                        "description": "If set to true, the simulator will run on an ARM-based Mac. If set to false, the simulator will run on an Intel-based Mac.",
-                        "type": "boolean"
-                      }
-                    },
-                    "required": [
-                      "name",
-                      "platformVersions"
-                    ],
-                    "additionalProperties": false
-                  }
-                },
                 "devices": {
                   "description": "Define details for running this suite on real devices.",
                   "type": "array",
@@ -2645,11 +2616,6 @@
                 }
               },
               "anyOf": [
-                {
-                  "required": [
-                    "simulators"
-                  ]
-                },
                 {
                   "required": [
                     "devices"
diff --git a/api/v1alpha/framework/xctest.schema.json b/api/v1alpha/framework/xctest.schema.json
index 80fda018f..402149339 100644
--- a/api/v1alpha/framework/xctest.schema.json
+++ b/api/v1alpha/framework/xctest.schema.json
@@ -182,35 +182,6 @@
               }
             }
           },
-          "simulators": {
-            "description": "Defines details for running this suite on virtual devices using a simulator.",
-            "type": "array",
-            "items": {
-              "properties": {
-                "name": {
-                  "description": "The name of the simulator. To ensure name accuracy, check the list of supported virtual devices (https://app.saucelabs.com/live/web-testing/virtual).",
-                  "type": "string"
-                },
-                "orientation": {
-                  "$ref": "../subschema/common.schema.json#/definitions/orientation"
-                },
-                "platformVersions": {
-                  "description": "The set of one or more versions of the device platform on which to run the test suite.",
-                  "type": "array",
-                  "minItems": 1
-                },
-                "armRequired": {
-                  "description": "If set to true, the simulator will run on an ARM-based Mac. If set to false, the simulator will run on an Intel-based Mac.",
-                  "type": "boolean"
-                }
-              },
-              "required": [
-                "name",
-                "platformVersions"
-              ],
-              "additionalProperties": false
-            }
-          },
           "devices": {
             "description": "Define details for running this suite on real devices.",
             "type": "array",
@@ -298,11 +269,6 @@
           }
         },
         "anyOf": [
-          {
-            "required": [
-              "simulators"
-            ]
-          },
           {
             "required": [
               "devices"
diff --git a/internal/cmd/ini/initializer.go b/internal/cmd/ini/initializer.go
index 31ce49208..b86359f54 100644
--- a/internal/cmd/ini/initializer.go
+++ b/internal/cmd/ini/initializer.go
@@ -1033,7 +1033,11 @@ func (ini *initializer) initializeBatchXctest(f *pflag.FlagSet) []error {
 		}
 	}
 	validAppExt := []string{".app"}
-	validAppExt = append(validAppExt, ".ipa")
+	if f.Changed("simulator") {
+		validAppExt = append(validAppExt, ".zip")
+	} else {
+		validAppExt = append(validAppExt, ".ipa")
+	}
 	if ini.cfg.app != "" {
 		verifier := extValidator(validAppExt)
 		if err = verifier(ini.cfg.app); err != nil {