Compare commits
30 Commits
remove-unu
...
pierremtb/
Author | SHA1 | Date | |
---|---|---|---|
e701caa238 | |||
a9cecc8345 | |||
9ef7dfbb4c | |||
99741324b6 | |||
85c5ec266d | |||
481519404c | |||
3483c3a4bc | |||
e76ad55df6 | |||
2975e5cdb6 | |||
c9770bd3ff | |||
5a77106090 | |||
d56819ad32 | |||
04f7ec6c30 | |||
d9058c9ab4 | |||
ede39b49db | |||
8f8c6ef8cc | |||
ae5250129e | |||
e932ccd226 | |||
d814264344 | |||
1d8b75e902 | |||
9f3b5d09d9 | |||
85d30e60eb | |||
7665536c5a | |||
022446f7fe | |||
ad343f4734 | |||
245367d92a | |||
50d3f816b1 | |||
03486e7586 | |||
e3113f7978 | |||
26c0c85899 |
4
.github/workflows/ci.yml
vendored
@ -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' || '' }}
|
||||
|
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 44 KiB |
Before Width: | Height: | Size: 51 KiB After Width: | Height: | Size: 52 KiB |
Before Width: | Height: | Size: 46 KiB After Width: | Height: | Size: 46 KiB |
Before Width: | Height: | Size: 36 KiB After Width: | Height: | Size: 36 KiB |
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 37 KiB |
Before Width: | Height: | Size: 72 KiB After Width: | Height: | Size: 72 KiB |
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 45 KiB |
@ -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"`)
|
||||
})
|
||||
})
|
||||
|
||||
|
@ -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,
|
||||
|