wip debug

trezor · May 15, 2024 · cdc1ce9 · cdc1ce9
1 parent 110113e
commit cdc1ce9
Show file tree

Hide file tree

Showing 8 changed files with 367 additions and 569 deletions.
diff --git a/.github/workflows/template-connect-test-params.yml b/.github/workflows/template-connect-test-params.yml
@@ -19,7 +19,6 @@ on:
         description: "Firmware model for the tests (example: R)"
         type: "string"
         required: false
-        default: ""
       node-environment:
         description: "Should the test run on nodejs environment, it runs by default."
         type: "boolean"
@@ -54,9 +53,13 @@ jobs:
       - run: sed -i "/\"node\"/d" package.json
       - run: yarn install
       # nightly test - run without cached txs
-      - run: 'export ADDITIONAL_ARGS="-c"'
-        if: ${{ github.event_name == 'schedule' }}
-      - run: './docker/docker-connect-test.sh node -p "${{ inputs.test-pattern }}" -f "${{ inputs.tests-firmware }}" -i ${{ inputs.methods }} -m ${{ inputs.test-firmware-model}} $ADDITIONAL_ARGS'
+      - if: ${{ github.event_name == 'schedule' }}
+        run: 'export ADDITIONAL_ARGS="-c"'
+      - if: ${{ inputs.test-firmware-model }}
+        run: 'export ADDITIONAL_ARGS="$ADDITIONAL_ARGS -m ${{ inputs.test-firmware-model }}"'
+      - if: ${{ inputs.methods }}
+        run: 'export ADDITIONAL_ARGS="$ADDITIONAL_ARGS -i ${{ inputs.methods }}"'
+      - run: './docker/docker-connect-test.sh node -p "${{ inputs.test-pattern }}" -f "${{ inputs.tests-firmware }}"$ADDITIONAL_ARGS'
 
   web:
     name: "web-${{ inputs.test-description }}"
@@ -89,6 +92,10 @@ jobs:
       - name: "Echo download path"
         run: echo ${{steps.download.outputs.download-path}}
       # nightly test - run without cached txs
-      - run: 'export ADDITIONAL_ARGS="-c"'
-        if: ${{ github.event_name == 'schedule' }}
-      - run: './docker/docker-connect-test.sh web -p "${{ inputs.test-pattern }}" -f "${{ inputs.tests-firmware }}" -i ${{ inputs.methods }} -m ${{ inputs.test-firmware-model}} $ADDITIONAL_ARGS'
+      - if: ${{ github.event_name == 'schedule' }}
+        run: 'export ADDITIONAL_ARGS="-c"'
+      - if: ${{ inputs.test-firmware-model }}
+        run: 'export ADDITIONAL_ARGS="$ADDITIONAL_ARGS -m ${{ inputs.test-firmware-model }}"'
+      - if: ${{ inputs.methods }}
+        run: 'export ADDITIONAL_ARGS="$ADDITIONAL_ARGS -i ${{ inputs.methods }}"'
+      - run: './docker/docker-connect-test.sh web -p "${{ inputs.test-pattern }}" -f "${{ inputs.tests-firmware }}"$ADDITIONAL_ARGS'
diff --git a/packages/connect-popup/e2e/tests/popup-close.test.ts b/packages/connect-popup/e2e/tests/popup-close.test.ts
@@ -184,8 +184,12 @@ test(`device disconnected during device interaction`, async ({ page, context })
     await TrezorUserEnvLink.api.stopEmu();
     await explorerPage.waitForTimeout(WAIT_AFTER_TEST);
 
-    log('waiting to click @connect-ui/error-close-button');
-    await popup.click("button[data-test='@connect-ui/error-close-button']");
+    try {
+        log('waiting to click @connect-ui/error-close-button');
+        await popup.click("button[data-test='@connect-ui/error-close-button']");
+    } catch (error) {
+        // Sometimes this crashes with error that the page is already closed.
+    }
 
     log('waiting for popupClosedPromise to resolve');
     await popupClosedPromise;

diff --git a/packages/connect-web/src/impl/core-in-popup/index.ts b/packages/connect-web/src/impl/core-in-popup/index.ts