warning: this commit will be force pushed

bukowa · Jun 29, 2024 · a14e242 · a14e242
1 parent d801d49
commit a14e242
Show file tree

Hide file tree

Showing 4 changed files with 72 additions and 22 deletions.
diff --git a/.github/workflows/tests-e2e-js.yaml b/.github/workflows/tests-e2e-js.yaml
@@ -2,7 +2,7 @@ name: "Test: UI E2E JS"
 
 on:
   schedule:
-  - cron: "20 04 * * *"
+    - cron: "20 04 * * *"
   push:
     branches:
       - master
@@ -12,20 +12,48 @@ on:
   workflow_call:
   workflow_dispatch:
 
+env:
+  TESTS_LOG_LEVEL: debug
+  # xvfb is slow to start
+  NODE_TEST_TIMEOUT: 90000
+  TRACE: 1
+
 jobs:
 
   test:
-    timeout-minutes: 5
-    runs-on: ubuntu-latest
-    name: "Run UI E2E tests"
-    env:
-      # xvfb is slow to start
-      NODE_TEST_TIMEOUT: 90000
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          #          - platform: 'macos-latest' # for Arm based macs (M1 and above).
+          #            args: '--target aarch64-apple-darwin'
+          #          - platform: 'macos-latest' # for Intel based macs.
+          #            args: '--target x86_64-apple-darwin'
+          - platform: 'ubuntu-latest'
+            args: ''
+          - platform: 'windows-latest'
+            args: ''
 
+    timeout-minutes: 15
+    runs-on: ${{ matrix.platform }}
+    name: "Run UI E2E tests"
     steps:
       - name: Checkout
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
 
+      - name: Install Xming
+        shell: "bash"
+        if: matrix.platform == 'windows-latest'
+        run: |
+          choco install xming
+          "C:\Program Files (x86)\Xming\Xming.exe" :0 -clipboard -multiwindow &
+#        run: |
+#          set -x
+#          curl -L -o xming.exe \
+#          https://kumisystems.dl.sourceforge.net/project/xming/Xming/6.9.0.31/Xming-6-9-0-31-setup.exe?viasf=1
+#          ls -al
+#          ./xming.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
+
       - name: Setup Just
         uses: extractions/setup-just@6e1de3cc407de738551abd6c0923bd5ed5608042
         with:
@@ -43,17 +71,26 @@ jobs:
           toolchain: stable
           override: true
 
-      - name: Setup Rust Cache
-        uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2
-        with:
-          cache-all-crates: true
-          cache-targets: true
-          cache-directories: |
-            .build
 
-      - name: Install Prerequisites
-        run: |
-          . <(just prerequisites)
+# https://github.com/Swatinem/rust-cache/issues/169
+#      - name: Setup Rust Cache
+#        uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2
+#        with:
+#          cache-all-crates: true
+#          cache-targets: true
+#          cache-directories: |
+#            .build
+
+#      - name: Install Prerequisites
+#        if: matrix.platform == 'ubuntu-latest'
+#        run: |
+#          . <(just prerequisites)
+#
+#      - name: Run UI E2E tests Linux
+#        if: matrix.platform == 'ubuntu-latest'
+#        run: xvfb-run -a just test-e2e
 
-      - name: Run UI E2E tests
-        run: xvfb-run -a just test-e2e
+      - name: Run UI E2E tests Windows
+        shell: "bash"
+        if: matrix.platform == 'windows-latest'
+        run: just test-e2e
diff --git a/justfile b/justfile
@@ -102,14 +102,25 @@ test-e2e-fast:
       --require ts-node/register \
       tests-e2e-js
 
+
+
 [group('webview')]
-[doc('get microsoftedge version')]
+[doc('get microsoftedge version that is pending update')]
 [windows]
-browser-version:
+browser-version-pending-update:
     REG QUERY \
     "HKLM\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{56EB18F8-B008-4CBD-B6D2-8C97FE7E9062}" \
     | grep pv | awk '{print $3}'
 
+[group('webview')]
+[doc('get microsoftedge version')]
+[windows]
+browser-version:
+    #!/bin/bash
+    wmic datafile where \
+      'name="C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe"' \
+      get version | tail -n2 | xargs
+
 [group('webview')]
 [doc('get the webdriver url')]
 [windows]

diff --git a/tauri-app/src-tauri/capabilities/default.json b/tauri-app/src-tauri/capabilities/default.json
@@ -7,6 +7,7 @@
     "path:default",
     "event:default",
     "window:default",
+    "window:allow-hide",
     "app:default",
     "image:default",
     "resources:default",

diff --git a/tauri-app/src-tauri/tauri.conf.json b/tauri-app/src-tauri/tauri.conf.json
@@ -14,7 +14,8 @@
       {
         "title": "tauri-app",
         "width": 800,
-        "height": 600
+        "height": 600,
+        "visible": false
       }
     ],
     "security": {