增加Gopay模式

tests/background-account-history-settings.test.js

@@ -123,6 +123,9 @@ return {
 
   assert.equal(api.normalizePersistentSettingValue('accountRunHistoryTextEnabled', 1), true);
   assert.equal(api.normalizePersistentSettingValue('phoneVerificationEnabled', 1), true);
+  assert.equal(api.normalizePersistentSettingValue('plusPaymentMethod', 'gopay'), 'gopay');
+  assert.equal(api.normalizePersistentSettingValue('plusPaymentMethod', 'paypal'), 'paypal');
+  assert.equal(api.normalizePersistentSettingValue('plusPaymentMethod', 'unknown'), 'paypal');
   assert.equal(api.normalizePersistentSettingValue('verificationResendCount', '7'), 7);
   assert.equal(api.normalizePersistentSettingValue('verificationResendCount', '-1'), 0);
   assert.equal(api.normalizePersistentSettingValue('phoneVerificationReplacementLimit', '9'), 9);

tests/gopay-manual-confirm.test.js

@@ -0,0 +1,48 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+
+const source = fs.readFileSync('background/steps/gopay-manual-confirm.js', 'utf8');
+const globalScope = {};
+const api = new Function('self', `${source}; return self.MultiPageBackgroundGoPayManualConfirm;`)(globalScope);
+
+test('GoPay manual confirm executor publishes pending manual confirmation state for step 7', async () => {
+  const stateUpdates = [];
+  const broadcasts = [];
+  const events = [];
+  const executor = api.createGoPayManualConfirmExecutor({
+    addLog: async (message, level = 'info') => {
+      events.push({ type: 'log', message, level });
+    },
+    broadcastDataUpdate: (payload) => {
+      broadcasts.push(payload);
+    },
+    chrome: {
+      tabs: {
+        update: async (tabId, payload) => {
+          events.push({ type: 'tab-update', tabId, payload });
+        },
+      },
+    },
+    getTabId: async () => 42,
+    isTabAlive: async () => true,
+    registerTab: async () => {},
+    setState: async (payload) => {
+      stateUpdates.push(payload);
+    },
+  });
+
+  await executor.executeGoPayManualConfirm({ plusCheckoutTabId: 42, plusCheckoutUrl: 'https://chatgpt.com/checkout/openai_llc/session' });
+
+  assert.equal(stateUpdates.length, 1);
+  assert.equal(stateUpdates[0].plusManualConfirmationPending, true);
+  assert.equal(stateUpdates[0].plusManualConfirmationMethod, 'gopay');
+  assert.equal(stateUpdates[0].plusManualConfirmationStep, 7);
+  assert.match(String(stateUpdates[0].plusManualConfirmationRequestId || ''), /^gopay-/);
+  assert.equal(broadcasts.length, 1);
+  assert.equal(broadcasts[0].plusManualConfirmationPending, true);
+  assert.deepStrictEqual(
+    events.find((event) => event.type === 'tab-update'),
+    { type: 'tab-update', tabId: 42, payload: { active: true } }
+  );
+});

tests/plus-checkout-create-wait.test.js

@@ -32,11 +32,14 @@ test('Plus checkout create does not wait 20 seconds after opening checkout page'
     registerTab: async (source, tabId) => {
       events.push({ type: 'register', source, tabId });
     },
-    sendTabMessageUntilStopped: async () => ({
-      checkoutUrl: 'https://checkout.stripe.com/c/pay/session',
-      country: 'US',
-      currency: 'USD',
-    }),
+    sendTabMessageUntilStopped: async (tabId, source, message) => {
+      events.push({ type: 'tab-message', tabId, source, message });
+      return {
+        checkoutUrl: 'https://checkout.stripe.com/c/pay/session',
+        country: 'US',
+        currency: 'USD',
+      };
+    },
     setState: async (payload) => {
       events.push({ type: 'set-state', payload });
     },
@@ -61,11 +64,45 @@ test('Plus checkout create does not wait 20 seconds after opening checkout page'
 
   const sleepEvents = events.filter((event) => event.type === 'sleep');
   assert.deepStrictEqual(sleepEvents.map((event) => event.ms), [1000, 1000]);
+  assert.deepStrictEqual(
+    events.find((event) => event.type === 'tab-message')?.message?.payload,
+    { paymentMethod: 'paypal' }
+  );
 
   const completeIndex = events.findIndex((event) => event.type === 'complete');
-  const readyLogIndex = events.findIndex((event) => event.type === 'log' && /Plus Checkout 页面已就绪/.test(event.message));
+  const readyLogIndex = events.findIndex((event) => event.type === 'log' && /已就绪/.test(event.message));
   assert.ok(readyLogIndex > -1);
   assert.ok(completeIndex > readyLogIndex);
   assert.equal(events.some((event) => event.type === 'sleep' && event.ms === 20000), false);
-  assert.equal(events.some((event) => event.type === 'log' && /固定等待 20 秒后继续下一步/.test(event.message)), false);
+});
+
+test('GoPay plus checkout create forwards gopay payment method to the checkout content script', async () => {
+  const events = [];
+  const executor = api.createPlusCheckoutCreateExecutor({
+    addLog: async () => {},
+    chrome: {
+      tabs: {
+        create: async () => ({ id: 99 }),
+        update: async () => {},
+      },
+    },
+    completeStepFromBackground: async () => {},
+    ensureContentScriptReadyOnTabUntilStopped: async () => {},
+    registerTab: async () => {},
+    sendTabMessageUntilStopped: async (_tabId, _source, message) => {
+      events.push(message);
+      return {
+        checkoutUrl: 'https://chatgpt.com/checkout/openai_llc/test-session',
+        country: 'ID',
+        currency: 'IDR',
+      };
+    },
+    setState: async () => {},
+    sleepWithStop: async () => {},
+    waitForTabCompleteUntilStopped: async () => {},
+  });
+
+  await executor.executePlusCheckoutCreate({ plusPaymentMethod: 'gopay' });
+
+  assert.deepStrictEqual(events[0]?.payload, { paymentMethod: 'gopay' });
 });

tests/step-definitions-module.test.js

@@ -9,6 +9,7 @@ test('step definitions module exposes ordered normal and Plus step metadata', ()
   const api = new Function('self', `${source}; return self.MultiPageStepDefinitions;`)(globalScope);
   const steps = api.getSteps();
   const plusSteps = api.getSteps({ plusModeEnabled: true });
+  const goPaySteps = api.getSteps({ plusModeEnabled: true, plusPaymentMethod: 'gopay' });
 
   assert.equal(Array.isArray(steps), true);
   assert.equal(steps.length, 10);
@@ -31,6 +32,9 @@ test('step definitions module exposes ordered normal and Plus step metadata', ()
       'platform-verify',
     ]
   );
+  assert.equal(steps[0].title, '打开 ChatGPT 官网');
+  assert.equal(steps[5].title, '清理登录 Cookies');
+
   assert.deepStrictEqual(
     plusSteps.map((step) => step.key),
     [
@@ -53,6 +57,29 @@ test('step definitions module exposes ordered normal and Plus step metadata', ()
   assert.equal(plusSteps.some((step) => step.key === 'fetch-login-code'), true);
   assert.deepStrictEqual(api.getStepIds({ plusModeEnabled: true }), [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]);
   assert.equal(api.getLastStepId({ plusModeEnabled: true }), 13);
+  assert.equal(plusSteps[5].title, '创建 Plus Checkout');
+  assert.equal(plusSteps[7].title, 'PayPal 登录与授权');
+
+  assert.deepStrictEqual(
+    goPaySteps.map((step) => step.key),
+    [
+      'open-chatgpt',
+      'submit-signup-email',
+      'fill-password',
+      'fetch-signup-code',
+      'fill-profile',
+      'plus-checkout-create',
+      'gopay-subscription-confirm',
+      'oauth-login',
+      'fetch-login-code',
+      'confirm-oauth',
+      'platform-verify',
+    ]
+  );
+  assert.deepStrictEqual(api.getStepIds({ plusModeEnabled: true, plusPaymentMethod: 'gopay' }), [1, 2, 3, 4, 5, 6, 7, 10, 11, 12, 13]);
+  assert.equal(api.getLastStepId({ plusModeEnabled: true, plusPaymentMethod: 'gopay' }), 13);
+  assert.equal(goPaySteps[5].title, '打开 GoPay 订阅页');
+  assert.equal(goPaySteps[6].title, '等待 GoPay 订阅确认');
 });
 
 test('sidepanel html loads shared step definitions before sidepanel bootstrap', () => {