Refine test directories.

dajiaji · Jul 26, 2023 · 32d0dae · 32d0dae
1 parent f9d87de
commit 32d0dae
Show file tree

Hide file tree

Showing 16 changed files with 10 additions and 10 deletions.
diff --git a/.github/workflows/ci_browser.yml b/.github/workflows/ci_browser.yml
@@ -23,14 +23,14 @@ jobs:
       - run: |
           npm install -g esbuild
           deno task dnt
-          deno task minify > test/pages/src/hpke.js
-          mkdir test/pages/dhkemSecp256k1HkdfSha256
-          cp -rf x/dhkemSecp256k1HkdfSha256/test/runtimes/browsers/pages/* test/pages/dhkemSecp256k1HkdfSha256
-          deno task minify > test/pages/dhkemSecp256k1HkdfSha256/src/hpke.js
+          deno task minify > test/runtimes/browsers/pages/src/hpke.js
+          mkdir test/runtimes/browsers/pages/dhkemSecp256k1HkdfSha256
+          cp -rf x/dhkemSecp256k1HkdfSha256/test/runtimes/browsers/pages/* test/runtimes/browsers/pages/dhkemSecp256k1HkdfSha256
+          deno task minify > test/runtimes/browsers/pages/dhkemSecp256k1HkdfSha256/src/hpke.js
       - working-directory: ./x/dhkemSecp256k1HkdfSha256
         run: |
           deno task dnt
-          deno task minify > ../../test/pages/dhkemSecp256k1HkdfSha256/src/hpke-dhkemSecp256k1HkdfSha256.js
+          deno task minify > ../../test/runtimes/browsers/pages/dhkemSecp256k1HkdfSha256/src/hpke-dhkemSecp256k1HkdfSha256.js
       - uses: peaceiris/actions-gh-pages@v3
         with:
           deploy_key: ${{ secrets.ACTIONS_DEPLOY_KEY }}
@@ -43,7 +43,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3
       - uses: microsoft/playwright-github-action@v1
-      - working-directory: ./test/playwright
+      - working-directory: ./test/runtimes/browsers
         run: |
           npm ci
           npx playwright install --with-deps

diff --git a/.github/workflows/ci_bun.yml b/.github/workflows/ci_bun.yml
@@ -23,7 +23,7 @@ jobs:
       - run: |
           npm install -g esbuild
           deno task dnt
-          deno task minify > test/bun/src/hpke.js
+          deno task minify > test/runtimes/bun/src/hpke.js
           deno task minify > x/dhkemSecp256k1HkdfSha256/test/runtimes/bun/src/hpke.js
       - working-directory: ./x/dhkemSecp256k1HkdfSha256/
         run: |
@@ -33,7 +33,7 @@ jobs:
         with:
           bun-version: 0.4
       - name: Run test
-        working-directory: ./test/bun
+        working-directory: ./test/runtimes/bun
         run: |
           nohup bun src/index.js &
           sleep 3

diff --git a/.github/workflows/ci_cfw.yml → .github/workflows/ci_cloudflare.yml b/.github/workflows/ci_cfw.yml → .github/workflows/ci_cloudflare.yml
@@ -23,14 +23,14 @@ jobs:
       - run: |
           npm install -g esbuild
           deno task dnt
-          deno task minify > test/wrangler/src/hpke.js
+          deno task minify > test/runtimes/cloudflare/src/hpke.js
           deno task minify > x/dhkemSecp256k1HkdfSha256/test/runtimes/cloudflare/src/hpke.js
       - working-directory: ./x/dhkemSecp256k1HkdfSha256/
         run: |
           deno task dnt
           deno task minify > test/runtimes/cloudflare/src/hpke-dhkemSecp256k1HkdfSha256.js
       - name: Run test
-        working-directory: ./test/wrangler
+        working-directory: ./test/runtimes/cloudflare
         run: |
           npm install
           nohup npm start &

diff --git a/test/playwright/hpke.spec.ts → test/runtimes/browsers/hpke.spec.ts b/test/playwright/hpke.spec.ts → test/runtimes/browsers/hpke.spec.ts
diff --git a/test/playwright/package-lock.json → test/runtimes/browsers/package-lock.json b/test/playwright/package-lock.json → test/runtimes/browsers/package-lock.json
diff --git a/test/playwright/package.json → test/runtimes/browsers/package.json b/test/playwright/package.json → test/runtimes/browsers/package.json
diff --git a/test/pages/index.html → test/runtimes/browsers/pages/index.html b/test/pages/index.html → test/runtimes/browsers/pages/index.html
diff --git a/test/pages/src/.gitkeep → test/runtimes/browsers/pages/src/.gitkeep b/test/pages/src/.gitkeep → test/runtimes/browsers/pages/src/.gitkeep
diff --git a/test/playwright/playwright.config.ts → test/runtimes/browsers/playwright.config.ts b/test/playwright/playwright.config.ts → test/runtimes/browsers/playwright.config.ts
diff --git a/test/bun/hpke.spec.ts → test/runtimes/bun/hpke.spec.ts b/test/bun/hpke.spec.ts → test/runtimes/bun/hpke.spec.ts
diff --git a/test/bun/src/index.js → test/runtimes/bun/src/index.js b/test/bun/src/index.js → test/runtimes/bun/src/index.js
diff --git a/test/wrangler/hpke.spec.ts → test/runtimes/cloudflare/hpke.spec.ts b/test/wrangler/hpke.spec.ts → test/runtimes/cloudflare/hpke.spec.ts
diff --git a/test/wrangler/package-lock.json → test/runtimes/cloudflare/package-lock.json b/test/wrangler/package-lock.json → test/runtimes/cloudflare/package-lock.json
diff --git a/test/wrangler/package.json → test/runtimes/cloudflare/package.json b/test/wrangler/package.json → test/runtimes/cloudflare/package.json
diff --git a/test/wrangler/src/index.js → test/runtimes/cloudflare/src/index.js b/test/wrangler/src/index.js → test/runtimes/cloudflare/src/index.js
diff --git a/test/wrangler/wrangler.toml → test/runtimes/cloudflare/wrangler.toml b/test/wrangler/wrangler.toml → test/runtimes/cloudflare/wrangler.toml