From 096a975688a20a83f16e13b136e9871656672749 Mon Sep 17 00:00:00 2001 From: awei Date: Wed, 29 Jul 2026 14:52:17 +0800 Subject: [PATCH 1/2] =?UTF-8?q?test(customer):=20=E6=95=91=E5=9B=9E?= =?UTF-8?q?=E6=8E=A5=E6=89=8B=E6=97=A2=E6=9C=89=E8=A8=82=E5=96=AE=E7=9A=84?= =?UTF-8?q?=E4=B8=89=E5=80=8B=E9=82=8A=E7=95=8C=EF=BC=88=E4=BE=86=E8=87=AA?= =?UTF-8?q?=E8=A2=AB=E5=8F=96=E4=BB=A3=E7=9A=84=20PR=20#60=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 關掉重複 PR 前逐檔比對,發現 #60 的 customer_place_order_timeout_test 裡有三條 main 完全沒有的斷言:接手時要一併帶出司機資訊(否則乘客會先看到一段假的「配對中」, 司機可能已經在門口)、對帳本身失敗時要維持原錯誤、後端回終態訂單時不算數 (把已完成的上一趟接手過來,乘客會盯著一張永遠不會動的行程)。 反向確認:拿掉 _applyActiveRide 與 isTerminal 判斷後,這三案中有 2 案 FAIL (第三案「對帳失敗」由既有 catch 覆蓋,仍保留以釘住行為)。 Co-Authored-By: Claude Opus 5 --- test/customer_create_conflict_test.dart | 71 ++++++++++++++++++++++++- 1 file changed, 70 insertions(+), 1 deletion(-) diff --git a/test/customer_create_conflict_test.dart b/test/customer_create_conflict_test.dart index f91ba30..1db495e 100644 --- a/test/customer_create_conflict_test.dart +++ b/test/customer_create_conflict_test.dart @@ -68,6 +68,67 @@ void main() { expect(ctrl.error, '已有進行中的訂單'); }); + test('接手時連司機資訊一起帶出來(不必等下一輪輪詢)', () async { + // 建單失敗到接手之間可能已經被司機接走了。少了這一步,乘客會先看到一段 + // 「配對中」的假象,直到 15 秒後的輪詢才冒出司機——而司機可能已經在門口。 + // 司機欄在後端是**扁平鍵**(與 WS payload 同一組),不是巢狀物件。 + final api = _ConflictApi() + ..active = CustomerRide.fromJson(const { + 'id': 33, + 'status': RideStatus.accepted, + 'pickup_address': '台北車站', + 'driver_name': '阿明', + 'driver_phone': '0912345678', + 'driver_vehicle_type': 'sedan', + 'driver_plate_number': 'ABC-1234', + }); + final ctrl = await _customer(api); + addTearDown(ctrl.dispose); + + await ctrl.handleCreateFailure( + ApiException('已有進行中的訂單', statusCode: 409), + ); + + expect(ctrl.activeRide?.rideId, 33); + expect(ctrl.driverName, '阿明'); + expect(ctrl.driverInfo?.plateNumber, 'ABC-1234', + reason: '路邊要對車牌,這是這張卡存在的理由'); + expect(ctrl.driverInfo?.phone, '0912345678'); + }); + + test('對帳本身也失敗(網路仍不通)→ 維持原本的錯誤,不編故事', () async { + final api = _ConflictApi() + ..activeError = ApiException('無法連線到伺服器,請檢查網路'); + final ctrl = await _customer(api); + addTearDown(ctrl.dispose); + + await ctrl.handleCreateFailure( + ApiException('已有進行中的訂單', statusCode: 409), + ); + + expect(ctrl.activeRide, isNull); + expect(ctrl.error, '已有進行中的訂單', reason: '問不到就維持原訊息,不可假裝接手成功'); + }); + + test('後端回的是終態訂單 → 不算數(剛結束的上一趟不能變成這一趟)', () async { + final api = _ConflictApi() + ..active = CustomerRide.fromJson(const { + 'id': 34, + 'status': RideStatus.completed, + 'pickup_address': '上一趟', + }); + final ctrl = await _customer(api); + addTearDown(ctrl.dispose); + + await ctrl.handleCreateFailure( + ApiException('已有進行中的訂單', statusCode: 409), + ); + + expect(ctrl.activeRide, isNull, + reason: '把已完成的上一趟接手過來,乘客會盯著一張永遠不會動的行程'); + expect(ctrl.error, '已有進行中的訂單'); + }); + test('其他有狀態碼的拒絕(如 429 限流)仍不對帳', () async { final api = _ConflictApi() ..active = CustomerRide.fromJson(const { @@ -104,7 +165,9 @@ class _ConflictApi extends CustomerApiClient { : super(dio: Dio(BaseOptions(baseUrl: 'http://test.invalid/api'))); CustomerRide? active; + ApiException? activeError; int _calls = 0; + int adoptCalls = 0; @override void setToken(String? token) {} @@ -112,7 +175,13 @@ class _ConflictApi extends CustomerApiClient { @override // init() 的還原一律回 null——乘客按下叫車時畫面上沒有任何訂單, // 這正是 409「已有進行中的訂單」讓人無路可走的前提。 - Future activeRide() async => _calls++ == 0 ? null : active; + Future activeRide() async { + final first = _calls++ == 0; + if (first) return null; + adoptCalls++; + if (activeError != null) throw activeError!; + return active; + } @override Future> fetchLostItems() async => const []; From 0371c992b2b4b909a9fb8b26bf06ba2691bfe811 Mon Sep 17 00:00:00 2001 From: awei Date: Wed, 29 Jul 2026 14:56:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?test(ws):=20=E6=95=91=E5=9B=9E=E3=80=8C?= =?UTF-8?q?=E7=99=BB=E5=87=BA=E5=BE=8C=E5=9B=9E=E5=89=8D=E6=99=AF=E4=B8=8D?= =?UTF-8?q?=E5=8F=AF=E5=81=B7=E5=81=B7=E9=80=A3=E5=9B=9E=E5=8E=BB=E3=80=8D?= =?UTF-8?q?=EF=BC=88=E4=BE=86=E8=87=AA=E8=A2=AB=E5=8F=96=E4=BB=A3=E7=9A=84?= =?UTF-8?q?=20PR=20#59=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 回前景會呼叫 ensureConnected();漏看 _disposed 的話,已登出的 client 會帶著舊 token 重新連上,上一個帳號的事件就繼續進來。main 的 app_lifecycle_test 有「斷線立刻重連」 與「已連上不重建」,唯獨缺這條。 誠實標記:這是 defense-in-depth 的行為斷言,不是釘住某一行—— ensureConnected 與 _open() 各有一道 _disposed 守門,單獨拿掉任一道測試都仍 PASS, 兩道同時拿掉才 FAIL(connector 被呼叫 2 次)。 Co-Authored-By: Claude Opus 5 --- test/fleet_ws_client_test.dart | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/test/fleet_ws_client_test.dart b/test/fleet_ws_client_test.dart index 969d044..c1694b4 100644 --- a/test/fleet_ws_client_test.dart +++ b/test/fleet_ws_client_test.dart @@ -210,6 +210,32 @@ void main() { expect(await received, contains('ride.assigned')); }); + test('登出後 ensureConnected() 不會偷偷連回去', () async { + // 回前景會呼叫 ensureConnected()。若它漏看 _disposed,已登出的 client 會帶著 + // **舊 token** 重新連上——上一個帳號的事件就這樣繼續進來。 + var connectorCalls = 0; + final client = FleetWsClient( + onEvent: (_) {}, + connector: (_) { + connectorCalls++; + return WebSocketChannel.connect(wsUri); + }, + ); + addTearDown(client.disconnect); + + await client.connect('tok'); + await Future.delayed(const Duration(seconds: 1)); + expect(client.isConnected, isTrue, reason: '前置:先真的連上'); + await client.disconnect(); + final callsAfterLogout = connectorCalls; + + client.ensureConnected(); + await Future.delayed(const Duration(milliseconds: 500)); + + expect(connectorCalls, callsAfterLogout, reason: '登出後不可再開新連線'); + expect(client.isConnected, isFalse); + }); + test('握手成功後退避歸零,下次閃斷仍在 3 秒內重連', () async { final states = StreamController.broadcast(); final client = FleetWsClient(