vhad/SwiftGit2
1
0
Fork 0
mirror of https://github.com/gosticks/SwiftGit2.git synced 2025-10-16 11:55:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply API guidelines to test helper functions

Browse Source
This commit is contained in:
Matt Rubin 2016-12-18 17:55:19 -05:00
parent 2a90c7b5f3
commit 93ddcd3e9a
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
SwiftGit2Tests/Fixtures/Fixtures.swift
View File

@ -54,7 +54,7 @@ final class Fixtures {
// MARK: - Helpers
func repositoryWithName(_ name: String) -> Repository {
func repository(withName name: String) -> Repository {
let url = directoryURL.appendingPathComponent(name, isDirectory: true)
return Repository.at(url).value!
}
@ -62,14 +62,14 @@ final class Fixtures {
// MARK: - The Fixtures
class var detachedHeadRepository: Repository {
return Fixtures.sharedInstance.repositoryWithName("detached-head")
return Fixtures.sharedInstance.repository(withName: "detached-head")
}
class var simpleRepository: Repository {
return Fixtures.sharedInstance.repositoryWithName("simple-repository")
return Fixtures.sharedInstance.repository(withName: "simple-repository")
}
class var mantleRepository: Repository {
return Fixtures.sharedInstance.repositoryWithName("Mantle")
return Fixtures.sharedInstance.repository(withName: "Mantle")
}
}

12
SwiftGit2Tests/RepositorySpec.swift
View File

@ -33,7 +33,7 @@ class RepositorySpec: QuickSpec {
describe("Repository.Type.clone()") {
it("should handle local clones") {
let remoteRepo = Fixtures.simpleRepository
let localURL = self.temporaryURLForPurpose("local-clone")
let localURL = self.temporaryURL(forPurpose: "local-clone")
let result = Repository.clone(from: remoteRepo.directoryURL!, to: localURL, localClone: true)
expect(result).to(haveSucceeded())
@ -45,7 +45,7 @@ class RepositorySpec: QuickSpec {
it("should handle bare clones") {
let remoteRepo = Fixtures.simpleRepository
let localURL = self.temporaryURLForPurpose("bare-clone")
let localURL = self.temporaryURL(forPurpose: "bare-clone")
let result = Repository.clone(from: remoteRepo.directoryURL!, to: localURL, localClone: true, bare: true)
expect(result).to(haveSucceeded())
@ -57,7 +57,7 @@ class RepositorySpec: QuickSpec {
it("should have set a valid remote url") {
let remoteRepo = Fixtures.simpleRepository
let localURL = self.temporaryURLForPurpose("valid-remote-clone")
let localURL = self.temporaryURL(forPurpose: "valid-remote-clone")
let cloneResult = Repository.clone(from: remoteRepo.directoryURL!, to: localURL, localClone: true)
expect(cloneResult).to(haveSucceeded())
@ -74,7 +74,7 @@ class RepositorySpec: QuickSpec {
it("should be able to clone a remote repository") {
let remoteRepoURL = URL(string: "https://github.com/libgit2/libgit2.github.com.git")
let localURL = self.temporaryURLForPurpose("public-remote-clone")
let localURL = self.temporaryURL(forPurpose: "public-remote-clone")
let cloneResult = Repository.clone(from: remoteRepoURL!, to: localURL)
expect(cloneResult).to(haveSucceeded())
@ -96,7 +96,7 @@ class RepositorySpec: QuickSpec {
it("should be able to clone a remote repository requiring credentials") {
let remoteRepoURL = URL(string: privateRepo)
let localURL = self.temporaryURLForPurpose("private-remote-clone")
let localURL = self.temporaryURL(forPurpose: "private-remote-clone")
let cloneResult = Repository.clone(from: remoteRepoURL!, to: localURL,
credentials: .SSHMemory(username: gitUsername, publicKey: publicKey, privateKey: privateKey, passphrase: passphrase))
@ -596,7 +596,7 @@ class RepositorySpec: QuickSpec {
}
}
func temporaryURLForPurpose(_ purpose: String) -> URL {
func temporaryURL(forPurpose purpose: String) -> URL {
let globallyUniqueString = ProcessInfo.processInfo.globallyUniqueString
let path = "\(NSTemporaryDirectory())\(globallyUniqueString)_\(purpose)"
return URL(fileURLWithPath: path)