commit 94eca3ced8dd34ffa81e7db46586a654b1a8550a
author ivanhernandez <ivanhernandez@google.com> Fri Apr 12 10:31:15 2019 -0400
committer David Goldman <davg@google.com> Fri Apr 12 11:21:28 2019 -0400
tree 5d1eab38c40fac61b85f84b07c46262c0aa23721
parent ba3e83e15d89fc2e519a852e40e032d26194ff95

Fix typos and explicitly define the OS version to target with xcodebuild. Otherwise the latest version is always targeted which is dependent on which Xcode version is selected.

PiperOrigin-RevId: 243260627

src/TulsiEndToEndTests/TulsiEndToEndTest.swift

diff --git a/src/TulsiEndToEndTests/TulsiEndToEndTest.swift b/src/TulsiEndToEndTests/TulsiEndToEndTest.swift
index 1c163c9..1def283 100644
--- a/src/TulsiEndToEndTests/TulsiEndToEndTest.swift
+++ b/src/TulsiEndToEndTests/TulsiEndToEndTest.swift
@@ -22,6 +22,7 @@
 // generated xcodeproj by running the projects unit tests.
 class TulsiEndToEndTest: BazelIntegrationTestCase {
   fileprivate static let simulatorName = "tulsie2e-\(UUID().uuidString.prefix(8))"
+  fileprivate static let targetVersion = "12.1"
 
   let fileManager = FileManager.default
   var runfilesWorkspaceURL: URL! = nil
@@ -31,9 +32,8 @@
     super.setUp()
 
     let targetDevice = "iPhone XS"
-    let targetVersion = "12.1"
     let deviceName = targetDevice.replacingOccurrences(of: " ", with: "-")
-    let deviceVersion = targetVersion.replacingOccurrences(of: ".", with: "-")
+    let deviceVersion = TulsiEndToEndTest.targetVersion.replacingOccurrences(of: ".", with: "-")
     let typeId = "com.apple.CoreSimulator.SimDeviceType.\(deviceName)"
     let runtimeId = "com.apple.CoreSimulator.SimRuntime.iOS-\(deviceVersion)"
     let completionInfo = ProcessRunner.launchProcessSync("/usr/bin/xcrun",
@@ -51,7 +51,7 @@
       }
     }
 
-    // 'simctl' should output the UUID of the new simulator if it was created succesfully.
+    // 'simctl' should output the UUID of the new simulator if it was created successfully.
     if let stdout = String(data: completionInfo.stdout, encoding: .utf8), stdout.isEmpty {
       XCTFail("No UUID was ouputted for newly created simulator.")
     }
@@ -177,7 +177,7 @@
 
   // Runs Xcode tests on the given Xcode project and scheme.
   func testXcodeProject(_ xcodeProjectURL: URL, scheme: String) {
-    let destination = "platform=iOS Simulator,name=\(TulsiEndToEndTest.simulatorName)"
+    let destination = "platform=iOS Simulator,name=\(TulsiEndToEndTest.simulatorName),OS=\(TulsiEndToEndTest.targetVersion)"
     let completionInfo = ProcessRunner.launchProcessSync("/usr/bin/xcodebuild",
                                                          arguments: ["test",
                                                                      "-project",
@@ -191,7 +191,7 @@
       let result = stdoutput.split(separator: "\n").last {
       if (String(result) != "** TEST SUCCEEDED **") {
         print(stdoutput)
-        XCTFail("\(completionInfo.commandlineString) did not return test sucess. Exit code: \(completionInfo.terminationStatus)")
+        XCTFail("\(completionInfo.commandlineString) did not return test success. Exit code: \(completionInfo.terminationStatus)")
       }
     } else if let error = String(data: completionInfo.stderr, encoding: .utf8), !error.isEmpty {
       XCTFail(error)