Fix issue where only major OS version is supplied

index.test.js

@@ -1,5 +1,7 @@
 const simctl = require('./simctl');
 const Destination = require('./destination');
+const Runtime = require('./runtime');
+const Simulator = require('./simulator');
 const process = require('process');
 const cp = require('child_process');
 const path = require('path');
@@ -32,3 +34,51 @@ test('specifier with full platform matches runtime and version', () => {
   expect(destination.matchesRuntime('com.apple.CoreSimulator.SimRuntime.iOS-12-2')).toEqual(false);
   expect(destination.matchesRuntime('com.apple.CoreSimulator.SimRuntime.iOS-13-4')).toEqual(true);
 });
+
+test('simulator matches name only', () => {
+  const runtime = new Runtime("com.apple.CoreSimulator.SimRuntime.iOS-16-0");
+  const simulator = new Simulator({
+    udid: "82B24D01-FFB0-4394-9FEE-8AE4D15011D0",
+    isAvailable: true,
+    state: "Shutdown",
+    name: "iPhone 12"
+  }, runtime);
+
+  expect(simulator.matchesInputs("", "iPhone 12", "")).toEqual(true);
+});
+
+test('simulator matches full action input set', () => {
+  const runtime = new Runtime("com.apple.CoreSimulator.SimRuntime.iOS-16-0");
+  const simulator = new Simulator({
+    udid: "82B24D01-FFB0-4394-9FEE-8AE4D15011D0",
+    isAvailable: true,
+    state: "Shutdown",
+    name: "iPhone 12"
+  }, runtime);
+
+  expect(simulator.matchesInputs("iOS", "iPhone 12", "16.0")).toEqual(true);
+});
+
+test('simulator matches full action input set without minor OS version', () => {
+  const runtime = new Runtime("com.apple.CoreSimulator.SimRuntime.iOS-16-0");
+  const simulator = new Simulator({
+    udid: "82B24D01-FFB0-4394-9FEE-8AE4D15011D0",
+    isAvailable: true,
+    state: "Shutdown",
+    name: "iPhone 12"
+  }, runtime);
+
+  expect(simulator.matchesInputs("iOS", "iPhone 12", "16")).toEqual(true);
+});
+
+test('simulator doesn\'t match full action input set with differing OS version', () => {
+  const runtime = new Runtime("com.apple.CoreSimulator.SimRuntime.iOS-16-0");
+  const simulator = new Simulator({
+    udid: "82B24D01-FFB0-4394-9FEE-8AE4D15011D0",
+    isAvailable: true,
+    state: "Shutdown",
+    name: "iPhone 12"
+  }, runtime);
+
+  expect(simulator.matchesInputs("iOS", "iPhone 12", "16.2")).toEqual(false);
+});

package.json

@@ -25,7 +25,8 @@
   "homepage": "https://github.com/actions/javascript-action#readme",
   "dependencies": {
     "@actions/core": "^1.10.0",
-    "@actions/exec": "^1.1.1"
+    "@actions/exec": "^1.1.1",
+    "semver": "^7.3.8"
   },
   "devDependencies": {
     "@vercel/ncc": "^0.31.1",

simctl.js

@@ -41,19 +41,7 @@ exports.listSimulators = async() => {
 exports.findMatchingSimulator = async(platform, name, os) => {
   const simulators = await exports.listSimulators();
   const matchingSimulators = simulators.filter(simulator => {
-    if (simulator.name != name) {
-      return false;
-    }
-
-    if (platform.length > 0 && simulator.runtime.platform != platform) {
-      return false;
-    }
-
-    if (os.length > 0 && simulator.runtime.os != os) {
-      return false;
-    }
-
-    return true;
+    return simulator.matchesInputs(platform, name, os);
   })
   .sort((a, b) => {
     if (a.runtime.os > b.runtime.os) {