Merge sk-fix into master

EndToEndTests/EndToEndTests.swift

@@ -159,11 +159,10 @@ class EndToEndTests: MockGeneratorBaseTestCase {
         assertMockGeneratesExpected("AugmentedClassSubscriptMock")
     }
 
-    func test_returnsErrorWhenSDKPathDoesNotExist() {
+    func test_returnsErrorWhenProjectURLDoesNotExist() {
         let preferences = Preferences()
-        let moduleCachePath = preferences.moduleCachePath
-        preferences.moduleCachePath = "/path/to/nowhere"
-        assertMockGeneratesError(fileName: "SimpleProtocolMock", "The module cache path does not exist. Change it in the companion app.")
-        preferences.moduleCachePath = moduleCachePath
+        preferences.automaticallyDetectProjectPath = false
+        preferences.projectPath = URL(fileURLWithPath: "/not/project")
+        assertMockGeneratesError(fileName: "SimpleProtocolMock", "The project path '/not/project' does not exist. Change it in the companion app.")
     }
 }

EndToEndTests/MockGeneratorBaseTestCase.swift

@@ -11,7 +11,6 @@ class MockGeneratorBaseTestCase: XCTestCase {
         let prefs = Preferences()
         prefs.automaticallyDetectProjectPath = false
         prefs.projectPath = URL(fileURLWithPath: testProject)
-        prefs.moduleCachePath = getValidModuleCachePath()
         XPCManager.setUpConnection()
     }
 
@@ -97,8 +96,4 @@ class MockGeneratorBaseTestCase: XCTestCase {
             self.sourceTextBuffer = buffer
         }
     }
-
-    private func getValidModuleCachePath() -> String {
-        return "/Users/\(NSUserName())/Library/Developer/Xcode/DerivedData/ModuleCache.noindex"
-    }
 }