Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions .github/workflows/browserstack-e2e-android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -146,12 +146,18 @@ jobs:
# across all included modules so the directories are present.
run: |
cd android && ./gradlew \
:ping-identity_rn-binding:generateCodegenArtifactsFromSchema \
:ping-identity_rn-browser:generateCodegenArtifactsFromSchema \
:ping-identity_rn-device-client:generateCodegenArtifactsFromSchema \
:ping-identity_rn-device-id:generateCodegenArtifactsFromSchema \
:ping-identity_rn-device-profile:generateCodegenArtifactsFromSchema \
:ping-identity_rn-external-idp:generateCodegenArtifactsFromSchema \
:ping-identity_rn-fido:generateCodegenArtifactsFromSchema \
:ping-identity_rn-journey:generateCodegenArtifactsFromSchema \
:ping-identity_rn-logger:generateCodegenArtifactsFromSchema \
:ping-identity_rn-oath:generateCodegenArtifactsFromSchema \
:ping-identity_rn-oidc:generateCodegenArtifactsFromSchema \
:ping-identity_rn-push:generateCodegenArtifactsFromSchema \
:ping-identity_rn-storage:generateCodegenArtifactsFromSchema \
:react-native-async-storage_async-storage:generateCodegenArtifactsFromSchema

Expand Down
3 changes: 0 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,10 +104,7 @@ jobs:
secrets: inherit

# Run Android E2E tests on BrowserStack real devices after Android unit tests pass.
# Blocked: BrowserStack cloud driver does not yet support Detox 20.43+.
# Remove the `if false` guard once the upstream fix is released.
browserstack-android:
if: false
needs: android-unit-tests
permissions:
contents: read
Expand Down
Binary file modified .yarn/install-state.gz
Binary file not shown.
9 changes: 2 additions & 7 deletions PingTestRunner/.detoxrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,10 @@ module.exports = {
video: 'failing',
},
},
behavior: {
cleanup: {
shutdownDevice: false,
},
},
testRunner: {
args: {
$0: 'jest',
config: 'e2e/jest.config.js',
maxWorkers: process.env.CI ? 1 : undefined,
},
jest: {
setupTimeout: 300000,
Expand All @@ -44,7 +39,7 @@ module.exports = {
build:
'cd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release',
},
// BrowserStack cloud app — URLs are resolved after uploading binaries to BrowserStack.
// BrowserStack cloud app — IDs are resolved after uploading binaries to BrowserStack.
'android.cloud': {
type: 'android.cloud',
app: process.env.BROWSERSTACK_APP_URL,
Expand Down
6 changes: 6 additions & 0 deletions PingTestRunner/android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,12 @@ android {
proguardFile "${rootProject.projectDir}/../node_modules/detox/android/detox/proguard-rules-app.pro"
}
}
packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
excludes += "/META-INF/versions/9/OSGI-INF/MANIFEST.MF"
}
}
}

dependencies {
Expand Down
4 changes: 4 additions & 0 deletions PingTestRunner/android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,14 @@ include(":ping-identity_rn-browser")
project(":ping-identity_rn-browser").projectDir = file("../../packages/browser/android")
include(":ping-identity_rn-core")
project(":ping-identity_rn-core").projectDir = file("../../packages/core/android")
include(":ping-identity_rn-device-client")
project(":ping-identity_rn-device-client").projectDir = file("../../packages/device-client/android")
include(":ping-identity_rn-device-id")
project(":ping-identity_rn-device-id").projectDir = file("../../packages/device-id/android")
include(":ping-identity_rn-device-profile")
project(":ping-identity_rn-device-profile").projectDir = file("../../packages/device-profile/android")
include(":ping-identity_rn-external-idp")
project(":ping-identity_rn-external-idp").projectDir = file("../../packages/external-idp/android")
include(":ping-identity_rn-fido")
project(":ping-identity_rn-fido").projectDir = file("../../packages/fido/android")
include(":ping-identity_rn-journey")
Expand Down
4 changes: 2 additions & 2 deletions PingTestRunner/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"test:bs:android": "NODE_NO_WARNINGS=1 detox test --configuration android.bs --loglevel trace",
"test:e2e:ios": "sh -c 'export DETOX_SERVER_PORT=${DETOX_SERVER_PORT:-8099}; export NODE_NO_WARNINGS=1; yarn e2e:android:free-detox-port && detox test --configuration ios.sim \"$@\"' --",
"build:e2e:android": "detox build --configuration android.emu",
"build:bs:android": "cd android && ./gradlew assembleRelease assembleAndroidTest -DtestBuildType=release",
"build:bs:android": "cd android && ./gradlew :app:assembleRelease :app:assembleAndroidTest -DtestBuildType=release",
"build:e2e:ios": "detox build --configuration ios.sim",
"build:bs:ios:archive": "sh ./scripts/build-bs-ios-archive.sh",
"build:bs:ios:ipa": "sh ./scripts/build-bs-ios-ipa.sh",
Expand Down Expand Up @@ -63,7 +63,7 @@
"@testing-library/react-native": "^13.3.3",
"@types/jest": "^29.5.14",
"@types/react": "^19.1.0",
"detox": "npm:@browserstack/detox@20.38.0-cloud.1",
"detox": "npm:@browserstack/detox@20.38.0-cloud.3",
"dotenv": "^16.4.7",
"eslint": "^8.19.0",
"jest": "^29.7.0",
Expand Down
10 changes: 5 additions & 5 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6442,9 +6442,9 @@ __metadata:
languageName: node
linkType: hard

"detox@npm:@browserstack/detox@20.38.0-cloud.1":
version: 20.38.0-cloud.1
resolution: "@browserstack/detox@npm:20.38.0-cloud.1"
"detox@npm:@browserstack/detox@20.38.0-cloud.3":
version: 20.38.0-cloud.3
resolution: "@browserstack/detox@npm:20.38.0-cloud.3"
dependencies:
"@wix-pilot/core": "npm:^3.2.2"
"@wix-pilot/detox": "npm:^1.0.11"
Expand Down Expand Up @@ -6490,7 +6490,7 @@ __metadata:
optional: true
bin:
detox: local-cli/cli.js
checksum: 10c0/5f59b76c1b9427132b5b3068cdab5950893b1d98d44f7418d0f2563853d618b62b8db53be762bedf73793f15eb5b51fce75cab62e5aa34bb65773494c18683d3
checksum: 10c0/e49a2c37146b3e6cbf2221fea32b29ace3dda75d6bcaae6a531b3827a1b8a4f99556dd7b858881d4eace49df0db3249c36aa8d786b076cbb05e323eb25e2f39f
languageName: node
linkType: hard

Expand Down Expand Up @@ -12554,7 +12554,7 @@ __metadata:
"@testing-library/react-native": "npm:^13.3.3"
"@types/jest": "npm:^29.5.14"
"@types/react": "npm:^19.1.0"
detox: "npm:@browserstack/detox@20.38.0-cloud.1"
detox: "npm:@browserstack/detox@20.38.0-cloud.3"
dotenv: "npm:^16.4.7"
eslint: "npm:^8.19.0"
jest: "npm:^29.7.0"
Expand Down
Loading