Skip to content

back merge #107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
reeshika-h merged 8 commits into from
Sep 26, 2025
Merged

back merge #107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7bb65f5
Increase timeout for network expectations in various test files from …
reeshika-h Sep 18, 2025
588a3cf
Merge remote-tracking branch 'origin' into fix/DX-3551-ci-workflow-tests
reeshika-h Sep 18, 2025
64c3670
Merge branch 'staging' into fix/DX-3551-ci-workflow-tests
reeshika-h Sep 19, 2025
00031c9
Merge pull request #101 from contentstack/fix/DX-3551-ci-workflow-tests
reeshika-h Sep 22, 2025
7711418
Refactor asynchronous test timeout handling to use 'await fulfillment…
reeshika-h Sep 22, 2025
5d8b92f
Merge pull request #105 from contentstack/fix/DX-3551-ci-workflow-tests
reeshika-h Sep 22, 2025
fa0ff89
Merge pull request #95 from contentstack/staging
harshithad0703 Sep 22, 2025
208ec1a
Merge pull request #106 from contentstack/master
reeshika-h Sep 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions Tests/AssetQueryAPITest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test02Find_AssetQuery_whereUIDEquals() async {
Expand All @@ -77,7 +77,7 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test03Find_AssetQuery_whereTitleDNotEquals() async {
Expand All @@ -93,7 +93,7 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test03Find_AssetQuery_whereFileNameEquals() async {
Expand All @@ -109,7 +109,7 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test04Find_AssetQuery_whereFileNameexists() async {
Expand All @@ -123,7 +123,7 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test05Find_AssetQuery_whereTitleMatchRegex() async {
Expand All @@ -137,7 +137,7 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test06Fetch_Asset_fromUID() async {
Expand All @@ -151,7 +151,7 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test07Fetch_AssetQuery_WithDimentsions() async {
Expand All @@ -169,7 +169,7 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)

}

Expand All @@ -186,7 +186,7 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test09Fetch_AssetQuery_WithCount() async {
Expand All @@ -203,7 +203,7 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)

}

Expand All @@ -221,7 +221,7 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test12Fetch_AssetQuery_WithoutFallback_Result() async {
Expand All @@ -242,7 +242,7 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test13Fetch_AssetQuery_Fallback_Result() async {
Expand Down Expand Up @@ -275,7 +275,7 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test14Fetch_Asset_UIDWithoutFallback_NoResult() async {
Expand All @@ -294,7 +294,7 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test15Fetch_Asset_UIDWithFallback_NoResult() async {
Expand All @@ -315,6 +315,6 @@ class AssetQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}
}
4 changes: 2 additions & 2 deletions Tests/AsyncAwaitAPITest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ class AsyncAwaitSyntaxTests: XCTestCase {
}
}

await fulfillment(of: [expectation], timeout: 5.0)
await fulfillment(of: [expectation], timeout: 30.0)
}

func testAsyncLetSyntax() async {
Expand All @@ -363,6 +363,6 @@ class AsyncAwaitSyntaxTests: XCTestCase {
}
}

await fulfillment(of: [expectation], timeout: 5.0)
await fulfillment(of: [expectation], timeout: 30.0)
}
}
20 changes: 10 additions & 10 deletions Tests/ContentTypeQueryAPITest.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ class ContentTypeQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test02Find_ContentTypeQuery_whereUIDEquals() async {
Expand All @@ -72,7 +72,7 @@ class ContentTypeQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test03Find_ContentTypeQuery_whereTitleDNotEquals() async {
Expand All @@ -88,7 +88,7 @@ class ContentTypeQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test04Find_ContentTypeQuery_whereDescriptionexists() async {
Expand All @@ -102,7 +102,7 @@ class ContentTypeQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test05Find_ContentTypeQuery_whereTitleMatchRegex() async {
Expand All @@ -116,7 +116,7 @@ class ContentTypeQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test06Fetch_ContentType_fromUID() async {
Expand All @@ -130,7 +130,7 @@ class ContentTypeQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test07Fetch_ContentTypeQuery_WithGlobalFields() async {
Expand All @@ -154,7 +154,7 @@ class ContentTypeQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)

}

Expand All @@ -176,7 +176,7 @@ class ContentTypeQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}

func test09Fetch_ContentTypeQuery_WithCount() async {
Expand All @@ -192,7 +192,7 @@ class ContentTypeQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)

}

Expand All @@ -210,6 +210,6 @@ class ContentTypeQueryAPITest: XCTestCase {
}
networkExpectation.fulfill()
}
await fulfillment(of: [networkExpectation], timeout: 5)
await fulfillment(of: [networkExpectation], timeout: 30.0)
}
}
Loading