Wip

.github/workflows/canister-tests.yml

@@ -409,12 +409,14 @@ jobs:
         # The jest parameter is actually 1/N, 2/N etc but we use a artifact-friendly
         # version here (with underscore).
         shard: [ '1_6', '2_6', '3_6', '4_6', '5_6', '6_6' ]
+        # Whether the registration flow requires a captcha to be solved or not
+        captcha: ['enabled', 'disabled']
       # Make sure that one failing test does not cancel all other matrix jobs
       fail-fast: false
 
     env:
       # Suffix used for tagging artifacts
-      artifact_suffix: ${{ contains(matrix.domain, 'internetcomputer') && 'current' || 'legacy' }}-${{ matrix.device }}-${{ matrix.shard }}
+      artifact_suffix: ${{ contains(matrix.domain, 'internetcomputer') && 'current' || 'legacy' }}-${{ matrix.device }}-captcha_${{ matrix.captcha }}-${{ matrix.shard }}
 
     steps:
       - uses: actions/checkout@v4
@@ -461,8 +463,10 @@ jobs:
 
       - name: Deploy canisters
         run: |
+          # Build the "CaptchaEnabled" / "CaptchaDisabled" variants from the matrix captcha value
+          captcha_variant="Captcha$(tr '[:lower:]' '[:upper:]' <<< ${${{ matrix.captcha }}:0:1})${${{ matrix.captcha }}:1}"
           # NOTE: dfx install will run the postinstall scripts from dfx.json
-          dfx canister install internet_identity --wasm internet_identity_test.wasm.gz
+          dfx canister install internet_identity --wasm internet_identity_test.wasm.gz --argument "(opt record { captcha_config = opt record { max_unsolved_captchas= 50:nat64; captcha_trigger = variant {Static = variant { $captcha_variant }}}})"
           dfx canister install test_app --wasm demos/test-app/test_app.wasm
           dfx canister install issuer --wasm demos/vc_issuer/vc_demo_issuer.wasm.gz
 
@@ -488,6 +492,7 @@ jobs:
           II_URL=${{ matrix.domain }} \
             SCREEN=${{ matrix.device }} \
             II_E2E_CHROME_OPTS="--headless" \
+            II_CAPTCHA=${{ matrix.captcha }} \
             npm run test:e2e -- --shard=$(tr <<<'${{ matrix.shard }}' -s _ /)
 
       - name: Stop dfx

src/frontend/src/test-e2e/constants.ts

@@ -1,6 +1,7 @@
 import { KnownDapp } from "$src/flows/dappsExplorer/dapps";
 import { readCanisterId } from "@dfinity/internet-identity-vite-plugins/utils";
 import { getReplicaHost } from "../../../vite-plugins/dist/utils";
+import { nonNullish } from "@dfinity/utils";
 
 // XXX: this is not exactly a constant (since it might change on every node eval) but in
 // practice is very stable, and is much easier to use as "constants" than as a lookup function.
@@ -27,6 +28,9 @@ export const ISSUER_CUSTOM_ORIGIN_NICE_URL = `https://nice-issuer-custom-orig.co
 export const II_URL =
   process.env.II_URL ?? "https://identity.internetcomputer.org";
 
+export const CAPTCHA_ENABLED =
+  process.env.II_CAPTCHA === "enabled" ?? false;
+
 export const DEVICE_NAME1 = "FIDO Passkey";
 export const RECOVERY_PHRASE_NAME = "Recovery Phrase";
 

src/frontend/src/test-e2e/flows.ts

@@ -10,14 +10,17 @@ import {
   RegisterView,
   WelcomeView,
 } from "./views";
+import { CAPTCHA_ENABLED } from "$src/test-e2e/constants";
 
 export const FLOWS = {
   register: async function (browser: WebdriverIO.Browser): Promise<string> {
     const registerView = new RegisterView(browser);
     await registerView.waitForDisplay();
     await registerView.create();
-    await registerView.waitForRegisterConfirm();
-    await registerView.confirmRegisterConfirm();
+    if (CAPTCHA_ENABLED) {
+      await registerView.waitForRegisterConfirm();
+      await registerView.confirmRegisterConfirm();
+    }
     await registerView.waitForIdentity();
     const userNumber = await registerView.registerGetIdentity();
     await registerView.registerConfirmIdentity();
@@ -53,8 +56,10 @@ export const FLOWS = {
     await pinRegistrationView.setPin(pin);
     await pinRegistrationView.waitForConfirmPin();
     await pinRegistrationView.confirmPin(pin);
-    await registerView.waitForRegisterConfirm();
-    await registerView.confirmRegisterConfirm();
+    if (CAPTCHA_ENABLED) {
+      await registerView.waitForRegisterConfirm();
+      await registerView.confirmRegisterConfirm();
+    }
     await registerView.waitForIdentity();
     const userNumber = await registerView.registerGetIdentity();
     await registerView.registerConfirmIdentity();