commit 870cc6c4098cc771c5859b326216359c6cdbe661
author ivanhernandez <ivanhernandez@google.com> Thu Sep 13 13:00:42 2018 -0400
committer Jonathan Dierksen <dierksen@google.com> Thu Sep 13 17:50:33 2018 -0400
tree 420ca306fa59921575a1075e6d624e9e29a19e4d
parent c73a77dbc3abf5d77285e0014d5791e393e0d5cc

Misc changes.

PiperOrigin-RevId: 212830005

src/TulsiEndToEndTests/TulsiEndToEndTest.swift

diff --git a/src/TulsiEndToEndTests/TulsiEndToEndTest.swift b/src/TulsiEndToEndTests/TulsiEndToEndTest.swift
index c43091c..9d16587 100644
--- a/src/TulsiEndToEndTests/TulsiEndToEndTest.swift
+++ b/src/TulsiEndToEndTests/TulsiEndToEndTest.swift
@@ -104,6 +104,18 @@
 
     let filename = TulsiGeneratorConfig.sanitizeFilename("\(config).xcodeproj")
     let xcodeProjectURL = workspaceRootURL.appendingPathComponent(filename, isDirectory: true)
+
+    addTeardownBlock {
+      do {
+        if self.fileManager.fileExists(atPath: xcodeProjectURL.path) {
+          try self.fileManager.removeItem(at: xcodeProjectURL)
+          XCTAssertFalse(self.fileManager.fileExists(atPath: xcodeProjectURL.path))
+        }
+      } catch {
+          XCTFail("Error while deleting generated Xcode project: \(error)")
+      }
+    }
+
     return xcodeProjectURL
   }
 
@@ -141,6 +153,17 @@
     testXcodeProject(xcodeProjectURL, scheme: "ButtonsTests")
   }
 
+  func testButtonsWithCanaryBazel() throws {
+    if let canaryBazelURL = fakeBazelWorkspace.canaryBazelURL {
+      XCTAssert(fileManager.fileExists(atPath: canaryBazelURL.path), "Bazel canary is missing.")
+      bazelURL = canaryBazelURL
+      let buttonsProjectPath = "src/TulsiEndToEndTests/Resources/Buttons.tulsiproj"
+      let xcodeProjectURL = generateXcodeProject(tulsiProject: buttonsProjectPath,
+                                                 config: "Buttons")
+      testXcodeProject(xcodeProjectURL, scheme: "ButtonsTests")
+    }
+  }
+
   func testInvalidConfig() throws {
     let buttonsProjectPath = "src/TulsiEndToEndTests/Resources/Buttons.tulsiproj"
     let xcodeProjectURL = generateXcodeProject(tulsiProject: buttonsProjectPath,

src/TulsiGeneratorIntegrationTests/BazelFakeWorkspace.swift

diff --git a/src/TulsiGeneratorIntegrationTests/BazelFakeWorkspace.swift b/src/TulsiGeneratorIntegrationTests/BazelFakeWorkspace.swift
index 907b0bb..6b69e2b 100644
--- a/src/TulsiGeneratorIntegrationTests/BazelFakeWorkspace.swift
+++ b/src/TulsiGeneratorIntegrationTests/BazelFakeWorkspace.swift
@@ -23,6 +23,7 @@
   var fakeExecroot: URL
   var workspaceRootURL: URL
   var bazelURL: URL
+  var canaryBazelURL: URL?
   var pathsToCleanOnTeardown = Set<URL>()
 
   init(runfilesURL: URL, tempDirURL: URL) {