Compare commits

...

30 Commits

Author SHA1 Message Date
e701caa238 A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) 2024-07-19 21:54:02 +00:00
a9cecc8345 Merge branch 'main' into pierremtb/issue2610 2024-07-19 05:34:53 -04:00
9ef7dfbb4c Merge branch 'main' into pierremtb/issue2610 2024-07-16 17:06:23 -04:00
99741324b6 A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) 2024-07-16 11:09:22 +00:00
85c5ec266d Trigger CI 2024-07-16 07:00:16 -04:00
481519404c A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) 2024-07-16 10:45:32 +00:00
3483c3a4bc Trigger CI 2024-07-16 06:40:53 -04:00
e76ad55df6 A snapshot a day keeps the bugs away! 📷🐛 (OS: ubuntu) 2024-07-16 09:21:00 +00:00
2975e5cdb6 Format 2024-07-16 05:11:43 -04:00
c9770bd3ff Merge branch 'main' into pierremtb/issue2610 2024-07-16 05:07:21 -04:00
5a77106090 Merge branch 'main' into pierremtb/issue2610 2024-07-11 06:17:03 -04:00
d56819ad32 Merge branch 'main' into pierremtb/issue2610 2024-07-10 07:42:28 -04:00
04f7ec6c30 Merge branch 'main' into pierremtb/issue2610 2024-07-03 08:33:07 -04:00
d9058c9ab4 Merge branch 'main' into pierremtb/issue2610 2024-06-22 21:23:39 -04:00
ede39b49db Refresh workaround, but this isn't a full fix 2024-06-16 16:06:50 -04:00
8f8c6ef8cc Disable ubuntu builds 2024-06-16 14:59:10 -04:00
ae5250129e Merge branch 'pierremtb/issue2658' into pierremtb/issue2610 2024-06-16 11:07:49 -04:00
e932ccd226 Lint 2024-06-16 10:25:59 -04:00
d814264344 Signin/out sep with auth flows 2024-06-16 09:36:06 -04:00
1d8b75e902 WIP: Desktop app shows bad network until a project is opened
Fixes #26103
2024-06-16 09:16:41 -04:00
9f3b5d09d9 Clean up 2024-06-16 09:15:18 -04:00
85d30e60eb Revert other attemps at fixing the browser issues. mocha dep was the issue 2024-06-16 08:58:58 -04:00
7665536c5a Remove explicit mocha dep 2024-06-16 08:45:18 -04:00
022446f7fe Change before back to it 2024-06-16 08:35:34 -04:00
ad343f4734 Remove utils 2024-06-16 08:23:37 -04:00
245367d92a Utils fn back in app.spec.ts 2024-06-16 08:04:14 -04:00
50d3f816b1 Also exclude tauri tests from vitest 2024-06-16 07:37:51 -04:00
03486e7586 Longer before timeout 2024-06-16 06:51:18 -04:00
e3113f7978 Clean up 2024-06-15 14:40:02 -04:00
26c0c85899 WIP: Break the tauri e2e tests apart
Will fix #2658
2024-06-15 09:13:26 -04:00
10 changed files with 23 additions and 6 deletions

View File

@ -135,7 +135,9 @@ jobs:
strategy:
fail-fast: false
matrix:
os: [macos-14, ubuntu-latest, windows-latest]
os: [macos-14, windows-latest]
# TODO: add back ubuntu when https://github.com/KittyCAD/modeling-app/issues/625 is closed
# os: [macos-14, ubuntu-latest, windows-latest]
env:
# Specific Apple Universal target for macos
TAURI_ARGS_MACOS: ${{ matrix.os == 'macos-14' && '--target universal-apple-darwin' || '' }}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 44 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 52 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 46 KiB

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 37 KiB

After

Width:  |  Height:  |  Size: 37 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 72 KiB

After

Width:  |  Height:  |  Size: 72 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 45 KiB

After

Width:  |  Height:  |  Size: 45 KiB

View File

@ -5,6 +5,7 @@ import os from 'os'
import { click, setDatasetValue } from '../utils'
const isWin32 = os.platform() === 'win32'
const tauriProtocol = isWin32 ? 'http://tauri.localhost' : 'tauri://localhost'
const documentsDir = path.join(os.homedir(), 'Documents')
const userSettingsDir = path.join(
os.homedir(),
@ -67,12 +68,24 @@ describe('ZMA sign in flow', () => {
await new Promise((resolve) => setTimeout(resolve, 10000))
const newFileButton = await $('[data-testid="home-new-file"]')
expect(await newFileButton.getText()).toEqual('New project')
// Refresh once before the authorized user flows
await browser.execute(`window.location.href = "${tauriProtocol}/home"`)
await new Promise((resolve) => setTimeout(resolve, 10000))
})
})
describe('ZMA authorized user flows', () => {
// Note: each flow below is intended to start *and* end from the home page
it('checks the network indicator status', async () => {
const toggle = await $('[data-testid="network-toggle"]')
await click(toggle)
const status = await $('[data-testid="network"]')
expect(await status.getText()).toEqual('CONNECTED')
await click(toggle)
})
it('opens the settings page, checks filesystem settings, and closes the settings page', async () => {
const menuButton = await $('[data-testid="user-sidebar-toggle"]')
await click(menuButton)
@ -137,8 +150,7 @@ describe('ZMA authorized user flows', () => {
const errorText = await $('[data-testid="unexpected-error"]')
expect(await errorText.getText()).toContain('unexpected error')
}
const base = isWin32 ? 'http://tauri.localhost' : 'tauri://localhost'
await browser.execute(`window.location.href = "${base}/home"`)
await browser.execute(`window.location.href = "${tauriProtocol}/home"`)
})
})

View File

@ -134,9 +134,12 @@ const router = createBrowserRouter([
path: paths.HOME,
element: (
<Auth>
<Outlet />
<Home />
<CommandBar />
<ModelingMachineProvider>
<Outlet />
<Home />
<CommandBar />
</ModelingMachineProvider>
<WasmErrBanner />
</Auth>
),
id: paths.HOME,