From 39161634ed64a77ff1e01a4e90b1180100dd04a0 Mon Sep 17 00:00:00 2001 From: brianna Date: Thu, 3 Oct 2024 19:43:35 -0700 Subject: [PATCH 01/26] change macos runner to 13. --- .github/workflows/integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 7b303e38..aa570267 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -47,7 +47,7 @@ jobs: fi swift-button-functional-test: - runs-on: macos-latest + runs-on: macOS-13 needs: check-pr-body-for-key # Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner. if: ${{ needs.check-pr-body-for-key.outputs.RUN_INTEGRATION == 'yes' && !github.event.pull_request.head.repo.fork }} From a5f514623a46ee8301fb1b048ccd73c8a01cc95d Mon Sep 17 00:00:00 2001 From: brianna Date: Thu, 3 Oct 2024 19:52:31 -0700 Subject: [PATCH 02/26] update macos runner for builds. --- .github/workflows/builds.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index cb26e338..052a2cda 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-latest] + os: [macOS-13] steps: - uses: actions/checkout@v3 From 4fa046c11c6f60f3d5b74cbc6e9ff665452e3b75 Mon Sep 17 00:00:00 2001 From: brianna Date: Fri, 4 Oct 2024 10:13:39 -0700 Subject: [PATCH 03/26] add debug comments --- .github/workflows/builds.yml | 2 +- .github/workflows/integration_tests.yml | 6 +++--- .../DaysUntilBirthdayUITests_iOS.swift | 14 ++++++++++---- 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index 052a2cda..d240880f 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macOS-13] + os: [macos-12] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index aa570267..36d3d607 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -47,7 +47,7 @@ jobs: fi swift-button-functional-test: - runs-on: macOS-13 + runs-on: macos-12 needs: check-pr-body-for-key # Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner. if: ${{ needs.check-pr-body-for-key.outputs.RUN_INTEGRATION == 'yes' && !github.event.pull_request.head.repo.fork }} @@ -64,7 +64,7 @@ jobs: build-for-testing \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' + -destination 'platform=iOS Simulator,name=iPhone 11' - name: Run test target for Google Sign-in button for Swift env: EMAIL_SECRET : ${{ secrets.EMAIL_SECRET }} @@ -75,7 +75,7 @@ jobs: test-without-building \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' \ + -destination 'platform=iOS Simulator,name=iPhone 11' \ EMAIL_SECRET=$EMAIL_SECRET \ PASSWORD_SECRET=$PASSWORD_SECRET diff --git a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift index 7d05239f..31299425 100644 --- a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift +++ b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift @@ -124,11 +124,13 @@ extension DaysUntilBirthdayUITests_iOS { /// This will assumme the full flow where a user must type in an email and /// password to sign in with. func signInForTheFirstTime() -> Bool { + print("BOO: it's the first time") guard sampleApp.textFields["Email or phone"] .waitForExistence(timeout: timeout) else { XCTFail("Failed to find email textfield") return false } + print("BOO: before the return button") guard sampleApp .keyboards .element @@ -137,15 +139,17 @@ extension DaysUntilBirthdayUITests_iOS { XCTFail("Failed to find 'return' button") return false } - + print("BOO: before typing in email or phone text") sampleApp.textFields["Email or phone"].typeText(Credential.email.rawValue) + print("BOO: before tapping on return for email or phone") sampleApp.keyboards.element.buttons["return"].tap() - + print("BOO: before entering password") guard sampleApp.secureTextFields["Enter your password"] .waitForExistence(timeout: timeout) else { XCTFail("Failed to find password textfield") return false } + print("BOO: before checking existence of return for password") guard sampleApp .keyboards .element @@ -154,12 +158,12 @@ extension DaysUntilBirthdayUITests_iOS { XCTFail("Failed to find 'return' button") return false } - + print("BOO: before entering return on password") sampleApp .secureTextFields["Enter your password"] .typeText(Credential.password.rawValue) sampleApp.keyboards.element.buttons["return"].tap() - + print("BOO: before password manager prompt existence") if sampleApp .staticTexts[passwordManagerPrompt] .waitForExistence(timeout: timeout) { @@ -169,7 +173,9 @@ extension DaysUntilBirthdayUITests_iOS { XCTFail("Failed to find \(notNowText) button") return false } + print("BOO: before not now text tap") sampleApp.buttons[notNowText].tap() + print("BOO: after not now text tap") } // Proceed through sign-in disclaimer and/or access request view(s) if needed From f023aa31ce0b46c3d96a79b92b92db15930351a2 Mon Sep 17 00:00:00 2001 From: brianna Date: Fri, 4 Oct 2024 10:17:00 -0700 Subject: [PATCH 04/26] revert --- .github/workflows/builds.yml | 2 +- .github/workflows/integration_tests.yml | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index d240880f..cb26e338 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -15,7 +15,7 @@ jobs: strategy: fail-fast: false matrix: - os: [macos-12] + os: [macos-latest] steps: - uses: actions/checkout@v3 diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 36d3d607..7b303e38 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -47,7 +47,7 @@ jobs: fi swift-button-functional-test: - runs-on: macos-12 + runs-on: macos-latest needs: check-pr-body-for-key # Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner. if: ${{ needs.check-pr-body-for-key.outputs.RUN_INTEGRATION == 'yes' && !github.event.pull_request.head.repo.fork }} @@ -64,7 +64,7 @@ jobs: build-for-testing \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 11' + -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' - name: Run test target for Google Sign-in button for Swift env: EMAIL_SECRET : ${{ secrets.EMAIL_SECRET }} @@ -75,7 +75,7 @@ jobs: test-without-building \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 11' \ + -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' \ EMAIL_SECRET=$EMAIL_SECRET \ PASSWORD_SECRET=$PASSWORD_SECRET From afeb283f10e95957d5c2248c67aaa647fcf12104 Mon Sep 17 00:00:00 2001 From: brianna Date: Fri, 4 Oct 2024 10:59:56 -0700 Subject: [PATCH 05/26] increase timeout time --- .../DaysUntilBirthdayUITests_iOS.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift index 31299425..19827b31 100644 --- a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift +++ b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift @@ -27,7 +27,7 @@ class DaysUntilBirthdayUITests_iOS: XCTestCase { private let appTrustWarningText = "Make sure you trust Days Until Birthday" private let chooseAnAccountHeaderText = "Choose an account" private let notNowText = "Not Now" - private let timeout: TimeInterval = 5 + private let timeout: TimeInterval = 10 private let sampleApp = XCUIApplication() private let springboardApp = XCUIApplication( From a8bcbf509557a3aca5887da544a2f7e773605ed1 Mon Sep 17 00:00:00 2001 From: brianna Date: Fri, 4 Oct 2024 11:10:53 -0700 Subject: [PATCH 06/26] adjust timeout --- .../DaysUntilBirthdayUITests_iOS.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift index 19827b31..ab33f212 100644 --- a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift +++ b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift @@ -27,7 +27,7 @@ class DaysUntilBirthdayUITests_iOS: XCTestCase { private let appTrustWarningText = "Make sure you trust Days Until Birthday" private let chooseAnAccountHeaderText = "Choose an account" private let notNowText = "Not Now" - private let timeout: TimeInterval = 10 + private let timeout: TimeInterval = 5 private let sampleApp = XCUIApplication() private let springboardApp = XCUIApplication( @@ -83,7 +83,7 @@ extension DaysUntilBirthdayUITests_iOS { guard springboardApp .staticTexts[signInStaticText] - .waitForExistence(timeout: timeout) else { + .waitForExistence(timeout: 30) else { XCTFail("Failed to display permission prompt") return false } From 8eba6e401b7528d88a574a324c786223e461940b Mon Sep 17 00:00:00 2001 From: brianna Date: Mon, 14 Oct 2024 12:58:49 -0700 Subject: [PATCH 07/26] Empty commit for testing From 241058bb734f1901900be287fc50a86d84838f1f Mon Sep 17 00:00:00 2001 From: brianna Date: Tue, 5 Nov 2024 16:14:59 -0800 Subject: [PATCH 08/26] Empty commit for testing again From 01054aeb169a4465bd1e98a3eb096b2dd42f9b77 Mon Sep 17 00:00:00 2001 From: brianna Date: Wed, 6 Nov 2024 22:40:25 -0800 Subject: [PATCH 09/26] Update simulator to 17.5. --- .github/workflows/integration_tests.yml | 4 ++-- .../DaysUntilBirthdayUITests_iOS.swift | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 7b303e38..6fd583d7 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -64,7 +64,7 @@ jobs: build-for-testing \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' + -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' - name: Run test target for Google Sign-in button for Swift env: EMAIL_SECRET : ${{ secrets.EMAIL_SECRET }} @@ -75,7 +75,7 @@ jobs: test-without-building \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' \ + -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' \ EMAIL_SECRET=$EMAIL_SECRET \ PASSWORD_SECRET=$PASSWORD_SECRET diff --git a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift index ab33f212..31299425 100644 --- a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift +++ b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift @@ -83,7 +83,7 @@ extension DaysUntilBirthdayUITests_iOS { guard springboardApp .staticTexts[signInStaticText] - .waitForExistence(timeout: 30) else { + .waitForExistence(timeout: timeout) else { XCTFail("Failed to display permission prompt") return false } From 9a47e8cb0816c2b6080ac5a6c02e0affc30158c8 Mon Sep 17 00:00:00 2001 From: brianna Date: Wed, 6 Nov 2024 23:14:40 -0800 Subject: [PATCH 10/26] Change macos runner. --- .github/workflows/integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 6fd583d7..3ccbe75e 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -47,7 +47,7 @@ jobs: fi swift-button-functional-test: - runs-on: macos-latest + runs-on: macos-14 needs: check-pr-body-for-key # Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner. if: ${{ needs.check-pr-body-for-key.outputs.RUN_INTEGRATION == 'yes' && !github.event.pull_request.head.repo.fork }} From 2e989544ad2a479d1d3b0c2751a67620caca5d9c Mon Sep 17 00:00:00 2001 From: brianna Date: Thu, 7 Nov 2024 09:57:39 -0800 Subject: [PATCH 11/26] Change macos runner to 13. --- .github/workflows/integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 3ccbe75e..013709bf 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -47,7 +47,7 @@ jobs: fi swift-button-functional-test: - runs-on: macos-14 + runs-on: macOS-13 needs: check-pr-body-for-key # Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner. if: ${{ needs.check-pr-body-for-key.outputs.RUN_INTEGRATION == 'yes' && !github.event.pull_request.head.repo.fork }} From 9384626ca6d770834dbb442f2b36ef420796053c Mon Sep 17 00:00:00 2001 From: brianna Date: Thu, 7 Nov 2024 15:07:53 -0800 Subject: [PATCH 12/26] Revert macos runner to latest. --- .github/workflows/integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 013709bf..6fd583d7 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -47,7 +47,7 @@ jobs: fi swift-button-functional-test: - runs-on: macOS-13 + runs-on: macos-latest needs: check-pr-body-for-key # Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner. if: ${{ needs.check-pr-body-for-key.outputs.RUN_INTEGRATION == 'yes' && !github.event.pull_request.head.repo.fork }} From b45aefa3ee514df5c05453df2ddd4e7eb4ad07bc Mon Sep 17 00:00:00 2001 From: brianna Date: Thu, 7 Nov 2024 15:29:52 -0800 Subject: [PATCH 13/26] Update macos runner and revert simulator. --- .github/workflows/integration_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 6fd583d7..aa570267 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -47,7 +47,7 @@ jobs: fi swift-button-functional-test: - runs-on: macos-latest + runs-on: macOS-13 needs: check-pr-body-for-key # Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner. if: ${{ needs.check-pr-body-for-key.outputs.RUN_INTEGRATION == 'yes' && !github.event.pull_request.head.repo.fork }} @@ -64,7 +64,7 @@ jobs: build-for-testing \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' + -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' - name: Run test target for Google Sign-in button for Swift env: EMAIL_SECRET : ${{ secrets.EMAIL_SECRET }} @@ -75,7 +75,7 @@ jobs: test-without-building \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' \ + -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' \ EMAIL_SECRET=$EMAIL_SECRET \ PASSWORD_SECRET=$PASSWORD_SECRET From de3d59680464c1b3496729deab463d2491a14ce0 Mon Sep 17 00:00:00 2001 From: brianna Date: Thu, 7 Nov 2024 15:33:57 -0800 Subject: [PATCH 14/26] Update to macos 14 runner. --- .github/workflows/integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index aa570267..62256fe8 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -47,7 +47,7 @@ jobs: fi swift-button-functional-test: - runs-on: macOS-13 + runs-on: macOS-14 needs: check-pr-body-for-key # Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner. if: ${{ needs.check-pr-body-for-key.outputs.RUN_INTEGRATION == 'yes' && !github.event.pull_request.head.repo.fork }} From 08325c6a51e70bfde04441e629f6451d37392669 Mon Sep 17 00:00:00 2001 From: brianna Date: Thu, 7 Nov 2024 15:53:14 -0800 Subject: [PATCH 15/26] Update simulator to 18.0. --- .github/workflows/integration_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 62256fe8..9803cbe7 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -47,7 +47,7 @@ jobs: fi swift-button-functional-test: - runs-on: macOS-14 + runs-on: macos-latest needs: check-pr-body-for-key # Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner. if: ${{ needs.check-pr-body-for-key.outputs.RUN_INTEGRATION == 'yes' && !github.event.pull_request.head.repo.fork }} @@ -64,7 +64,7 @@ jobs: build-for-testing \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' + -destination 'platform=iOS Simulator,name=iPhone 15,OS=18.0' - name: Run test target for Google Sign-in button for Swift env: EMAIL_SECRET : ${{ secrets.EMAIL_SECRET }} @@ -75,7 +75,7 @@ jobs: test-without-building \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' \ + -destination 'platform=iOS Simulator,name=iPhone 15,OS=18.0' \ EMAIL_SECRET=$EMAIL_SECRET \ PASSWORD_SECRET=$PASSWORD_SECRET From b5872374c315f29232efd379f4240a66af9819e8 Mon Sep 17 00:00:00 2001 From: brianna Date: Thu, 7 Nov 2024 16:31:14 -0800 Subject: [PATCH 16/26] Change to macos-14. --- .github/workflows/integration_tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 9803cbe7..62256fe8 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -47,7 +47,7 @@ jobs: fi swift-button-functional-test: - runs-on: macos-latest + runs-on: macOS-14 needs: check-pr-body-for-key # Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner. if: ${{ needs.check-pr-body-for-key.outputs.RUN_INTEGRATION == 'yes' && !github.event.pull_request.head.repo.fork }} @@ -64,7 +64,7 @@ jobs: build-for-testing \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=18.0' + -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' - name: Run test target for Google Sign-in button for Swift env: EMAIL_SECRET : ${{ secrets.EMAIL_SECRET }} @@ -75,7 +75,7 @@ jobs: test-without-building \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=18.0' \ + -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' \ EMAIL_SECRET=$EMAIL_SECRET \ PASSWORD_SECRET=$PASSWORD_SECRET From 294be90dfd8bac6eb6750f61f5498aaed4f70428 Mon Sep 17 00:00:00 2001 From: brianna Date: Thu, 7 Nov 2024 16:46:35 -0800 Subject: [PATCH 17/26] Update simulator. --- .github/workflows/integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 62256fe8..64d08056 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -75,7 +75,7 @@ jobs: test-without-building \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' \ + -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' \ EMAIL_SECRET=$EMAIL_SECRET \ PASSWORD_SECRET=$PASSWORD_SECRET From 9611af3f8d3ad5cff0e4d8939ad713835ff83220 Mon Sep 17 00:00:00 2001 From: brianna Date: Thu, 7 Nov 2024 20:31:08 -0800 Subject: [PATCH 18/26] Change timeout to 30s. --- .../DaysUntilBirthdayUITests_iOS.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift index 31299425..69505931 100644 --- a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift +++ b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift @@ -126,7 +126,7 @@ extension DaysUntilBirthdayUITests_iOS { func signInForTheFirstTime() -> Bool { print("BOO: it's the first time") guard sampleApp.textFields["Email or phone"] - .waitForExistence(timeout: timeout) else { + .waitForExistence(timeout: 30) else { XCTFail("Failed to find email textfield") return false } From b7f7c95060584012bb8cd5353e1b028adf1ad093 Mon Sep 17 00:00:00 2001 From: brianna Date: Thu, 7 Nov 2024 20:46:39 -0800 Subject: [PATCH 19/26] Up timeout to 30s again. --- .../DaysUntilBirthdayUITests_iOS.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift index 69505931..dd998374 100644 --- a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift +++ b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayUITests(iOS)/DaysUntilBirthdayUITests_iOS.swift @@ -111,7 +111,7 @@ extension DaysUntilBirthdayUITests_iOS { return false } guard sampleApp.staticTexts["User Profile"] - .waitForExistence(timeout: timeout) else { + .waitForExistence(timeout: 30) else { XCTFail("Failed to sign in and return to app's User Profile view.") return false } From 5ef09112d7e5955161e3fe14eaf1e8c28fd2ee5c Mon Sep 17 00:00:00 2001 From: brianna Date: Thu, 7 Nov 2024 20:56:26 -0800 Subject: [PATCH 20/26] Match the simulator. --- .github/workflows/integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 64d08056..8f9c05cb 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -64,7 +64,7 @@ jobs: build-for-testing \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' + -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' - name: Run test target for Google Sign-in button for Swift env: EMAIL_SECRET : ${{ secrets.EMAIL_SECRET }} From 2daff2d07834540353e743dd2cbc02295ef428ae Mon Sep 17 00:00:00 2001 From: brianna Date: Thu, 7 Nov 2024 21:31:57 -0800 Subject: [PATCH 21/26] Revert to original simulator. --- .github/workflows/integration_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 8f9c05cb..62256fe8 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -64,7 +64,7 @@ jobs: build-for-testing \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' + -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' - name: Run test target for Google Sign-in button for Swift env: EMAIL_SECRET : ${{ secrets.EMAIL_SECRET }} @@ -75,7 +75,7 @@ jobs: test-without-building \ -scheme DaysUntilBirthday\ \(iOS\) \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.5' \ + -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' \ EMAIL_SECRET=$EMAIL_SECRET \ PASSWORD_SECRET=$PASSWORD_SECRET From 4d5534e766b06316462f1dbfeb451eccc85511a1 Mon Sep 17 00:00:00 2001 From: brianna Date: Wed, 13 Nov 2024 13:57:25 -0800 Subject: [PATCH 22/26] Add artifacts to view failing test. --- .github/workflows/integration_tests.yml | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 62256fe8..7ee22987 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -77,7 +77,14 @@ jobs: -sdk iphonesimulator \ -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' \ EMAIL_SECRET=$EMAIL_SECRET \ - PASSWORD_SECRET=$PASSWORD_SECRET + PASSWORD_SECRET=$PASSWORD_SECRET \ + -resultBundlePath DaysUntilBirthday.xcresult + - name: Upload xcresult file + uses: actions/upload-artifact@v4 + if: ${{ failure() }} + with: + name: DaysUntilBirthday-${{ github.run_number }}.xcresult + path: DaysUntilBirthday.xcresult app-check-api-token-tests: runs-on: macOS-13 From 8656f53458a2f0902ece84ed7e83e9cbc6889846 Mon Sep 17 00:00:00 2001 From: brianna Date: Wed, 13 Nov 2024 14:09:22 -0800 Subject: [PATCH 23/26] Revert back to macos-latest runner. --- .github/workflows/integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 7ee22987..ceb4ec06 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -47,7 +47,7 @@ jobs: fi swift-button-functional-test: - runs-on: macOS-14 + runs-on: macos-latest needs: check-pr-body-for-key # Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner. if: ${{ needs.check-pr-body-for-key.outputs.RUN_INTEGRATION == 'yes' && !github.event.pull_request.head.repo.fork }} From d4e948bc5fb2300edaf3dd09cff6d9b45992e0f0 Mon Sep 17 00:00:00 2001 From: brianna Date: Wed, 13 Nov 2024 14:22:03 -0800 Subject: [PATCH 24/26] Update iPhone simulator. --- .github/workflows/unit_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit_tests.yml b/.github/workflows/unit_tests.yml index 0c0536cf..80267b18 100644 --- a/.github/workflows/unit_tests.yml +++ b/.github/workflows/unit_tests.yml @@ -45,7 +45,7 @@ jobs: - sdk: 'macosx' destination: '"platform=OS X,arch=x86_64"' - sdk: 'iphonesimulator' - destination: '"platform=iOS Simulator,name=iPhone 14"' + destination: '"platform=iOS Simulator,name=iPhone 15"' steps: - uses: actions/checkout@v3 - name: Build unit test target From 4680261650262944fa8e73ceafc7490d2a9069fb Mon Sep 17 00:00:00 2001 From: brianna Date: Wed, 13 Nov 2024 19:30:10 -0800 Subject: [PATCH 25/26] Modify result bundle path. --- .github/workflows/integration_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index ceb4ec06..ee53663d 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -78,10 +78,10 @@ jobs: -destination 'platform=iOS Simulator,name=iPhone 15,OS=17.4' \ EMAIL_SECRET=$EMAIL_SECRET \ PASSWORD_SECRET=$PASSWORD_SECRET \ - -resultBundlePath DaysUntilBirthday.xcresult + -resultBundlePath DaysUntilBirthday.xcresult test - name: Upload xcresult file uses: actions/upload-artifact@v4 - if: ${{ failure() }} + if: ${{ always() }} with: name: DaysUntilBirthday-${{ github.run_number }}.xcresult path: DaysUntilBirthday.xcresult From 5b9fa6cb939c8904942959080c354b0b1d2cf19c Mon Sep 17 00:00:00 2001 From: brianna Date: Wed, 13 Nov 2024 19:50:07 -0800 Subject: [PATCH 26/26] Wait for xcresult file. --- .github/workflows/integration_tests.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index ee53663d..484d5f62 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -79,6 +79,8 @@ jobs: EMAIL_SECRET=$EMAIL_SECRET \ PASSWORD_SECRET=$PASSWORD_SECRET \ -resultBundlePath DaysUntilBirthday.xcresult test + - name: Wait for xcresult file + run: sleep 30 - name: Upload xcresult file uses: actions/upload-artifact@v4 if: ${{ always() }}