test: add task with redirect

Author: sylingd

src/pages/background/tasks/index.ts

@@ -9,7 +9,7 @@ import {
   loadTaskRun,
   removeTaskRun,
   runTaskAndSave,
-} from './core';
+} from '../core/task';
 
 export async function checkOneTask(task: Task) {
   const data = await loadTaskRun(task.key);

src/pages/options/utils/index.ts

@@ -28,7 +28,11 @@ export async function createExport(arr: {
         Array.from(tasks)
           .map(x => allTasks.find(y => y.key === x))
           .filter(Boolean) as Task[]
-      ).map(x => [x.key, x]),
+      ).map(x => {
+        delete x.lastRun;
+        delete x._func;
+        return [x.key, x];
+      }),
     );
   }
   return result;

src/share/core/types.ts

@@ -157,5 +157,6 @@ export interface Task {
   // 自定义函数代码
   code?: string;
 
+  lastRun?: TaskRun;
   _func?: () => Promise<void>;
 }

tests/e2e/request.spec.mjs

@@ -24,8 +24,8 @@ describe('Redirect', () =>
         const query = JSON.parse(
           await getPageValue(browser.browser, `get123/test${key}`),
         );
-        assert.strictEqual(query['id'], '123');
-        assert.strictEqual(query['value'], `test${key}`);
+        assert.strictEqual(query.id, '123');
+        assert.strictEqual(query.value, `test${key}`);
       } finally {
         await remove();
       }
@@ -54,7 +54,7 @@ describe('Modify Request Header', () =>
       try {
         const header = await getHeader(browser.browser);
 
-        assert.strictEqual(header['X_TEST_HEADER'], key);
+        assert.strictEqual(header.X_TEST_HEADER, key);
       } finally {
         await remove();
       }
@@ -81,9 +81,9 @@ describe('Exclude regex', () =>
 
     try {
       const header1 = await getHeader(browser.browser, 't123=1');
-      assert.strictEqual(header1['X_EXCLUDE'], undefined);
+      assert.strictEqual(header1.X_EXCLUDE, undefined);
       const header2 = await getHeader(browser.browser);
-      assert.strictEqual(header2['X_EXCLUDE'], key);
+      assert.strictEqual(header2.X_EXCLUDE, key);
     } finally {
       await remove();
     }
@@ -110,7 +110,7 @@ describe('Disable rule', () =>
 
       const header = await getHeader(browser.browser);
 
-      assert.strictEqual(header['X_TEST_HEADER'], undefined);
+      assert.strictEqual(header.X_TEST_HEADER, undefined);
 
       await remove();
     },
@@ -198,11 +198,11 @@ describe('Disable All', () =>
         await setPref(browser.popup, 'disable-all', true);
         await sleep(100);
         const header1 = await getHeader(browser.browser);
-        assert.strictEqual(header1['X_TEST_DISABLE'], undefined);
+        assert.strictEqual(header1.X_TEST_DISABLE, undefined);
         await setPref(browser.popup, 'disable-all', false);
         await sleep(100);
         const header2 = await getHeader(browser.browser);
-        assert.strictEqual(header2['X_TEST_DISABLE'], key);
+        assert.strictEqual(header2.X_TEST_DISABLE, key);
       } finally {
         await remove();
       }

tests/e2e/scripts/browser.mjs

@@ -196,6 +196,18 @@ export async function cleanup() {
   }
 }
 
+export async function runInBrowsers(keys, cb) {
+  await Promise.all(
+    keys.map(key => () => {
+      const client = browserList[key];
+      if (!client) {
+        return Promise.resolve();
+      }
+      return cb(client);
+    }),
+  );
+}
+
 export function runTest(keys, cb) {
   for (const key of keys) {
     it(key, () => {

tests/e2e/task.spec.mjs

@@ -1,35 +1,67 @@
 import assert from 'node:assert';
 import { setTimeout as sleep } from 'node:timers/promises';
 import { getTask, runTask, saveTask } from './scripts/api.mjs';
-import { runTest } from './scripts/browser.mjs';
+import { runInBrowsers, runTest } from './scripts/browser.mjs';
 import { randStr, testServer } from './scripts/utils.mjs';
 
-describe('Run task', () =>
-  runTest(
-    ['edge_v2', 'chrome_v3', 'firefox_v2', 'firefox_v3'],
-    async browser => {
-      const key = `task_${randStr()}`;
-      const value = randStr();
+describe('Fetch task', () => {
+  const key = `task_${randStr()}`;
+  const value = randStr();
+  const removes = [];
+  beforeAll(() =>
+    runInBrowsers(
+      ['edge_v2', 'chrome_v3', 'firefox_v2', 'firefox_v3'],
+      async browser => {
+        const res = await saveTask(browser.popup, {
+          key,
+          name: 'test task 1',
+          isFunction: false,
+          fetch: {
+            url: `${testServer}mock-json.php?value=${value}`,
+            method: 'GET',
+            responseType: 'json',
+          },
+        });
+        removes.push(res.remove);
+      },
+    ),
+  );
+  afterAll(() => removes.forEach(remove => remove()));
 
-      const { remove } = await saveTask(browser.popup, {
-        key,
-        name: 'test task 1',
-        isFunction: false,
-        fetch: {
-          url: `${testServer}mock-json.php?value=${value}`,
-          method: 'GET',
-          responseType: 'json',
-        },
-      });
-
-      try {
+  describe('Get task result', () =>
+    runTest(
+      ['edge_v2', 'chrome_v3', 'firefox_v2', 'firefox_v3'],
+      async browser => {
         await runTask(browser.popup, key);
         await sleep(100);
         const result = await getTask(browser.popup, key);
         assert.strictEqual(result.lastRun.status, 'done');
         assert.deepStrictEqual(result.lastRun.result, { value });
-      } finally {
-        await remove();
-      }
-    },
-  ));
+      },
+    ));
+
+  describe('Use in redirect', () =>
+    runTest(
+      ['edge_v2', 'chrome_v3', 'firefox_v2', 'firefox_v3'],
+      async browser => {
+        const { remove } = await saveRule(browser.popup, {
+          name: 'test redirect',
+          ruleType: 'redirect',
+          pattern: `^${testServer}get(\\d+)$`,
+          matchType: 'regexp',
+          isFunction: false,
+          enable: true,
+          to: `${testServer}get-query.php?value=\${TASK.${key}.value}`,
+        });
+
+        try {
+          const query = JSON.parse(
+            await getPageValue(browser.browser, `get123`),
+          );
+          assert.strictEqual(query.value, value);
+        } finally {
+          await remove();
+        }
+      },
+    ));
+});