Skip to content

Commit a14e242

Browse files
committed
warning: this commit will be force pushed
1 parent d801d49 commit a14e242

File tree

4 files changed

+72
-22
lines changed

4 files changed

+72
-22
lines changed

.github/workflows/tests-e2e-js.yaml

Lines changed: 56 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name: "Test: UI E2E JS"
22

33
on:
44
schedule:
5-
- cron: "20 04 * * *"
5+
- cron: "20 04 * * *"
66
push:
77
branches:
88
- master
@@ -12,20 +12,48 @@ on:
1212
workflow_call:
1313
workflow_dispatch:
1414

15+
env:
16+
TESTS_LOG_LEVEL: debug
17+
# xvfb is slow to start
18+
NODE_TEST_TIMEOUT: 90000
19+
TRACE: 1
20+
1521
jobs:
1622

1723
test:
18-
timeout-minutes: 5
19-
runs-on: ubuntu-latest
20-
name: "Run UI E2E tests"
21-
env:
22-
# xvfb is slow to start
23-
NODE_TEST_TIMEOUT: 90000
24+
strategy:
25+
fail-fast: false
26+
matrix:
27+
include:
28+
# - platform: 'macos-latest' # for Arm based macs (M1 and above).
29+
# args: '--target aarch64-apple-darwin'
30+
# - platform: 'macos-latest' # for Intel based macs.
31+
# args: '--target x86_64-apple-darwin'
32+
- platform: 'ubuntu-latest'
33+
args: ''
34+
- platform: 'windows-latest'
35+
args: ''
2436

37+
timeout-minutes: 15
38+
runs-on: ${{ matrix.platform }}
39+
name: "Run UI E2E tests"
2540
steps:
2641
- name: Checkout
2742
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4
2843

44+
- name: Install Xming
45+
shell: "bash"
46+
if: matrix.platform == 'windows-latest'
47+
run: |
48+
choco install xming
49+
"C:\Program Files (x86)\Xming\Xming.exe" :0 -clipboard -multiwindow &
50+
# run: |
51+
# set -x
52+
# curl -L -o xming.exe \
53+
# https://kumisystems.dl.sourceforge.net/project/xming/Xming/6.9.0.31/Xming-6-9-0-31-setup.exe?viasf=1
54+
# ls -al
55+
# ./xming.exe /VERYSILENT /SUPPRESSMSGBOXES /NORESTART /SP-
56+
2957
- name: Setup Just
3058
uses: extractions/setup-just@6e1de3cc407de738551abd6c0923bd5ed5608042
3159
with:
@@ -43,17 +71,26 @@ jobs:
4371
toolchain: stable
4472
override: true
4573

46-
- name: Setup Rust Cache
47-
uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2
48-
with:
49-
cache-all-crates: true
50-
cache-targets: true
51-
cache-directories: |
52-
.build
5374

54-
- name: Install Prerequisites
55-
run: |
56-
. <(just prerequisites)
75+
# https://github.com/Swatinem/rust-cache/issues/169
76+
# - name: Setup Rust Cache
77+
# uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2
78+
# with:
79+
# cache-all-crates: true
80+
# cache-targets: true
81+
# cache-directories: |
82+
# .build
83+
84+
# - name: Install Prerequisites
85+
# if: matrix.platform == 'ubuntu-latest'
86+
# run: |
87+
# . <(just prerequisites)
88+
#
89+
# - name: Run UI E2E tests Linux
90+
# if: matrix.platform == 'ubuntu-latest'
91+
# run: xvfb-run -a just test-e2e
5792

58-
- name: Run UI E2E tests
59-
run: xvfb-run -a just test-e2e
93+
- name: Run UI E2E tests Windows
94+
shell: "bash"
95+
if: matrix.platform == 'windows-latest'
96+
run: just test-e2e

justfile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,14 +102,25 @@ test-e2e-fast:
102102
--require ts-node/register \
103103
tests-e2e-js
104104

105+
106+
105107
[group('webview')]
106-
[doc('get microsoftedge version')]
108+
[doc('get microsoftedge version that is pending update')]
107109
[windows]
108-
browser-version:
110+
browser-version-pending-update:
109111
REG QUERY \
110112
"HKLM\SOFTWARE\WOW6432Node\Microsoft\EdgeUpdate\Clients\{56EB18F8-B008-4CBD-B6D2-8C97FE7E9062}" \
111113
| grep pv | awk '{print $3}'
112114

115+
[group('webview')]
116+
[doc('get microsoftedge version')]
117+
[windows]
118+
browser-version:
119+
#!/bin/bash
120+
wmic datafile where \
121+
'name="C:\\Program Files (x86)\\Microsoft\\Edge\\Application\\msedge.exe"' \
122+
get version | tail -n2 | xargs
123+
113124
[group('webview')]
114125
[doc('get the webdriver url')]
115126
[windows]

tauri-app/src-tauri/capabilities/default.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
"path:default",
88
"event:default",
99
"window:default",
10+
"window:allow-hide",
1011
"app:default",
1112
"image:default",
1213
"resources:default",

tauri-app/src-tauri/tauri.conf.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
{
1515
"title": "tauri-app",
1616
"width": 800,
17-
"height": 600
17+
"height": 600,
18+
"visible": false
1819
}
1920
],
2021
"security": {

0 commit comments

Comments
 (0)