Merge d7c5b54 into 5a6e387

.github/workflows/ui-tests-critical.yml

@@ -0,0 +1,103 @@
+name: UI Tests Critical
+on:
+ push:
+ branches:
+ - main
+
+ pull_request:
+ paths:
+ - 'Sources/**'
+ - '.github/workflows/ui-tests-critical.yml'
+ - 'fastlane/**'
+ - 'TestSamples/**'
+
+# https://docs.github.com/en/actions/using-jobs/using-concurrency#example-using-a-fallback-value
+concurrency:
+ group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+ cancel-in-progress: true
+
+jobs:
+ build-sample:
+ name: Build SwiftUITestSample Sample
+ runs-on: macos-14
+ steps:
+ - uses: actions/checkout@v4
+ - run: ./scripts/ci-select-xcode.sh 16
+ - uses: ruby/setup-ruby@v1
+ with:
+ bundler-cache: true
+ - run: bundle exec fastlane build_ios_swift_ui_test_sample
+ - uses: actions/upload-artifact@v4
+ with:
+ name: SwiftUITestSample
+ path: TestSamples/SwiftUITestSample/DerivedData/Build/Products/Debug-iphonesimulator/SwiftUITestSample.app
+
+ run-tests:
+ name: Test iOS ${{matrix.os-version}} on ${{matrix.device}} Simulator
+ needs: [build-sample]
+ runs-on: ${{matrix.runs-on}}
+ env:
+ APP_ARTIFACT_NAME: "SwiftUITestSample"
+ APP_PATH: "Sample.app"
+
+ MAESTRO_FLOWS_PATH: "TestSamples/SwiftUITestSample/Maestro"
+ MAESTRO_LOGS_PATH: "MaestroLogs"
+
+ # https://github.com/facebook/react-native/blob/24e7f7d25629a7af6d877a0b79fed2faaab96437/.github/actions/maestro-ios/action.yml#L57
+ MAESTRO_DRIVER_STARTUP_TIMEOUT: 1500000 # 25 min, CI can be slow at times
+ strategy:
+ fail-fast: false
+ matrix:
+ include:
+ - runs-on: macos-12
+ xcode: "13.4.1"
+ device: "iPhone 8"
+ os-version: "15.5"
+ create-simulator: true
+ - runs-on: macos-13
+ xcode: "14.3.1"
+ device: "iPhone 14"
+ os-version: "16.4"
+ create-simulator: true
+ - runs-on: macos-14-xlarge
+ # on macos-14 the iOS 17.5 simulator was unstable
+ # crashing and failing all UI tests
+ # iOS 15.5, 16.4 and 18.1 worked on the base runners
+ xcode: "15.4"
+ device: "iPhone 15"
+ os-version: "17.5"
+ - runs-on: macos-15
+ xcode: "16"
+ device: "iPhone 16"
+ os-version: "18.1"
+
+ steps:
+ - uses: actions/checkout@v4
+ - name: Create ${{matrix.device}} (${{matrix.os-version}}) Simulator using Xcode ${{matrix.xcode}}
+ if: ${{matrix.create-simulator}}
+ run: ./scripts/create-simulator.sh "${{matrix.xcode}}" "${{matrix.os-version}}" "${{matrix.device}}"
+ - name: Install Maestro
+ run: brew tap mobile-dev-inc/tap && brew install mobile-dev-inc/tap/maestro@1.38
+ - name: Install iDB Companion
+ run: brew tap facebook/fb && brew install facebook/fb/idb-companion
+
+ - uses: actions/download-artifact@v4
+ with:
+ name: ${{env.APP_ARTIFACT_NAME}}
+ path: ${{env.APP_PATH}}
+ - uses: futureware-tech/simulator-action@bfa03d93ec9de6dacb0c5553bbf8da8afc6c2ee9 # pin@v3
+ with:
+ model: ${{matrix.device}}
+ os_version: ${{matrix.os-version}}
+ - name: Run Maestro Flows
+ run: |
+ xcrun simctl install booted ${{env.APP_PATH}}
+
+ maestro test ${{env.MAESTRO_FLOWS_PATH}} --format junit --debug-output ${{env.MAESTRO_LOGS_PATH}}
+
+ - name: Store Maestro Logs
+ uses: actions/upload-artifact@v4
+ if: failure()
+ with:
+ name: maestro-logs-${{matrix.device}}-${{matrix.os-version}}
+ path: ${{env.MAESTRO_LOGS_PATH}}

.github/workflows/ui-tests.yml

