fix: satisfy clippy and stabilize app startup test
This commit is contained in:
@@ -132,7 +132,7 @@ fn finish_remote_connection(vault: &Path, connection: &RemoteConnection) -> GitA
|
||||
{
|
||||
return connect_result(
|
||||
ConnectStatus::IncompatibleHistory,
|
||||
&format!(
|
||||
format!(
|
||||
"This repository already has git branches, but not '{}'. Use an empty repository or one created from this vault.",
|
||||
connection.branch
|
||||
),
|
||||
@@ -154,7 +154,7 @@ fn finish_remote_connection(vault: &Path, connection: &RemoteConnection) -> GitA
|
||||
if behind > 0 {
|
||||
return connect_result(
|
||||
ConnectStatus::IncompatibleHistory,
|
||||
&format!(
|
||||
format!(
|
||||
"This repository already has commits on '{}' that are not in this vault. Tolaria will not connect it automatically.",
|
||||
connection.branch
|
||||
),
|
||||
@@ -307,7 +307,7 @@ fn classify_connect_error(stderr: &str) -> GitAddRemoteResult {
|
||||
|
||||
connect_result(
|
||||
ConnectStatus::Error,
|
||||
&format!(
|
||||
format!(
|
||||
"Could not connect that remote: {}",
|
||||
concise_git_detail(stderr)
|
||||
),
|
||||
|
||||
@@ -202,10 +202,7 @@ describe('App', () => {
|
||||
|
||||
it('renders the four-panel layout', async () => {
|
||||
render(<App />)
|
||||
// Wait for vault to load
|
||||
await waitFor(() => {
|
||||
expect(screen.getByText('All Notes')).toBeInTheDocument()
|
||||
})
|
||||
expect(await screen.findByText('All Notes', {}, { timeout: 5000 })).toBeInTheDocument()
|
||||
})
|
||||
|
||||
it('loads and displays vault entries in sidebar', async () => {
|
||||
|
||||
Reference in New Issue
Block a user