When refreshing models, re-apply active filter for the corresponding view

pkg/integration/tests/filter_and_search/filter_updates_when_model_changes.go

@@ -0,0 +1,52 @@
+package filter_and_search
+
+import (
+	"github.com/jesseduffield/lazygit/pkg/config"
+	. "github.com/jesseduffield/lazygit/pkg/integration/components"
+)
+
+var FilterUpdatesWhenModelChanges = NewIntegrationTest(NewIntegrationTestArgs{
+	Description:  "Verify that after deleting a branch the filter is reapplied to show only the remaining branches",
+	ExtraCmdArgs: []string{},
+	Skip:         false,
+	SetupConfig:  func(config *config.AppConfig) {},
+	SetupRepo: func(shell *Shell) {
+		shell.EmptyCommit("first commit")
+		shell.NewBranch("branch-to-delete")
+		shell.NewBranch("other")
+		shell.NewBranch("checked-out-branch")
+	},
+	Run: func(t *TestDriver, keys config.KeybindingConfig) {
+		t.Views().Branches().
+			Focus().
+			Lines(
+				Contains("checked-out-branch").IsSelected(),
+				Contains("other"),
+				Contains("branch-to-delete"),
+				Contains("master"),
+			).
+			FilterOrSearch("branch").
+			Lines(
+				Contains("branch-to-delete").IsSelected(),
+				Contains("checked-out-branch"),
+			).
+			Press(keys.Universal.Remove).
+			Tap(func() {
+				t.ExpectPopup().
+					Menu().
+					Title(Equals("Delete branch 'branch-to-delete'?")).
+					Select(Contains("Delete local branch")).
+					Confirm()
+			}).
+			Lines(
+				Contains("checked-out-branch").IsSelected(),
+			).
+			// cancel the filter
+			PressEscape().
+			Lines(
+				Contains("checked-out-branch").IsSelected(),
+				Contains("other"),
+				Contains("master"),
+			)
+	},
+})

pkg/integration/tests/test_list.go

@@ -133,6 +133,7 @@ var tests = []*components.IntegrationTest{
 	filter_and_search.FilterRemoteBranches,
 	filter_and_search.FilterRemotes,
 	filter_and_search.FilterSearchHistory,
+	filter_and_search.FilterUpdatesWhenModelChanges,
 	filter_and_search.NestedFilter,
 	filter_and_search.NestedFilterTransient,
 	filter_and_search.NewSearch,