@@ -79,9 +79,9 @@ jobs:
  path: |
  ~/Library/Logs/scan/*.log
  ./fastlane/test_output/**
- 
- ios-swift-ui-tests:
- name: iOS-Swift UI Tests ${{matrix.device}}
+
+ ui-tests-swift:
+ name: UI Tests for iOS-Swift ${{matrix.device}} Simulator
  runs-on: ${{matrix.runs-on}}
  strategy:
  fail-fast: false
@@ -105,10 +105,10 @@ jobs:
 
  - name: Create iOS 16.4 simulator
  if: ${{ matrix.device == 'iPhone 14 (16.4)' }}
- run: ./scripts/create-simulator.sh 14.3.1 16.4 16-4
+ run: ./scripts/create-simulator.sh 14.3.1 16.4 "iPhone 14"
 
  - name: Run Fastlane
- run: fastlane ui_tests_ios_swift device:"${{matrix.device}}" 
+ run: fastlane ui_tests_ios_swift device:"${{matrix.device}}"
 
  - name: Archiving Raw Test Logs
  uses: actions/upload-artifact@v4

.pre-commit-config.yaml

@@ -11,7 +11,7 @@ repos:
  fail_fast: true
  args:
  - "check-versions"
- 
+
  - repo: https://github.com/pre-commit/pre-commit-hooks
  rev: v4.3.0
  hooks:
@@ -20,6 +20,7 @@ repos:
  - id: check-symlinks
  - id: check-xml
  - id: check-yaml
+ args: [--allow-multiple-documents]
  - id: detect-private-key
  - id: end-of-file-fixer
  - id: no-commit-to-branch
@@ -30,7 +31,7 @@ repos:
  - id: check-github-actions
  - id: check-github-workflows
  args: [--verbose]
- 
+
  - repo: https://github.com/shellcheck-py/shellcheck-py
  rev: v0.10.0.1
  hooks:
@@ -45,7 +46,7 @@ repos:
  types_or: ["objective-c", "objective-c++", "c", "c++"]
  args:
  - "format-clang"
- 
+
  - id: format-swift
  name: Format Swift
  entry: make

Brewfile

@@ -5,3 +5,7 @@ brew 'rbenv'
 brew 'pre-commit'
 brew 'python3'
 brew 'jq'
+tap 'facebook/fb'
+brew 'facebook/fb/idb-companion'
+tap 'mobile-dev-inc/tap'
+brew 'mobile-dev-inc/tap/maestro'

Brewfile.lock.json

@@ -278,6 +278,22 @@
  }
  }
  }
+ },
+ "facebook/fb/idb-companion": {
+ "version": "1.1.8",
+ "bottle": false
+ },
+ "mobile-dev-inc/tap/maestro": {
+ "version": "1.38.1",
+ "bottle": false
+ }
+ },
+ "tap": {
+ "facebook/fb": {
+ "revision": "c0386793f59da10c619787f2aa18d938ef1d69c9"
+ },
+ "mobile-dev-inc/tap": {
+ "revision": "14a5d2ab054e7829e8028e827d35a2cc3156a4a0"
  }
  }
  },

Makefile

@@ -44,6 +44,15 @@ run-test-server:
  cd ./test-server && swift run &
 .PHONY: run-test-server
 
+test-alamofire:
+ ./scripts/test-alamofire.sh
+
+test-homekit:
+ ./scripts/test-homekit.sh
+
+test-ui-critical:
+ ./scripts/test-ui-critical.sh
+
 analyze:
  rm -rf analyzer
  xcodebuild analyze -workspace Sentry.xcworkspace -scheme Sentry -configuration Release CLANG_ANALYZER_OUTPUT=html CLANG_ANALYZER_OUTPUT_DIR=analyzer -destination "platform=iOS Simulator,OS=latest,name=iPhone 11" CODE_SIGNING_ALLOWED="NO" | xcpretty -t && [[ -z `find analyzer -name "*.html"` ]]

TestSamples/.swiftlint.yml

@@ -0,0 +1,4 @@
+parent_config: ../.swiftlint.yml
+
+disabled_rules:
+ - force_unwrapping

TestSamples/SwiftUITestSample/.gitignore

@@ -0,0 +1 @@
+MaestroLogs/

TestSamples/SwiftUITestSample/Maestro/corruptEnvelope.yaml

@@ -0,0 +1,11 @@
+appId: io.sentry.tests.SwiftUITestSample
+---
+- launchApp
+- tapOn: "Write Corrupted Envelope"
+# The close here ensures the next corrupted envelope
+# will be present on the next app launch
+- tapOn: "Close SDK"
+- tapOn: "Write Corrupted Envelope"
+- stopApp
+- launchApp
+- assertVisible: "Welcome!"

TestSamples/SwiftUITestSample/Maestro/crash.yaml

@@ -0,0 +1,6 @@
+appId: io.sentry.tests.SwiftUITestSample
+---
+- launchApp
+- tapOn: "Crash"
+- launchApp
+- assertVisible: "Welcome!"