Simplify building and testing in Xcode (#723)

Author: kmahar

Makefile

@@ -5,12 +5,6 @@ else
 	FILTERARG =
 endif
 
-ifdef DOCSVERSION
-	DOCSARG = --module-version $(DOCSVERSION)
-else
-	DOCSARG =
-endif
-
 # if no value provided assume sourcery is in the user's PATH
 SOURCERY ?= sourcery
 
@@ -21,13 +15,6 @@ endef
 all:
 	swift build -v
 
-# project generates the .xcodeproj, and then modifies it to add
-# spec .JSON files to the project
-project:
-	swift package generate-xcodeproj
-	@$(call check_for_gem,xcodeproj)
-	ruby etc/add_json_files.rb
-
 exports:
 	$(SOURCERY) --sources Sources/MongoSwift/ --templates Sources/MongoSwiftSync/Exports.stencil --output Sources/MongoSwiftSync/Exports.swift
 
@@ -48,8 +35,6 @@ coverage:
 	xcrun llvm-cov export -format="lcov" .build/debug/mongo-swift-driverPackageTests.xctest/Contents/MacOS/mongo-swift-driverPackageTests -instr-profile .build/debug/codecov/default.profdata > info.lcov
 
 clean:
-	rm -rf Packages
 	rm -rf .build
-	rm -rf MongoSwift.xcodeproj
 	rm Package.resolved
 

Sources/TestsCommon/SpecTestUtils.swift

@@ -4,19 +4,15 @@ import NIO
 import XCTest
 
 extension MongoSwiftTestCase {
-    /// Gets the path of the directory containing spec files, depending on whether
-    /// we're running from XCode or the command line
+    /// Gets the path of the directory containing spec files.
     static var specsPath: String {
-        // if we can access the "/Tests" directory, assume we're running from command line
-        if FileManager.default.fileExists(atPath: "./Tests") {
-            return "./Tests/Specs"
-        }
-        // otherwise we're in Xcode, get the bundle's resource path
-        guard let path = Bundle(for: self).resourcePath else {
-            XCTFail("Missing resource path")
-            return ""
-        }
-        return path
+        // Approach taken from https://stackoverflow.com/a/58034307
+        // TODO: SWIFT-1442 Once we drop Swift < 5.3 we can switch to including the JSON files as Resources via our
+        // package manifest instead.
+        let thisFile = URL(fileURLWithPath: #file)
+        // We are in Sources/TestsCommon/SpecTestUtils.swift; drop 3 components to get up to the root directory.
+        let baseDirectory = thisFile.deletingLastPathComponent().deletingLastPathComponent().deletingLastPathComponent()
+        return baseDirectory.appendingPathComponent("Tests").appendingPathComponent("Specs").path
     }
 }