test(e2e): Phase 2 verte — S2/S5/S6/S7 débloqués, fixes #136 couverts, CI E2E fiabilisée

[kherembourg]

Objectif

Rendre la Phase 2 E2E du SDK Flutter v6 verte et fiable : couverture des fixes Go/No-Go (PR #136), déblocage des scénarios S2/S5/S6/S7, et fiabilisation des jobs CI E2E (hang Android résolu à la racine).

Nouvelles suites (toutes en hard gate CI)

Suite	Plateforme	Scénario couvert
modal_dismissible_ios_test.dart	iOS	Fix M1 : modal(dismissible:false) ignore le swipe + couverture du swipe interactif (dismissible:true)
re_display_test.dart / re_display_ios_test.dart	Android + iOS	Fix M2 : le re-display d'un handle préchargé garde la source (identité re-parsée du natif + cross-check event-stream)
flow_dismiss_test.dart / flow_dismiss_ios_test.dart	Android + iOS	S2 : display + dismiss d'un Flow (integration_test_flow, flow integration_test_v_1, preuve preload + PLYPresentation.flowId)
interceptor_actions_ios_test.dart	iOS	S5/S6 : tap réel sur un bouton Navigate, PLYInterceptResult.failed vs .notHandled, outcomes distincts (AppLifecycleState), ordre des callbacks asserté
purchase_restore_ios_test.dart + Configuration.storekit + host RunnerIntegrationTests	iOS	S7 : achat StoreKit local (.purchased) + restore — voir « Limites »
purchase_restore_android_test.dart	Android	S7 : dégradation propre prouvée sans Play Store (restore timeout 15 s net, jamais de hang)

Durcissement des suites existantes

• helpers/e2e_start.dart : retry 3× + backoff sur erreurs réseau/TLS uniquement (flake TLS de start() en CI), adopté par les 22 suites.
• deeplink_cold_start_test.dart : assertion explicite PRESENTATION_OPENED ABSENT ; ordre DEEPLINK_OPENED/PRESENTATION_LOADED volontairement non contraint (divergence iOS/Android).
• inline_paywall_test.dart : suite orpheline désormais câblée en CI.

CI (e2e-android.yml, e2e-ios.yml, ci_run_e2e*.sh)

• Fix racine du hang E2E Android : flutter-version 3.24.x → 3.44.0 (post-AGP 9/chore(android): validate Flutter 3.44 with AGP 9 #130, compileGroovy échouait en 7 s mais integration_test attendait son timeout de 12 min ×3 → job tué à 60 min).
• Watchdog par tentative (600 s, kill du groupe de process, compatible ubuntu + macos), le retry ×3 couvre aussi les timeouts ; marqueurs ::group::SUITE <name> attempt <n> + code retour + durée pour rendre tout futur hang diagnosticable.
• Tout est hard gate : le modèle best-effort (warning silencieux) est supprimé. Unique exception, étroite et bruyante : la suite StoreKit n'est non-gating QUE si toutes ses tentatives échouées matchent la signature du bug Apple FB22237318 — tout autre échec gate.
• Zéro || true / continue-on-error ajouté (et purge de ceux des scripts touchés).
• 5 wrappers drivers (dont sync log-driven S5→S6 et re-foreground post-Safari pour interceptor_actions).

Preuves locales (sweep complet post-rebase)

• Android : 12/12 PASS, gate fail=0 (5 m 33, tentative 1 partout).
• iOS : 11/14 PASS (12 m 21) ; storekit → marqueur explicite S7-iOS BLOCKED (Apple FB22237318) non-gating (comportement conçu) ; modal_dismissible (test dismissible:true) FAIL 3/3 local → arbitrage CI (sim iOS 26.5 local suspect, couche Flutter innocentée par revue de la sérialisation) ; interceptor_actions → bug driver corrigé dans cette PR (ellipse Unicode + $SUITE_LOG non bracé sous set -u).

Limites connues (dites honnêtement)

• S7 iOS : le .purchased n'a jamais été observé sur la machine locale — bug Apple ouvert (SKTestSession SKInternalErrorDomain Code=3, FB22237318, Xcode 26.5+, reproduit dans [Only on 26.3/26.4][in_app_purchase_storekit] iOS native tests failing with timeouts, SKInternalErrorDomain, and crashes flutter/flutter#184678). La suite est câblée et stricte (aucun échappatoire fake-green) ; le runner CI (Xcode plus ancien) peut ne pas être affecté.
• S7 Android : achat réel structurellement non testable sur émulateur sans Play Store — couvert par la preuve de dégradation propre.
• Gaps bridge documentés (candidats follow-ups) : onPresented réassigné sur handle post-preload ignoré ; PLYEventProperties sans champs flow ; fallback _outcomeFromMap sur l'objet caché.

Résultats CI sur le HEAD (6cd504d)

Workflow	Run	Résultat
E2E iOS	29778281515	✅ 14/14 suites — dont storekit-ios PASS tentative 1 : le Xcode du runner n'est pas affecté par FB22237318, S7 iOS est donc réellement prouvé en CI (.purchased + restore). modal-dismissible PASS (arbitrage : le FAIL local était la flakiness sim 26.5). dismiss-ios vert en tentative 2 (retry nominal).
E2E Android	29781770765	✅ 12/12 suites, tentative 1, gate fail=0 — après correction d'une cause CI-only : un dialogue ANR du launcher restait au premier plan de l'AVD froide et volait tous les inputs uiautomator (prouvé par IDs de fenêtres identiques inter-suites) ; les drivers force-stoppent désormais le package ANR à chaque poll.
CI (standard)	29780876701	✅

🤖 Generated with Claude Code

[greptile-apps]

Greptile Summary

This PR delivers Phase 2 of the Flutter SDK v6 E2E suite by unlocking scenarios S2/S5/S6/S7, hardening the CI runners (watchdog, all-hard-gate model, Flutter 3.44.0 to fix the AGP9 hang), and adding six new test suites with their host-side drivers. It resolves the root cause of the Android E2E job hang and adds a StoreKitTest-backed XCUITest target for real local StoreKit2 purchase+restore coverage.

• New suites (modal_dismissible, re_display, flow_dismiss, interceptor_actions, purchase_restore on both platforms): all wired as hard gates, backed by startWithRetry (network-error-only retry) and the new per-attempt 600 s watchdog.
• CI hardening: run_with_timeout (portable watchdog, process-group kill), --reporter expanded unified across both platforms, ANR-clearing in Android drivers (clear_stuck_anr), and the StoreKit non-gating path scoped strictly to the documented Apple bug signature (FB22237318).
• Dart result-marker gate for the StoreKit suite: run_storekit_suite_ios.sh gates on S7-IOS-RESULT: PASS in the simulator unified log, not on xcodebuild's exit code alone, preventing false-green from xcodebuild exiting 0 while Dart assertions silently fail.

Confidence Score: 5/5

Safe to merge — the changes are test infrastructure only (no production code path is touched) and CI results confirm 12/12 Android and 14/14 iOS suites green on the head commit.

All changed files are E2E test code, CI scripts, and Xcode test targets. The watchdog, hard-gate promotion, StoreKit Dart-marker gate, and ANR-clearing mechanisms are well-reasoned and backed by observed CI runs. The one noteworthy finding — misleading manual run instructions in purchase_restore_ios_test.dart — affects only developers running the test by hand, not CI correctness.

purchase_restore_ios_test.dart header comment (manual run instructions reference a background idb driver that no longer applies now that RunnerIntegrationTests.m handles the CTA tap internally).

Important Files Changed

Filename	Overview
purchasely/example/integration_test/tools/ci_run_e2e.sh	Rewritten to all-hard-gate model with portable run_with_timeout watchdog, --reporter expanded, ANR-clear preamble, and 4 new suites (inline_paywall, re_display, flow_dismiss, purchase_restore_android). Logic is sound.
purchasely/example/integration_test/tools/ci_run_e2e_ios.sh	iOS runner extended to 14 suites with same watchdog/hard-gate model; StoreKit Apple-bug exception logic (storekit_apple_sig vs storekit_other_failure) is correctly scoped to all-Apple-only failure runs.
purchasely/example/integration_test/tools/run_storekit_suite_ios.sh	Dart-marker-authoritative gate correctly requires both xcodebuild exit 0 AND S7-IOS-RESULT: PASS in the simulator unified log; log show fallback handles log stream buffering races.
purchasely/example/integration_test/helpers/e2e_start.dart	startWithRetry correctly gates retries on network-ish error substrings only; 180 s backstop timeout deliberately not classified as retryable to surface genuine hangs.
purchasely/example/integration_test/purchase_restore_ios_test.dart	S7-IOS-RESULT marker mechanism correctly uses _completedTests++ as last line of test body; manual run instructions in header still reference tap_purchase_ios.sh alongside xcodebuild, which silently fails now that RunnerIntegrationTests.m owns the CTA tap.
purchasely/example/ios/RunnerIntegrationTests/RunnerIntegrationTests.m	SKTestSession setup, CTA tap via XCUITest, and 420 s poll with XCTFail are correctly wired; disableDialogs eliminates SpringBoard confirmation sheet dependency.
purchasely/example/integration_test/interceptor_actions_ios_test.dart	S5/S6 correctly distinguish failed vs notHandled via AppLifecycleState transitions; load-proof assertion on presentation.type prevents silent fallback to bundled screen.
purchasely/example/integration_test/purchase_restore_android_test.dart	Honest-degradation suite: proves interceptor fires, then asserts restore fast-fails (≤20 s) without a real Play Store; all three outcome paths (resolved/timeout/PlatformException) are caught and asserted.
.github/workflows/e2e-android.yml	Flutter 3.44.0 pin fixes the AGP9/compileGroovy hang; step-level 50-min ceiling preserves log upload even on worst-case retry exhaustion.
.github/workflows/e2e-ios.yml	Mirrors Android workflow with 50-min step ceiling; branch trigger extended to feat/sdk-v6-migration to gate the current migration branch.

Sequence Diagram

%%{init: {'theme': 'neutral'}}%%
sequenceDiagram
    participant CI as GitHub Actions
    participant Script as ci_run_e2e_ios.sh
    participant RWT as run_with_timeout
    participant FT as flutter test
    participant Driver as Driver script
    participant Sim as iOS Simulator

    CI->>Script: bash ci_run_e2e_ios.sh udid
    loop Each suite (1-13)
        Script->>Driver: "bash driver.sh udid &"
        Script->>RWT: run_with_timeout flutter test
        RWT->>FT: flutter test (set -m own PGID)
        FT->>Sim: install + launch app
        Driver->>Sim: idb tap / xcrun simctl launch
        Sim-->>FT: Dart callbacks / events
        FT-->>RWT: exit 0 or non-zero
        alt timeout (600 s)
            RWT->>FT: kill -TERM PGID then kill -KILL PGID
            RWT-->>Script: exit 124
        else pass
            RWT-->>Script: exit 0
        end
        Script->>Driver: kill driver PID
    end

    Note over Script: Suite 14 StoreKit special path
    Script->>RWT: run_with_timeout bash run_storekit_suite_ios.sh udid
    RWT->>Script: xcodebuild test RunnerIntegrationTests
    Script->>Sim: xcrun simctl spawn log stream flutter
    Sim-->>Script: S7-IOS-RESULT PASS or FAIL
    alt xcodebuild exit 0 AND PASS marker
        Script-->>CI: exit 0
    else Apple FB22237318 signature only
        Script-->>CI: warning S7-iOS BLOCKED non-gating
    else other failure
        Script-->>CI: exit 1 gate
    end

Loading

%%{init: {'theme': 'base', 'themeVariables': {"darkMode": true, "background": "#0d1117", "primaryColor": "#21262d", "primaryTextColor": "#e6edf3", "primaryBorderColor": "#8b949e", "lineColor": "#8b949e", "textColor": "#e6edf3", "edgeLabelBackground": "#161b22", "actorBkg": "#21262d", "actorBorder": "#8b949e", "actorTextColor": "#e6edf3", "actorLineColor": "#8b949e", "signalColor": "#8b949e", "signalTextColor": "#e6edf3", "noteBkgColor": "#373320", "noteBorderColor": "#d4a72c", "noteTextColor": "#f0e6c0", "labelBoxBkgColor": "#21262d", "labelBoxBorderColor": "#8b949e", "labelTextColor": "#e6edf3", "loopTextColor": "#e6edf3", "activationBkgColor": "#30363d", "activationBorderColor": "#8b949e"}}}%%
sequenceDiagram
    participant CI as GitHub Actions
    participant Script as ci_run_e2e_ios.sh
    participant RWT as run_with_timeout
    participant FT as flutter test
    participant Driver as Driver script
    participant Sim as iOS Simulator

    CI->>Script: bash ci_run_e2e_ios.sh udid
    loop Each suite (1-13)
        Script->>Driver: "bash driver.sh udid &"
        Script->>RWT: run_with_timeout flutter test
        RWT->>FT: flutter test (set -m own PGID)
        FT->>Sim: install + launch app
        Driver->>Sim: idb tap / xcrun simctl launch
        Sim-->>FT: Dart callbacks / events
        FT-->>RWT: exit 0 or non-zero
        alt timeout (600 s)
            RWT->>FT: kill -TERM PGID then kill -KILL PGID
            RWT-->>Script: exit 124
        else pass
            RWT-->>Script: exit 0
        end
        Script->>Driver: kill driver PID
    end

    Note over Script: Suite 14 StoreKit special path
    Script->>RWT: run_with_timeout bash run_storekit_suite_ios.sh udid
    RWT->>Script: xcodebuild test RunnerIntegrationTests
    Script->>Sim: xcrun simctl spawn log stream flutter
    Sim-->>Script: S7-IOS-RESULT PASS or FAIL
    alt xcodebuild exit 0 AND PASS marker
        Script-->>CI: exit 0
    else Apple FB22237318 signature only
        Script-->>CI: warning S7-iOS BLOCKED non-gating
    else other failure
        Script-->>CI: exit 1 gate
    end

Loading

_{Reviews (2): Last reviewed commit: "fix(e2e): make iOS review gates reliable" | Re-trigger Greptile}

[Copilot]

Pull request overview

This PR expands and hardens the Flutter SDK v6 E2E test coverage (new Phase 2 suites for S2/S5/S6/S7 and regression guards for fixes from #136) while making CI E2E runs more reliable and diagnosable (portable per-attempt watchdog, retries, and stricter hard-gating).

Changes:

• Added new Android+iOS E2E suites for flow dismiss (S2), action interceptor outcomes (S5/S6), re-display source preservation (M2), modal swipe dismiss behavior (M1), and purchase/restore coverage (S7).
• Introduced shared startWithRetry() to reduce CI flakes from transient network/TLS failures during Purchasely.start().
• Reworked CI E2E runners/scripts to be hard-gated with per-attempt watchdogs and improved diagnostics; updated workflows (notably Flutter 3.44.0 for AGP9 compatibility on Android).

Reviewed changes

Copilot reviewed 43 out of 43 changed files in this pull request and generated 3 comments.

Show a summary per file

File	Description
purchasely/example/ios/RunnerIntegrationTests/RunnerIntegrationTests.m	Adds a host UI test bundle to launch the app under SKTestSession for StoreKit E2E.
purchasely/example/ios/RunnerIntegrationTests/Info.plist	Adds Info.plist for the new RunnerIntegrationTests target.
purchasely/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme	Wires RunnerIntegrationTests into the scheme and attaches the StoreKit configuration reference.
purchasely/example/ios/Runner.xcodeproj/project.pbxproj	Adds the RunnerIntegrationTests target and includes Configuration.storekit as a resource.
purchasely/example/ios/Configuration.storekit	Defines local StoreKit products for S7 iOS purchase/restore testing.
purchasely/example/integration_test/helpers/e2e_start.dart	Adds startWithRetry() helper used by multiple suites.
purchasely/example/integration_test/user_attribute_listener_test.dart	Switches SDK start to startWithRetry().
purchasely/example/integration_test/local_dismiss_handler_test.dart	Switches SDK start to startWithRetry().
purchasely/example/integration_test/local_dismiss_handler_ios_test.dart	Switches SDK start to startWithRetry().
purchasely/example/integration_test/interceptor_trigger_test.dart	Switches SDK start to startWithRetry().
purchasely/example/integration_test/interceptor_trigger_ios_test.dart	Switches SDK start to startWithRetry().
purchasely/example/integration_test/inline_paywall_test.dart	Switches SDK start to startWithRetry().
purchasely/example/integration_test/inline_events_test.dart	Switches SDK start to startWithRetry().
purchasely/example/integration_test/default_dismiss_handler_test.dart	Switches SDK start to startWithRetry().
purchasely/example/integration_test/default_dismiss_handler_ios_test.dart	Switches SDK start to startWithRetry().
purchasely/example/integration_test/default_dismiss_via_display_test.dart	Switches SDK start to startWithRetry().
purchasely/example/integration_test/default_dismiss_via_display_ios_test.dart	Switches SDK start to startWithRetry().
purchasely/example/integration_test/deeplink_cold_start_test.dart	Strengthens event assertions and switches SDK start to startWithRetry().
purchasely/example/integration_test/dart_android_bridge_test.dart	Switches SDK start to startWithRetry().
purchasely/example/integration_test/dart_ios_bridge_test.dart	Updates comments + switches SDK start to startWithRetry().
purchasely/example/integration_test/re_display_test.dart	New Android suite guarding M2 (re-display preserves original source).
purchasely/example/integration_test/re_display_ios_test.dart	New iOS mirror suite guarding M2 (re-display preserves original source).
purchasely/example/integration_test/flow_dismiss_test.dart	New Android suite for S2 (flow display + dismiss).
purchasely/example/integration_test/flow_dismiss_ios_test.dart	New iOS mirror suite for S2 (flow display + dismiss).
purchasely/example/integration_test/modal_dismissible_ios_test.dart	New iOS suite guarding M1 and exercising swipe-dismiss for dismissible modals.
purchasely/example/integration_test/interceptor_actions_ios_test.dart	New iOS suite for S5/S6 (navigate action interceptor failed vs notHandled).
purchasely/example/integration_test/purchase_restore_ios_test.dart	New iOS suite for S7 (local StoreKit purchase + restore).
purchasely/example/integration_test/purchase_restore_android_test.dart	New Android “honest degradation” S7 suite (no Play Store).
purchasely/example/integration_test/tools/ci_run_e2e.sh	Makes all Android suites hard-gated; adds watchdog and improved diagnostics.
purchasely/example/integration_test/tools/ci_run_e2e_ios.sh	Makes all iOS suites hard-gated with StoreKit Apple-bug exception logic + watchdog.
purchasely/example/integration_test/tools/run_storekit_suite_ios.sh	New StoreKit iOS runner (xcodebuild + simulator log capture).
purchasely/example/integration_test/tools/tap_purchase.sh	Adds ANR-dialog recovery to reduce CI flakiness.
purchasely/example/integration_test/tools/press_back.sh	Adds ANR-dialog recovery to reduce CI flakiness.
purchasely/example/integration_test/tools/tap_content_desc.sh	New generalized Android UI driver for content-desc substring taps.
purchasely/example/integration_test/tools/flow_close_all.sh	New wrapper driver to tap action:close_all for flow dismiss on Android.
purchasely/example/integration_test/tools/re_display_driver.sh	New Android driver wrapper to close paywall twice for re-display suite.
purchasely/example/integration_test/tools/re_display_driver_ios.sh	New iOS driver wrapper to close paywall twice for re-display suite.
purchasely/example/integration_test/tools/tap_label_ios.sh	New generalized iOS idb driver to tap elements by AXLabel.
purchasely/example/integration_test/tools/swipe_dismiss_ios.sh	New iOS driver to send a fixed number of interactive swipe-down gestures.
purchasely/example/integration_test/tools/modal_dismissible_driver_ios.sh	New iOS driver wrapper to run swipe-dismiss twice for modal dismissible suite.
purchasely/example/integration_test/tools/interceptor_actions_driver_ios.sh	New iOS driver coordinating two “Login” taps with log-driven synchronization + re-foreground.
.github/workflows/e2e-android.yml	Updates Flutter version to 3.44.0 and adds step-level timeout.
.github/workflows/e2e-ios.yml	Adds step-level timeout to preserve diagnostics on failures/hangs.

---

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

[macminisupport]

@greptileai review

[kherembourg]

Review avant merge — à merger, avec une réserve

Contenu vérifié et toujours pertinent malgré les 6 semaines : 0 commit de retard sur main, 11/11 verte, et le fond est réel — suites 4→8 promues de best-effort à HARD gate (les drivers UI ont donc été fiabilisés), 4 nouvelles suites (inline render, re-display source PR #136 M2, Flow S2, purchase/restore S7), 14 fichiers de test ajoutés, un helpers/e2e_start.dart, une Configuration.storekit et une cible RunnerIntegrationTests.

⚠️ Une régression à ne pas embarquer : la suppression du trigger pull_request

Cette PR retire on: pull_request de e2e-android.yml et e2e-ios.yml, laissant workflow_dispatch + nightly.

La justification d'origine se tient pour l'époque (« while the v6 migration is in flight »), mais l'expérience depuis dit le contraire. Sur #153, l'E2E déclenchée sur PR a attrapé deux choses qu'aucun test unitaire ne voyait :

• un échec déterministe 3/3 dû à appHandlesRedemptionAlert non passé à true — invisible en local, invisible en unitaire ;
• la preuve que proxy(null) et anonymousUserId fonctionnent réellement contre le backend.

Sans le trigger PR, ces deux-là ne se voient qu'après le merge, sur le nightly. Je propose de garder on: pull_request sur les deux workflows lors du rebase. Le passage du cron à 05:00 UTC et tout le reste, je le garde tel quel.

Conflit attendu, et une redondance amusante

3 fichiers en collision avec #153 : e2e-android.yml, ci_run_e2e.sh, ci_run_e2e_ios.sh.

Sur e2e-android.yml la collision est une redondance : cette PR contient déjà le bump 3.24.x → 3.44.0 avec exactement le même diagnostic que celui que j'ai posé dans #153 (flutter.groovy importe groovy.xml.QName, que Gradle 9 n'expose plus ; échec masqué par le timeout de 12 min de flutter_tools ; « le seul workflow que #130 a oublié »). J'ai rediagnostiqué de zéro un fix qui dormait ici depuis six semaines — l'E2E Android était rouge chaque nuit sur main pendant tout ce temps alors que le correctif existait déjà.

Sur les deux ci_run_e2e*.sh c'est une vraie collision de numérotation : cette PR va à 12 suites, #153 à 10. Je rebase et je renumérote à 14 après le merge de #153.

Plan : #153 d'abord (release, quasi verte), puis rebase de celle-ci avec le trigger pull_request conservé et les suites renumérotées, revérification CI, puis merge.

[kherembourg]

Diagnostic du check rouge — ce n'était pas une suite qui échoue

E2E iOS a rapporté un échec sur Batch 8/9: 6.1.0 identity + cleared proxy + redemption listener. La log de suite téléchargée depuis l'artefact ne contient que :

00:00 +0: loading .../redemption_identity_test.dart
Warning: Missing build name (CFBundleShortVersionString).

Puis rien pendant 600 s. L'app n'a jamais démarré — pas un setUpAll qui échoue, pas une assertion qui casse. C'est le flake de lancement sur simulateur déjà documenté, et le retry est là pour l'absorber : Batch 1 a pris exactement le même timeout de 600 s sur ce run et est passé à l'attempt 2 en 183 s.

Ce qui a réellement échoué, c'est le mur de temps :

Batches 1–7	16:34 → 16:57 = 23 min (dont un retry sur Batch 1)
Batch 8 attempt 1	16:57 → 17:07 = 10 min (timeout, app jamais lancée)
Batch 8 attempt 2	démarre 17:08, coupée par le cap de 60 min du job
Batch 9	jamais atteinte

Donc une suite qui passe ailleurs a été rapportée comme rouge parce qu'on ne l'a jamais laissée finir. Preuve indépendante : ces deux suites sont vertes 9/9 sur main (iOS et Android, backend réel) et 9/9 en local sur émulateur dédié.

Correctif : timeout-minutes 60 → 90 (d3c3064)

Cette branche a consolidé 12 suites iOS en 7 batches précisément pour tenir dans 60 minutes ; #153 en a ajouté deux. Un seul flake de lancement coûte 600 s + un retry, et un tel retry sur un batch précoce suffit à épuiser le budget avant la dernière suite. 90 minutes redonnent au retry la marge pour faire son travail au lieu d'être tronqué par le cap.

Même cap relevé côté Android par symétrie — il fait maintenant tourner 14 suites.

Rien changé aux suites elles-mêmes.