Merge branch 'master' into feat-default-terminal

Author: peaklabs-dev

.github/workflows/test-e2e-webdriver.yml

@@ -17,6 +17,7 @@ jobs:
     runs-on: macos-latest
     env:
       CARGO_TERM_COLOR: always
+      CI_E2E: true
     steps:
       - uses: actions/checkout@v4
         if: ${{ github.event_name != 'workflow_dispatch' }}
@@ -28,16 +29,6 @@ jobs:
         uses: Swatinem/[email protected]
         with:
           shared-key: e2e-testing-cache
-      # - name: Install OS dependencies
-      #   run: |
-      #     sudo apt update && sudo apt install -y \
-      #       libsoup-3.0-0 \
-      #       libgtk-3-dev \
-      #       libayatana-appindicator3-dev \
-      #       libwebkit2gtk-4.1-dev \
-      #       webkit2gtk-driver \
-      #       ffmpeg \
-      #       xvfb
       - name: Setup rust-toolchain stable
         id: rust-toolchain
         uses: dtolnay/rust-toolchain@stable

apps/desktop/cypress/e2e/support/index.ts

@@ -10,9 +10,7 @@ import { MOCK_BRANCH_STATUSES_RESPONSE } from './mock/upstreamIntegration';
 import { MOCK_USER } from './mock/user';
 import { MOCK_VIRTUAL_BRANCHES } from './mock/virtualBranches';
 import { MOCK_WORKTREE_CHANGES } from './mock/worktree';
-// Sorry about this. For now it's ok for the tests.
-// eslint-disable-next-line no-relative-import-paths/no-relative-import-paths
-import { TestId } from '../../../src/lib/testing/testIds';
+import { TestId } from '@gitbutler/ui/utils/testIds';
 import { invoke, type InvokeArgs } from '@tauri-apps/api/core';
 import type { ProjectInfo } from '$lib/project/projectsService';
 

apps/desktop/src/components/AddDependentBranchModal.svelte

@@ -7,9 +7,8 @@
 
 <script lang="ts">
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
-	import { TestId } from '$lib/testing/testIds';
 	import { inject } from '@gitbutler/shared/context';
-	import { Button, Modal, Textbox } from '@gitbutler/ui';
+	import { Button, Modal, Textbox, TestId } from '@gitbutler/ui';
 	import { slugify } from '@gitbutler/ui/utils/string';
 
 	const { projectId, stackId }: AddDependentBranchModalProps = $props();

apps/desktop/src/components/AnalyticsConfirmation.svelte

@@ -3,9 +3,8 @@
 	import { initAnalyticsIfEnabled } from '$lib/analytics/analytics';
 	import { POSTHOG_WRAPPER } from '$lib/analytics/posthog';
 	import { APP_SETTINGS } from '$lib/config/appSettings';
-	import { TestId } from '$lib/testing/testIds';
 	import { inject } from '@gitbutler/shared/context';
-	import { Button } from '@gitbutler/ui';
+	import { Button, TestId } from '@gitbutler/ui';
 
 	const appSettings = inject(APP_SETTINGS);
 	const posthog = inject(POSTHOG_WRAPPER);

apps/desktop/src/components/AnalyticsSettings.svelte

@@ -1,8 +1,7 @@
 <script lang="ts">
 	import { APP_SETTINGS } from '$lib/config/appSettings';
-	import { TestId } from '$lib/testing/testIds';
 	import { inject } from '@gitbutler/shared/context';
-	import { SectionCard, Toggle, Link } from '@gitbutler/ui';
+	import { SectionCard, Toggle, Link, TestId } from '@gitbutler/ui';
 
 	const appSettings = inject(APP_SETTINGS);
 	const errorReportingEnabled = appSettings.appErrorReportingEnabled;

apps/desktop/src/components/BranchCard.svelte

@@ -13,9 +13,8 @@
 	import { DEFAULT_FORGE_FACTORY } from '$lib/forge/forgeFactory.svelte';
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
 	import { UI_STATE } from '$lib/state/uiState.svelte';
-	import { TestId } from '$lib/testing/testIds';
 	import { inject } from '@gitbutler/shared/context';
-	import { ReviewBadge, Icon, Tooltip } from '@gitbutler/ui';
+	import { ReviewBadge, Icon, Tooltip, TestId } from '@gitbutler/ui';
 	import { getTimeAgo } from '@gitbutler/ui/utils/timeAgo';
 	import type { DropzoneHandler } from '$lib/dragging/handler';
 	import type { PushStatus } from '$lib/stacks/stack';

apps/desktop/src/components/BranchCommitList.svelte

@@ -30,9 +30,8 @@
 	import { STACK_SERVICE, type SeriesIntegrationStrategy } from '$lib/stacks/stackService.svelte';
 	import { combineResults } from '$lib/state/helpers';
 	import { UI_STATE } from '$lib/state/uiState.svelte';
-	import { TestId } from '$lib/testing/testIds';
 	import { inject } from '@gitbutler/shared/context';
-	import { Button, Modal } from '@gitbutler/ui';
+	import { Button, Modal, TestId } from '@gitbutler/ui';
 	import { getTimeAgo } from '@gitbutler/ui/utils/timeAgo';
 	import type { Commit } from '$lib/branches/v3';
 	import type { CommitStatusType } from '$lib/commits/commit';

apps/desktop/src/components/BranchHeader.svelte

@@ -3,7 +3,7 @@
 <script lang="ts">
 	import BranchHeaderIcon from '$components/BranchHeaderIcon.svelte';
 	import BranchLabel from '$components/BranchLabel.svelte';
-	import { TestId } from '$lib/testing/testIds';
+	import { TestId } from '@gitbutler/ui';
 	import { slide } from 'svelte/transition';
 	import type iconsJson from '@gitbutler/ui/data/icons.json';
 	import type { Snippet } from 'svelte';

apps/desktop/src/components/BranchHeaderContextMenu.svelte

@@ -24,10 +24,15 @@
 	import { projectAiGenEnabled } from '$lib/config/config';
 	import { DEFAULT_FORGE_FACTORY } from '$lib/forge/forgeFactory.svelte';
 	import { STACK_SERVICE } from '$lib/stacks/stackService.svelte';
-	import { TestId } from '$lib/testing/testIds';
 	import { openExternalUrl } from '$lib/utils/url';
 	import { inject } from '@gitbutler/shared/context';
-	import { ContextMenu, ContextMenuItem, ContextMenuSection, KebabButton } from '@gitbutler/ui';
+	import {
+		ContextMenu,
+		ContextMenuItem,
+		ContextMenuSection,
+		KebabButton,
+		TestId
+	} from '@gitbutler/ui';
 
 	import { tick } from 'svelte';
 	import type { BranchDetails } from '$lib/stacks/stack';

apps/desktop/src/components/BranchLabel.svelte

@@ -1,6 +1,6 @@
 <script lang="ts">
 	import { autoSelectBranchNameFeature } from '$lib/config/uiFeatureFlags';
-	import { TestId } from '$lib/testing/testIds';
+	import { TestId } from '@gitbutler/ui';
 	import { clickOutside } from '@gitbutler/ui/utils/clickOutside';
 	import { resizeObserver } from '@gitbutler/ui/utils/resizeObserver';