diff options
| author | Jesse Duffield <jessedduffield@gmail.com> | 2023-06-26 11:15:47 +1000 |
|---|---|---|
| committer | Jesse Duffield <jessedduffield@gmail.com> | 2023-07-03 12:54:14 +1000 |
| commit | 8e46b8a275587ef442cca8497d9c5056556bfa93 (patch) | |
| tree | 11e170257c4e33d7c9918e9729a52c0cfc606f6e /pkg/integration | |
| parent | cd989d8ebeb923af74e8074cee09863b50862410 (diff) | |
Use searching, not filtering, in file tree views
There's more work to be done to support filtering for these views so we're sticking with searching for now
Diffstat (limited to 'pkg/integration')
4 files changed, 9 insertions, 4 deletions
diff --git a/pkg/integration/tests/filter_and_search/filter_commit_files.go b/pkg/integration/tests/filter_and_search/filter_commit_files.go index a1a39f1f4..953eaf34d 100644 --- a/pkg/integration/tests/filter_and_search/filter_commit_files.go +++ b/pkg/integration/tests/filter_and_search/filter_commit_files.go @@ -8,7 +8,7 @@ import ( var FilterCommitFiles = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Basic commit file filtering by text", ExtraCmdArgs: []string{}, - Skip: false, + Skip: true, // skipping until we have implemented file view filtering SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { shell.CreateDir("folder1") diff --git a/pkg/integration/tests/filter_and_search/filter_files.go b/pkg/integration/tests/filter_and_search/filter_files.go index 5a029b146..6eae90c18 100644 --- a/pkg/integration/tests/filter_and_search/filter_files.go +++ b/pkg/integration/tests/filter_and_search/filter_files.go @@ -8,7 +8,7 @@ import ( var FilterFiles = NewIntegrationTest(NewIntegrationTestArgs{ Description: "Basic file filtering by text", ExtraCmdArgs: []string{}, - Skip: false, + Skip: true, // Skipping until we have implemented file view filtering SetupConfig: func(config *config.AppConfig) {}, SetupRepo: func(shell *Shell) { shell.CreateDir("folder1") diff --git a/pkg/integration/tests/filter_and_search/nested_filter.go b/pkg/integration/tests/filter_and_search/nested_filter.go index 7dad9d61a..6444ad523 100644 --- a/pkg/integration/tests/filter_and_search/nested_filter.go +++ b/pkg/integration/tests/filter_and_search/nested_filter.go @@ -67,7 +67,9 @@ var NestedFilter = NewIntegrationTest(NewIntegrationTestArgs{ ). FilterOrSearch("grape"). Lines( + Contains(`apple`), Contains(`grape`).IsSelected(), + Contains(`orange`), ). PressEnter() @@ -85,7 +87,9 @@ var NestedFilter = NewIntegrationTest(NewIntegrationTestArgs{ t.Views().CommitFiles(). IsFocused(). Lines( + Contains(`apple`), Contains(`grape`).IsSelected(), + Contains(`orange`), ). Tap(func() { t.Views().Search().IsVisible().Content(Contains("matches for 'grape'")) diff --git a/pkg/integration/tests/filter_and_search/nested_filter_transient.go b/pkg/integration/tests/filter_and_search/nested_filter_transient.go index 300519784..bf04406f5 100644 --- a/pkg/integration/tests/filter_and_search/nested_filter_transient.go +++ b/pkg/integration/tests/filter_and_search/nested_filter_transient.go @@ -72,9 +72,10 @@ var NestedFilterTransient = NewIntegrationTest(NewIntegrationTestArgs{ Contains(`file-one`).IsSelected(), Contains(`file-two`), ). - FilterOrSearch("one"). + FilterOrSearch("two"). Lines( - Contains(`file-one`).IsSelected(), + Contains(`file-one`), + Contains(`file-two`).IsSelected(), ) t.Views().Branches(). |