Skip to content

Commit ea00e7a

Browse files
finestructurefinestructure
committed
Fix tests (all pass)
1 parent 132b2b5 commit ea00e7a

9 files changed

Lines changed: 197 additions & 45 deletions

‎Tests/AppTests/BuildTests.swift‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,10 @@ extension AllTests.BuildTests {
146146
$0.environment.awsDocsBucket = { "awsDocsBucket" }
147147
$0.environment.builderToken = { "builder token" }
148148
$0.environment.buildTimeout = { 10 }
149+
$0.environment.enableBuildLogsPreSignedURLs = { false }
150+
$0.environment.enablePackageUploadPreSignedURLs = { false }
149151
$0.environment.gitlabPipelineToken = { "pipeline token" }
152+
$0.environment.gitlabProjectId = { 123 }
150153
$0.environment.siteURL = { "http://example.com" }
151154
$0.buildSystem.triggerBuild = BuildSystemClient.liveValue.triggerBuild
152155
$0.httpClient.post = { @Sendable _, _, body in
@@ -202,7 +205,10 @@ extension AllTests.BuildTests {
202205
$0.environment.awsDocsBucket = { "awsDocsBucket" }
203206
$0.environment.builderToken = { "builder token" }
204207
$0.environment.buildTimeout = { 10 }
208+
$0.environment.enableBuildLogsPreSignedURLs = { false }
209+
$0.environment.enablePackageUploadPreSignedURLs = { false }
205210
$0.environment.gitlabPipelineToken = { "pipeline token" }
211+
$0.environment.gitlabProjectId = { 123 }
206212
$0.environment.siteURL = { "http://example.com" }
207213
$0.buildSystem.triggerBuild = BuildSystemClient.liveValue.triggerBuild
208214
$0.httpClient.post = { @Sendable _, _, body in

‎Tests/AppTests/BuildTriggerTests.swift‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,10 @@ extension AllTests.BuildTriggerTests {
360360
$0.environment.awsDocsBucket = { "awsDocsBucket" }
361361
$0.environment.builderToken = { "builder token" }
362362
$0.environment.buildTimeout = { 10 }
363+
$0.environment.enableBuildLogsPreSignedURLs = { false }
364+
$0.environment.enablePackageUploadPreSignedURLs = { false }
363365
$0.environment.gitlabPipelineToken = { "pipeline token" }
366+
$0.environment.gitlabProjectId = { 123 }
364367
$0.environment.siteURL = { "http://example.com" }
365368
$0.buildSystem.triggerBuild = BuildSystemClient.liveValue.triggerBuild
366369
$0.httpClient.post = { @Sendable _, _, body in
@@ -410,7 +413,10 @@ extension AllTests.BuildTriggerTests {
410413
$0.environment.builderToken = { "builder token" }
411414
$0.environment.buildTimeout = { 10 }
412415
$0.environment.buildTriggerAllowList = { [] }
416+
$0.environment.enableBuildLogsPreSignedURLs = { false }
417+
$0.environment.enablePackageUploadPreSignedURLs = { false }
413418
$0.environment.gitlabPipelineToken = { "pipeline token" }
419+
$0.environment.gitlabProjectId = { 123 }
414420
$0.environment.siteURL = { "http://example.com" }
415421
$0.buildSystem.triggerBuild = BuildSystemClient.liveValue.triggerBuild
416422
$0.httpClient.post = { @Sendable _, _, body in
@@ -485,7 +491,10 @@ extension AllTests.BuildTriggerTests {
485491
$0.environment.awsDocsBucket = { "awsDocsBucket" }
486492
$0.environment.builderToken = { "builder token" }
487493
$0.environment.buildTimeout = { 10 }
494+
$0.environment.enableBuildLogsPreSignedURLs = { false }
495+
$0.environment.enablePackageUploadPreSignedURLs = { false }
488496
$0.environment.gitlabPipelineToken = { "pipeline token" }
497+
$0.environment.gitlabProjectId = { 123 }
489498
$0.environment.siteURL = { "http://example.com" }
490499
$0.buildSystem.triggerBuild = BuildSystemClient.liveValue.triggerBuild
491500
$0.httpClient.post = { @Sendable _, _, body in
@@ -545,8 +554,11 @@ extension AllTests.BuildTriggerTests {
545554
$0.environment.buildTimeout = { 10 }
546555
$0.environment.buildTriggerAllowList = { [] }
547556
$0.environment.buildTriggerDownscaling = { 1 }
557+
$0.environment.enableBuildLogsPreSignedURLs = { false }
558+
$0.environment.enablePackageUploadPreSignedURLs = { false }
548559
$0.environment.gitlabPipelineLimit = { 300 }
549560
$0.environment.gitlabPipelineToken = { "pipeline token" }
561+
$0.environment.gitlabProjectId = { 123 }
550562
$0.environment.random = { @Sendable _ in 0 }
551563
$0.environment.siteURL = { "http://example.com" }
552564
// Use live dependency but replace actual client with a mock so we can
@@ -648,8 +660,11 @@ extension AllTests.BuildTriggerTests {
648660
$0.environment.buildTriggerAllowList = { [] }
649661
$0.environment.buildTriggerDownscaling = { 1 }
650662
$0.environment.buildTriggerLatestSwiftVersionDownscaling = { 1 }
663+
$0.environment.enableBuildLogsPreSignedURLs = { false }
664+
$0.environment.enablePackageUploadPreSignedURLs = { false }
651665
$0.environment.gitlabPipelineLimit = { 300 }
652666
$0.environment.gitlabPipelineToken = { "pipeline token" }
667+
$0.environment.gitlabProjectId = { 123 }
653668
$0.environment.random = { @Sendable _ in 0 }
654669
$0.environment.siteURL = { "http://example.com" }
655670
$0.buildSystem.triggerBuild = BuildSystemClient.liveValue.triggerBuild
@@ -724,8 +739,11 @@ extension AllTests.BuildTriggerTests {
724739
$0.environment.buildTimeout = { 10 }
725740
$0.environment.buildTriggerAllowList = { [] }
726741
$0.environment.buildTriggerDownscaling = { 1 }
742+
$0.environment.enableBuildLogsPreSignedURLs = { false }
743+
$0.environment.enablePackageUploadPreSignedURLs = { false }
727744
$0.environment.gitlabPipelineLimit = { 300 }
728745
$0.environment.gitlabPipelineToken = { "pipeline token" }
746+
$0.environment.gitlabProjectId = { 123 }
729747
$0.environment.random = { @Sendable _ in 0 }
730748
$0.environment.siteURL = { "http://example.com" }
731749
$0.buildSystem.triggerBuild = BuildSystemClient.liveValue.triggerBuild
@@ -841,8 +859,11 @@ extension AllTests.BuildTriggerTests {
841859
$0.environment.buildTimeout = { 10 }
842860
$0.environment.buildTriggerAllowList = { [] }
843861
$0.environment.buildTriggerDownscaling = { 1 }
862+
$0.environment.enableBuildLogsPreSignedURLs = { false }
863+
$0.environment.enablePackageUploadPreSignedURLs = { false }
844864
$0.environment.gitlabPipelineLimit = { Constants.defaultGitlabPipelineLimit }
845865
$0.environment.gitlabPipelineToken = { "pipeline token" }
866+
$0.environment.gitlabProjectId = { 123 }
846867
$0.environment.random = { @Sendable _ in 0 }
847868
$0.environment.siteURL = { "http://example.com" }
848869
$0.buildSystem.triggerBuild = BuildSystemClient.liveValue.triggerBuild
@@ -905,8 +926,11 @@ extension AllTests.BuildTriggerTests {
905926
$0.environment.buildTimeout = { 10 }
906927
$0.environment.buildTriggerAllowList = { [] }
907928
$0.environment.buildTriggerDownscaling = { 0.05 } // 5% downscaling rate
929+
$0.environment.enableBuildLogsPreSignedURLs = { false }
930+
$0.environment.enablePackageUploadPreSignedURLs = { false }
908931
$0.environment.gitlabPipelineLimit = { Constants.defaultGitlabPipelineLimit }
909932
$0.environment.gitlabPipelineToken = { "pipeline token" }
933+
$0.environment.gitlabProjectId = { 123 }
910934
$0.environment.siteURL = { "http://example.com" }
911935
$0.buildSystem.triggerBuild = BuildSystemClient.liveValue.triggerBuild
912936
$0.httpClient.post = { @Sendable _, _, body in
@@ -967,8 +991,11 @@ extension AllTests.BuildTriggerTests {
967991
$0.environment.buildTimeout = { 10 }
968992
$0.environment.buildTriggerAllowList = { [.id0] }
969993
$0.environment.buildTriggerDownscaling = { 0.05 } // 5% downscaling rate
994+
$0.environment.enableBuildLogsPreSignedURLs = { false }
995+
$0.environment.enablePackageUploadPreSignedURLs = { false }
970996
$0.environment.gitlabPipelineLimit = { Constants.defaultGitlabPipelineLimit }
971997
$0.environment.gitlabPipelineToken = { "pipeline token" }
998+
$0.environment.gitlabProjectId = { 123 }
972999
$0.environment.siteURL = { "http://example.com" }
9731000
$0.buildSystem.triggerBuild = BuildSystemClient.liveValue.triggerBuild
9741001
$0.httpClient.post = { @Sendable _, _, body in

‎Tests/AppTests/GithubTests.swift‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -382,6 +382,7 @@ extension AllTests.GithubTests {
382382
@Test func extractImagesRequiringCaching() async throws {
383383
try withDependencies {
384384
$0.environment.awsReadmeBucket = { "awsReadmeBucket" }
385+
$0.environment.awsReadmeBucketRegion = { "region" }
385386
} operation: {
386387
var readme = """
387388
<html>
@@ -401,14 +402,16 @@ extension AllTests.GithubTests {
401402

402403
#expect(images == [
403404
.init(originalUrl: "https://private-user-images.githubusercontent.com/with-jwt.jpg?jwt=some-jwt",
404-
s3Key: S3Store.Key.init(bucket: "awsReadmeBucket", path: "owner/repo/with-jwt.jpg"))
405+
s3Key: S3Store.Key.init(bucket: "awsReadmeBucket",
406+
path: "owner/repo/with-jwt.jpg",
407+
region: .init(rawValue: "region")))
405408
])
406409

407410
let document = try SwiftSoup.parse(readme)
408411
let imageElements = try document.select("img").array()
409412

410413
#expect(try imageElements.map { try $0.attr("src") } == [
411-
"https://awsReadmeBucket.s3.us-east-2.amazonaws.com/owner/repo/with-jwt.jpg",
414+
"https://awsReadmeBucket.s3.region.amazonaws.com/owner/repo/with-jwt.jpg",
412415
"https://private-user-images.githubusercontent.com/without-jwt.jpg",
413416
"https://raw.githubusercontent.com/raw-image.png",
414417
"https://github.com/example/repo/branch/assets/example.png",

‎Tests/AppTests/GitlabBuilderTests.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ extension AllTests.GitlabBuilderTests {
5555
$0.environment.awsDocsBucket = { "docs-bucket" }
5656
$0.environment.builderToken = { "builder token" }
5757
$0.environment.buildTimeout = { 10 }
58+
$0.environment.enableBuildLogsPreSignedURLs = { false }
59+
$0.environment.enablePackageUploadPreSignedURLs = { false }
5860
$0.environment.gitlabPipelineToken = { "pipeline token" }
5961
$0.environment.gitlabProjectId = { 19564054 }
6062
$0.environment.siteURL = { "http://example.com" }
@@ -103,6 +105,8 @@ extension AllTests.GitlabBuilderTests {
103105
$0.environment.awsDocsBucket = { "docs-bucket" }
104106
$0.environment.builderToken = { "builder token" }
105107
$0.environment.buildTimeout = { 10 }
108+
$0.environment.enableBuildLogsPreSignedURLs = { false }
109+
$0.environment.enablePackageUploadPreSignedURLs = { false }
106110
$0.environment.gitlabPipelineToken = { "pipeline token" }
107111
$0.environment.gitlabProjectId = { 19564054 }
108112
$0.environment.siteURL = { "http://example.com" }

‎Tests/AppTests/IngestionTests.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -491,6 +491,8 @@ extension AllTests.IngestionTests {
491491
@Test func S3Store_Key_readme() throws {
492492
try withDependencies {
493493
$0.environment.awsReadmeBucket = { "readme-bucket" }
494+
$0.environment.awsReadmeBucketRegion = { "region" }
495+
$0.environment.awsRegion = { "region" }
494496
} operation: { () throws in
495497
#expect(try S3Store.Key.readme(owner: "foo", repository: "bar").path == "foo/bar/readme.html")
496498
#expect(try S3Store.Key.readme(owner: "FOO", repository: "bar").path == "foo/bar/readme.html")

0 commit comments

Comments
 (0)