Fix up tests

Author: supersonicbyte

Sources/App/Controllers/API/API+PackageController+GetRoute+Model.swift

@@ -20,7 +20,6 @@ import Vapor
 extension API.PackageController.GetRoute {
     struct Model: Content, Equatable {
         var packageId: Package.Id
-        var packageName: String
         var repositoryOwner: String
         var repositoryOwnerName: String
         var repositoryName: String
@@ -54,7 +53,6 @@ extension API.PackageController.GetRoute {
         var forkedFromInfo: ForkedFromInfo?
 
         internal init(packageId: Package.Id,
-                      packageName: String,
                       repositoryOwner: String,
                       repositoryOwnerName: String,
                       repositoryName: String,
@@ -88,7 +86,6 @@ extension API.PackageController.GetRoute {
                       forkedFromResult: API.PackageController.ForkedFromResult?
             ) {
             self.packageId = packageId
-            self.packageName = packageName
             self.repositoryOwner = repositoryOwner
             self.repositoryOwnerName = repositoryOwnerName
             self.repositoryName = repositoryName
@@ -132,7 +129,7 @@ extension API.PackageController.GetRoute {
                 switch forkedFromResult {
                 case .fromSPI(let repo, let owner, let ownerName, let packageName):
                     self.forkedFromInfo = ForkedFromInfo.fromSPI(
-                        packageName: packageName,
+                        packageName: self.title,
                         originalOwner: owner,
                         originalOwnerName: ownerName,
                         originalRepo: repo,
@@ -161,13 +158,11 @@ extension API.PackageController.GetRoute {
                 let repositoryOwner = repository.owner,
                 let repositoryOwnerName = repository.ownerDisplayName,
                 let repositoryName = repository.name,
-                let packageId = result.package.id,
-                let packageName = result.defaultBranchVersion.packageName
+                let packageId = result.package.id
             else { return nil }
 
             self.init(
                 packageId: packageId,
-                packageName: packageName,
                 repositoryOwner: repositoryOwner,
                 repositoryOwnerName: repositoryOwnerName,
                 repositoryName: repositoryName,

Sources/App/Controllers/API/Types+WithExample.swift

@@ -176,7 +176,6 @@ extension API.PackageController.GetRoute.Model.History: WithExample {
 extension API.PackageController.GetRoute.Model: WithExample {
     static var example: Self {
         .init(packageId: .example,
-              packageName: "Mona",
               repositoryOwner: "mona",
               repositoryOwnerName: "Mona",
               repositoryName: "LinkedList",

Tests/AppTests/API+PackageController+GetRoute+ModelTests.swift

@@ -43,7 +43,7 @@ class API_PackageController_GetRoute_ModelTests: SnapshotTestCase {
                                                      platformBuildInfo: nil,
                                                      weightedKeywords: [],
                                                      swift6Readiness: nil,
-                                                     forkedFromURL: nil)
+                                                     forkedFromResult: nil)
 
         // validate
         XCTAssertNotNil(m)
@@ -66,7 +66,7 @@ class API_PackageController_GetRoute_ModelTests: SnapshotTestCase {
                                                                        platformBuildInfo: nil,
                                                                        weightedKeywords: [],
                                                                        swift6Readiness: nil,
-                                                                       forkedFromURL: nil
+                                                                       forkedFromResult: nil
                                                                       ))
 
         // validate
@@ -90,7 +90,7 @@ class API_PackageController_GetRoute_ModelTests: SnapshotTestCase {
                                                                        platformBuildInfo: nil,
                                                                        weightedKeywords: [],
                                                                        swift6Readiness: nil,
-                                                                       forkedFromURL: nil
+                                                                       forkedFromResult: nil
                                                                       ))
 
         // validate
@@ -118,7 +118,7 @@ class API_PackageController_GetRoute_ModelTests: SnapshotTestCase {
                                                                        platformBuildInfo: nil,
                                                                        weightedKeywords: [],
                                                                        swift6Readiness: nil,
-                                                                       forkedFromURL: nil
+                                                                       forkedFromResult: nil
                                                                       ))
 
         // validate
@@ -154,7 +154,7 @@ class API_PackageController_GetRoute_ModelTests: SnapshotTestCase {
 
     func test_forked_from() throws {
         var model = API.PackageController.GetRoute.Model.mock
-        model.forkedFromURL = "https://github.com/owner/repository.git"
+        model.forkedFromInfo = .fromGitHub(url: "https://github.com/owner/repository.git")
         let renderedForkedFrom = model.forkedListItem().render(indentedBy: .spaces(2))
         assertSnapshot(of: renderedForkedFrom, as: .lines)
     }
@@ -346,7 +346,7 @@ class API_PackageController_GetRoute_ModelTests: SnapshotTestCase {
 
     func test_forkedFrom_formatting() throws {
         var model = API.PackageController.GetRoute.Model.mock
-        model.forkedFromURL = "https://github.com/owner/repository.git"
+        model.forkedFromInfo = .fromGitHub(url: "https://github.com/owner/repository.git")
         let renderedForkedFrom = model.forkedListItem().render()
         XCTAssertEqual(renderedForkedFrom, "<li class=\"forked\">Forked from <a href=\"https://github.com/owner/repository.git\">repository</a>.</li>")
     }

Tests/AppTests/Mocks/API.PackageController.GetRoute.Model+mock.swift

@@ -21,7 +21,6 @@ extension API.PackageController.GetRoute.Model {
     static var mock: Self {
         .init(
             packageId: UUID("cafecafe-cafe-cafe-cafe-cafecafecafe")!,
-            packageName: "Alamofire",
             repositoryOwner: "Alamo",
             repositoryOwnerName: "Alamofire",
             repositoryName: "Alamofire",