add view asserter getter struct

28 files changed, 139 insertions, 139 deletions

diff --git a/pkg/integration/tests/bisect/basic.go b/pkg/integration/tests/bisect/basic.go
index 86e58b681..7e2a21a61 100644
--- a/pkg/integration/tests/bisect/basic.go
+++ b/pkg/integration/tests/bisect/basic.go
@@ -34,28 +34,28 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{
 
 		input.SwitchToCommitsView()
 
-		assert.CurrentView().SelectedLine(Contains("commit 10"))
+		assert.Views().Current().SelectedLine(Contains("commit 10"))
 
 		input.NavigateToListItem(Contains("commit 09"))
 
 		markCommitAsBad()
 
-		assert.View("information").Content(Contains("bisecting"))
+		assert.Views().ByName("information").Content(Contains("bisecting"))
 
-		assert.CurrentView().Name("commits").SelectedLine(Contains("<-- bad"))
+		assert.Views().Current().Name("commits").SelectedLine(Contains("<-- bad"))
 
 		input.NavigateToListItem(Contains("commit 02"))
 
 		markCommitAsGood()
 
 		// lazygit will land us in the commit between our good and bad commits.
-		assert.CurrentView().
+		assert.Views().Current().
 			Name("commits").
 			SelectedLine(Contains("commit 05").Contains("<-- current"))
 
 		markCommitAsBad()
 
-		assert.CurrentView().
+		assert.Views().Current().
 			Name("commits").
 			SelectedLine(Contains("commit 04").Contains("<-- current"))
 
@@ -64,7 +64,7 @@ var Basic = NewIntegrationTest(NewIntegrationTestArgs{
 		// commit 5 is the culprit because we marked 4 as good and 5 as bad.
 		input.Alert().Title(Equals("Bisect complete")).Content(MatchesRegexp("(?s)commit 05.*Do you want to reset")).Confirm()
 
-		assert.CurrentView().Name("commits").Content(Contains("commit 04"))
-		assert.View("information").Content(DoesNotContain("bisecting"))
+		assert.Views().Current().Name("commits").Content(Contains("commit 04"))
+		assert.Views().ByName("information").Content(DoesNotContain("bisecting"))
 	},
 })
diff --git a/pkg/integration/tests/bisect/from_other_branch.go b/pkg/integration/tests/bisect/from_other_branch.go
index 40308246e..255b39542 100644
--- a/pkg/integration/tests/bisect/from_other_branch.go
+++ b/pkg/integration/tests/bisect/from_other_branch.go
@@ -24,13 +24,13 @@ var FromOtherBranch = NewIntegrationTest(NewIntegrationTestArgs{
 		assert *Assert,
 		keys config.KeybindingConfig,
 	) {
-		assert.View("information").Content(Contains("bisecting"))
+		assert.Views().ByName("information").Content(Contains("bisecting"))
 
 		assert.AtLeastOneCommit()
 
 		input.SwitchToCommitsView()
 
-		assert.CurrentView().TopLines(
+		assert.Views().Current().TopLines(
 			MatchesRegexp(`<-- bad.*commit 08`),
 			MatchesRegexp(`<-- current.*commit 07`),
 			MatchesRegexp(`\?.*commit 06`),
@@ -44,10 +44,10 @@ var FromOtherBranch = NewIntegrationTest(NewIntegrationTestArgs{
 
 		input.Alert().Title(Equals("Bisect complete")).Content(MatchesRegexp("(?s)commit 08.*Do you want to reset")).Confirm()
 
-		assert.View("information").Content(DoesNotContain("bisecting"))
+		assert.Views().ByName("information").Content(DoesNotContain("bisecting"))
 
 		// back in master branch which just had the one commit
-		assert.CurrentView().Name("commits").Lines(
+		assert.Views().Current().Name("commits").Lines(
 			Contains("only commit on master"),
 		)
 	},
diff --git a/pkg/integration/tests/branch/checkout_by_name.go b/pkg/integration/tests/branch/checkout_by_name.go
index e855b7103..ccf75a831 100644
--- a/pkg/integration/tests/branch/checkout_by_name.go
+++ b/pkg/integration/tests/branch/checkout_by_name.go
@@ -20,7 +20,7 @@ var CheckoutByName = NewIntegrationTest(NewIntegrationTestArgs{
 	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
 		input.SwitchToBranchesView()
 
-		assert.CurrentView().Lines(
+		assert.Views().Current().Lines(
 			Contains("master"),
 			Contains("@"),
 		)
@@ -32,7 +32,7 @@ var CheckoutByName = NewIntegrationTest(NewIntegrationTestArgs{
 
 		input.Alert().Title(Equals("Branch not found")).Content(Equals("Branch not found. Create a new branch named new-branch?")).Confirm()
 
-		assert.CurrentView().Name("localBranches").
+		assert.Views().Current().Name("localBranches").
 			Lines(
 				MatchesRegexp(`\*.*new-branch`),
 				Contains("master"),
diff --git a/pkg/integration/tests/branch/delete.go b/pkg/integration/tests/branch/delete.go
index c28668bb5..08b4e8f62 100644
--- a/pkg/integration/tests/branch/delete.go
+++ b/pkg/integration/tests/branch/delete.go
@@ -19,7 +19,7 @@ var Delete = NewIntegrationTest(NewIntegrationTestArgs{
 	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
 		input.SwitchToBranchesView()
 
-		assert.CurrentView().Lines(
+		assert.Views().Current().Lines(
 			MatchesRegexp(`\*.*branch-two`),
 			MatchesRegexp(`branch-one`),
 			MatchesRegexp(`master`),
@@ -36,7 +36,7 @@ var Delete = NewIntegrationTest(NewIntegrationTestArgs{
 			Content(Contains("Are you sure you want to delete the branch 'branch-one'?")).
 			Confirm()
 
-		assert.CurrentView().Name("localBranches").
+		assert.Views().Current().Name("localBranches").
 			Lines(
 				MatchesRegexp(`\*.*branch-two`),
 				MatchesRegexp(`master`).IsSelected(),
diff --git a/pkg/integration/tests/branch/rebase.go b/pkg/integration/tests/branch/rebase.go
index e4f03810e..ab3302068 100644
--- a/pkg/integration/tests/branch/rebase.go
+++ b/pkg/integration/tests/branch/rebase.go
@@ -17,13 +17,13 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
 	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
 		input.SwitchToBranchesView()
 
-		assert.View("localBranches").Lines(
+		assert.Views().ByName("localBranches").Lines(
 			Contains("first-change-branch"),
 			Contains("second-change-branch"),
 			Contains("original-branch"),
 		)
 
-		assert.View("commits").TopLines(
+		assert.Views().ByName("commits").TopLines(
 			Contains("first change"),
 			Contains("original"),
 		)
@@ -40,25 +40,25 @@ var Rebase = NewIntegrationTest(NewIntegrationTestArgs{
 			Content(Contains("Conflicts!")).
 			Confirm()
 
-		assert.CurrentView().Name("files").SelectedLine(Contains("file"))
+		assert.Views().Current().Name("files").SelectedLine(Contains("file"))
 
 		// not using Confirm() convenience method because I suspect we might change this
 		// keybinding to something more bespoke
 		input.Press(keys.Universal.Confirm)
 
-		assert.CurrentView().Name("mergeConflicts")
+		assert.Views().Current().Name("mergeConflicts")
 		input.PrimaryAction()
 
-		assert.View("information").Content(Contains("rebasing"))
+		assert.Views().ByName("information").Content(Contains("rebasing"))
 
 		input.Confirmation().
 			Title(Equals("continue")).
 			Content(Contains("all merge conflicts resolved. Continue?")).
 			Confirm()
 
-		assert.View("information").Content(DoesNotContain("rebasing"))
+		assert.Views().ByName("information").Content(DoesNotContain("rebasing"))
 
-		assert.View("commits").TopLines(
+		assert.Views().ByName("commits").TopLines(
 			Contains("second-change-branch unrelated change"),
 			Contains("second change"),
 			Contains("original"),
diff --git a/pkg/integration/tests/branch/rebase_and_drop.go b/pkg/integration/tests/branch/rebase_and_drop.go
index b1cc408ba..1c77dbefc 100644
--- a/pkg/integration/tests/branch/rebase_and_drop.go
+++ b/pkg/integration/tests/branch/rebase_and_drop.go
@@ -20,13 +20,13 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
 	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
 		input.SwitchToBranchesView()
 
-		assert.CurrentView().Lines(
+		assert.Views().Current().Lines(
 			Contains("first-change-branch"),
 			Contains("second-change-branch"),
 			Contains("original-branch"),
 		)
 
-		assert.View("commits").TopLines(
+		assert.Views().ByName("commits").TopLines(
 			Contains("to keep").IsSelected(),
 			Contains("to remove"),
 			Contains("first change"),
@@ -41,19 +41,19 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
 			Content(Contains("Are you sure you want to rebase 'first-change-branch' on top of 'second-change-branch'?")).
 			Confirm()
 
-		assert.View("information").Content(Contains("rebasing"))
+		assert.Views().ByName("information").Content(Contains("rebasing"))
 
 		input.Confirmation().
 			Title(Equals("Auto-merge failed")).
 			Content(Contains("Conflicts!")).
 			Confirm()
 
-		assert.CurrentView().
+		assert.Views().Current().
 			Name("files").
 			SelectedLine(MatchesRegexp("UU.*file"))
 
 		input.SwitchToCommitsView()
-		assert.CurrentView().
+		assert.Views().Current().
 			TopLines(
 				MatchesRegexp(`pick.*to keep`).IsSelected(),
 				MatchesRegexp(`pick.*to remove`),
@@ -65,7 +65,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
 		input.NextItem()
 		input.Press(keys.Universal.Remove)
 
-		assert.CurrentView().
+		assert.Views().Current().
 			TopLines(
 				MatchesRegexp(`pick.*to keep`),
 				MatchesRegexp(`drop.*to remove`).IsSelected(),
@@ -80,7 +80,7 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
 		// keybinding to something more bespoke
 		input.Press(keys.Universal.Confirm)
 
-		assert.CurrentView().Name("mergeConflicts")
+		assert.Views().Current().Name("mergeConflicts")
 		input.PrimaryAction()
 
 		input.Confirmation().
@@ -88,9 +88,9 @@ var RebaseAndDrop = NewIntegrationTest(NewIntegrationTestArgs{
 			Content(Contains("all merge conflicts resolved. Continue?")).
 			Confirm()
 
-		assert.View("information").Content(DoesNotContain("rebasing"))
+		assert.Views().ByName("information").Content(DoesNotContain("rebasing"))
 
-		assert.View("commits").TopLines(
+		assert.Views().ByName("commits").TopLines(
 			Contains("to keep"),
 			Contains("second-change-branch unrelated change").IsSelected(),
 			Contains("second change"),
diff --git a/pkg/integration/tests/branch/reset.go b/pkg/integration/tests/branch/reset.go
index 821373934..fec6aea7a 100644
--- a/pkg/integration/tests/branch/reset.go
+++ b/pkg/integration/tests/branch/reset.go
@@ -21,14 +21,14 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.EmptyCommit("current-branch commit")
 	},
 	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
-		assert.View("commits").Lines(
+		assert.Views().ByName("commits").Lines(
 			Contains("current-branch commit"),
 			Contains("root commit"),
 		)
 
 		input.SwitchToBranchesView()
 
-		assert.CurrentView().Lines(
+		assert.Views().Current().Lines(
 			Contains("current-branch"),
 			Contains("other-branch"),
 		)
@@ -39,11 +39,11 @@ var Reset = NewIntegrationTest(NewIntegrationTestArgs{
 		input.Menu().Title(Contains("reset to other-branch")).Select(Contains("hard reset")).Confirm()
 
 		// ensure that we've returned from the menu before continuing
-		assert.CurrentView().Name("localBranches")
+		assert.Views().Current().Name("localBranches")
 
 		// assert that we now have the expected commits in the commit panel
 		input.SwitchToCommitsView()
-		assert.CurrentView().Lines(
+		assert.Views().Current().Lines(
 			Contains("other-branch commit"),
 			Contains("root commit"),
 		)
diff --git a/pkg/integration/tests/cherry_pick/cherry_pick.go b/pkg/integration/tests/cherry_pick/cherry_pick.go
index 631685577..f832bfe83 100644
--- a/pkg/integration/tests/cherry_pick/cherry_pick.go
+++ b/pkg/integration/tests/cherry_pick/cherry_pick.go
@@ -26,7 +26,7 @@ var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{
 	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
 		input.SwitchToBranchesView()
 
-		assert.CurrentView().Lines(
+		assert.Views().Current().Lines(
 			Contains("first-branch"),
 			Contains("second-branch"),
 			Contains("master"),
@@ -36,7 +36,7 @@ var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{
 
 		input.Enter()
 
-		assert.CurrentView().Name("subCommits").Lines(
+		assert.Views().Current().Name("subCommits").Lines(
 			Contains("four"),
 			Contains("three"),
 			Contains("base"),
@@ -44,14 +44,14 @@ var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{
 
 		// copy commits 'four' and 'three'
 		input.Press(keys.Commits.CherryPickCopy)
-		assert.View("information").Content(Contains("1 commit copied"))
+		assert.Views().ByName("information").Content(Contains("1 commit copied"))
 		input.NextItem()
 		input.Press(keys.Commits.CherryPickCopy)
-		assert.View("information").Content(Contains("2 commits copied"))
+		assert.Views().ByName("information").Content(Contains("2 commits copied"))
 
 		input.SwitchToCommitsView()
 
-		assert.CurrentView().Lines(
+		assert.Views().Current().Lines(
 			Contains("two"),
 			Contains("one"),
 			Contains("base"),
@@ -63,7 +63,7 @@ var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{
 			Content(Contains("Are you sure you want to cherry-pick the copied commits onto this branch?")).
 			Confirm()
 
-		assert.CurrentView().Name("commits").Lines(
+		assert.Views().Current().Name("commits").Lines(
 			Contains("four"),
 			Contains("three"),
 			Contains("two"),
@@ -71,8 +71,8 @@ var CherryPick = NewIntegrationTest(NewIntegrationTestArgs{
 			Contains("base"),
 		)
 
-		assert.View("information").Content(Contains("2 commits copied"))
+		assert.Views().ByName("information").Content(Contains("2 commits copied"))
 		input.Press(keys.Universal.Return)
-		assert.View("information").Content(DoesNotContain("commits copied"))
+		assert.Views().ByName("information").Content(DoesNotContain("commits copied"))
 	},
 })
diff --git a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go
index 8efb94e5d..b0be4b48e 100644
--- a/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go
+++ b/pkg/integration/tests/cherry_pick/cherry_pick_conflicts.go
@@ -16,7 +16,7 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
 	},
 	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
 		input.SwitchToBranchesView()
-		assert.CurrentView().Lines(
+		assert.Views().Current().Lines(
 			Contains("first-change-branch"),
 			Contains("second-change-branch"),
 			Contains("original-branch"),
@@ -26,21 +26,21 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
 
 		input.Enter()
 
-		assert.CurrentView().Name("subCommits").TopLines(
+		assert.Views().Current().Name("subCommits").TopLines(
 			Contains("second-change-branch unrelated change"),
 			Contains("second change"),
 		)
 
 		input.Press(keys.Commits.CherryPickCopy)
-		assert.View("information").Content(Contains("1 commit copied"))
+		assert.Views().ByName("information").Content(Contains("1 commit copied"))
 
 		input.NextItem()
 		input.Press(keys.Commits.CherryPickCopy)
-		assert.View("information").Content(Contains("2 commits copied"))
+		assert.Views().ByName("information").Content(Contains("2 commits copied"))
 
 		input.SwitchToCommitsView()
 
-		assert.CurrentView().TopLines(
+		assert.Views().Current().TopLines(
 			Contains("first change"),
 		)
 
@@ -52,14 +52,14 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
 			Content(Contains("Conflicts!")).
 			Confirm()
 
-		assert.CurrentView().Name("files")
-		assert.CurrentView().SelectedLine(Contains("file"))
+		assert.Views().Current().Name("files")
+		assert.Views().Current().SelectedLine(Contains("file"))
 
 		// not using Confirm() convenience method because I suspect we might change this
 		// keybinding to something more bespoke
 		input.Press(keys.Universal.Confirm)
 
-		assert.CurrentView().Name("mergeConflicts")
+		assert.Views().Current().Name("mergeConflicts")
 		// picking 'Second change'
 		input.NextItem()
 		input.PrimaryAction()
@@ -69,12 +69,12 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
 			Content(Contains("all merge conflicts resolved. Continue?")).
 			Confirm()
 
-		assert.CurrentView().Name("files")
+		assert.Views().Current().Name("files")
 		assert.WorkingTreeFileCount(0)
 
 		input.SwitchToCommitsView()
 
-		assert.CurrentView().TopLines(
+		assert.Views().Current().TopLines(
 			Contains("second-change-branch unrelated change"),
 			Contains("second change"),
 			Contains("first change"),
@@ -83,12 +83,12 @@ var CherryPickConflicts = NewIntegrationTest(NewIntegrationTestArgs{
 		// because we picked 'Second change' when resolving the conflict,
 		// we now see this commit as having replaced First Change with Second Change,
 		// as opposed to replacing 'Original' with 'Second change'
-		assert.MainView().
+		assert.Views().Main().
 			Content(Contains("-First Change")).
 			Content(Contains("+Second Change"))
 
-		assert.View("information").Content(Contains("2 commits copied"))
+		assert.Views().ByName("information").Content(Contains("2 commits copied"))
 		input.Press(keys.Universal.Return)
-		assert.View("information").Content(DoesNotContain("commits copied"))
+		assert.Views().ByName("information").Content(DoesNotContain("commits copied"))
 	},
 })
diff --git a/pkg/integration/tests/commit/commit_multiline.go b/pkg/integration/tests/commit/commit_multiline.go
index 4d6ba883a..eb0723c39 100644
--- a/pkg/integration/tests/commit/commit_multiline.go
+++ b/pkg/integration/tests/commit/commit_multiline.go
@@ -25,6 +25,6 @@ var CommitMultiline = NewIntegrationTest(NewIntegrationTestArgs{
 		assert.HeadCommitMessage(Equals("first line"))
 
 		input.SwitchToCommitsView()
-		assert.MainView().Content(MatchesRegexp("first line\n\\s*\n\\s*third line"))
+		assert.Views().Main().Content(MatchesRegexp("first line\n\\s*\n\\s*third line"))
 	},
 })
diff --git a/pkg/integration/tests/commit/new_branch.go b/pkg/integration/tests/commit/new_branch.go
index c14e48310..a4001df8d 100644
--- a/pkg/integration/tests/commit/new_branch.go
+++ b/pkg/integration/tests/commit/new_branch.go
@@ -20,7 +20,7 @@ var NewBranch = NewIntegrationTest(NewIntegrationTestArgs{
 		assert.CommitCount(3)
 
 		input.SwitchToCommitsView()
-		assert.CurrentView().Lines(
+		assert.Views().Current().Lines(
 			Contains("commit 3"),
 			Contains("commit 2"),
 			Contains("commit 1"),
@@ -34,7 +34,7 @@ var NewBranch = NewIntegrationTest(NewIntegrationTestArgs{
 
 		assert.CurrentBranchName(branchName)
 
-		assert.View("commits").Lines(
+		assert.Views().ByName("commits").Lines(
 			Contains("commit 2"),
 			Contains("commit 1"),
 		)
diff --git a/pkg/integration/tests/commit/revert.go b/pkg/integration/tests/commit/revert.go
index 9527d5640..5ce7ac12b 100644
--- a/pkg/integration/tests/commit/revert.go
+++ b/pkg/integration/tests/commit/revert.go
@@ -20,7 +20,7 @@ var Revert = NewIntegrationTest(NewIntegrationTestArgs{
 
 		input.SwitchToCommitsView()
 
-		assert.CurrentView().Lines(
+		assert.Views().Current().Lines(
 			Contains("first commit"),
 		)
 
@@ -30,13 +30,13 @@ var Revert = NewIntegrationTest(NewIntegrationTestArgs{
 			Content(MatchesRegexp(`Are you sure you want to revert \w+?`)).
 			Confirm()
 
-		assert.CurrentView().Name("commits").
+		assert.Views().Current().Name("commits").
 			Lines(
 				Contains("Revert \"first commit\"").IsSelected(),
 				Contains("first commit"),
 			)
 
-		assert.MainView().Content(Contains("-myfile content"))
+		assert.Views().Main().Content(Contains("-myfile content"))
 		assert.FileSystemPathNotPresent("myfile")
 	},
 })
diff --git a/pkg/integration/tests/commit/staged.go b/pkg/integration/tests/commit/staged.go
index 4a0c3eafc..7862aaeef 100644
--- a/pkg/integration/tests/commit/staged.go
+++ b/pkg/integration/tests/commit/staged.go
@@ -18,26 +18,26 @@ var Staged = NewIntegrationTest(NewIntegrationTestArgs{
 	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
 		assert.CommitCount(0)
 
-		assert.CurrentView().Name("files")
-		assert.CurrentView().SelectedLine(Contains("myfile"))
+		assert.Views().Current().Name("files")
+		assert.Views().Current().SelectedLine(Contains("myfile"))
 		// stage the file
 		input.PrimaryAction()
 		input.Enter()
-		assert.CurrentView().Name("stagingSecondary")
+		assert.Views().Current().Name("stagingSecondary")
 		// we start with both lines having been staged
-		assert.View("stagingSecondary").Content(Contains("+myfile content"))
-		assert.View("stagingSecondary").Content(Contains("+with a second line"))
-		assert.View("staging").Content(DoesNotContain("+myfile content"))
-		assert.View("staging").Content(DoesNotContain("+with a second line"))
+		assert.Views().ByName("stagingSecondary").Content(Contains("+myfile content"))
+		assert.Views().ByName("stagingSecondary").Content(Contains("+with a second line"))
+		assert.Views().ByName("staging").Content(DoesNotContain("+myfile content"))
+		assert.Views().ByName("staging").Content(DoesNotContain("+with a second line"))
 
 		// unstage the selected line
 		input.PrimaryAction()
 
 		// the line should have been moved to the main view
-		assert.View("stagingSecondary").Content(DoesNotContain("+myfile content"))
-		assert.View("stagingSecondary").Content(Contains("+with a second line"))
-		assert.View("staging").Content(Contains("+myfile content"))
-		assert.View("staging").Content(DoesNotContain("+with a second line"))
+		assert.Views().ByName("stagingSecondary").Content(DoesNotContain("+myfile content"))
+		assert.Views().ByName("stagingSecondary").Content(Contains("+with a second line"))
+		assert.Views().ByName("staging").Content(Contains("+myfile content"))
+		assert.Views().ByName("staging").Content(DoesNotContain("+with a second line"))
 
 		input.Press(keys.Files.CommitChanges)
 		commitMessage := "my commit message"
diff --git a/pkg/integration/tests/commit/staged_without_hooks.go b/pkg/integration/tests/commit/staged_without_hooks.go
index 95fa72e7e..1f41238a3 100644
--- a/pkg/integration/tests/commit/staged_without_hooks.go
+++ b/pkg/integration/tests/commit/staged_without_hooks.go
@@ -19,16 +19,16 @@ var StagedWithoutHooks = NewIntegrationTest(NewIntegrationTestArgs{
 		assert.CommitCount(0)
 
 		// stage the file
-		assert.CurrentView().Name("files")
-		assert.CurrentView().SelectedLine(Contains("myfile"))
+		assert.Views().Current().Name("files")
+		assert.Views().Current().SelectedLine(Contains("myfile"))
 		input.PrimaryAction()
 		input.Enter()
-		assert.CurrentView().Name("stagingSecondary")
+		assert.Views().Current().Name("stagingSecondary")
 		// we start with both lines having been staged
-		assert.View("stagingSecondary").Content(
+		assert.Views().ByName("stagingSecondary").Content(
 			Contains("+myfile content").Contains("+with a second line"),
 		)
-		assert.View("staging").Content(
+		assert.Views().ByName("staging").Content(
 			DoesNotContain("+myfile content").DoesNotContain("+with a second line"),
 		)
 
@@ -36,8 +36,8 @@ var StagedWithoutHooks = NewIntegrationTest(NewIntegrationTestArgs{
 		input.PrimaryAction()
 
 		// the line should have been moved to the main view
-		assert.View("stagingSecondary").Content(DoesNotContain("+myfile content").Contains("+with a second line"))
-		assert.View("staging").Content(Contains("+myfile content").DoesNotContain("+with a second line"))
+		assert.Views().ByName("stagingSecondary").Content(DoesNotContain("+myfile content").Contains("+with a second line"))
+		assert.Views().ByName("staging").Content(Contains("+myfile content").DoesNotContain("+with a second line"))
 
 		input.Press(keys.Files.CommitChangesWithoutHook)
 
@@ -46,7 +46,7 @@ var StagedWithoutHooks = NewIntegrationTest(NewIntegrationTestArgs{
 
 		assert.CommitCount(1)
 		assert.HeadCommitMessage(Equals("WIP" + commitMessage))
-		assert.CurrentView().Name("stagingSecondary")
+		assert.Views().Current().Name("stagingSecondary")
 
 		// TODO: assert that the staging panel has been refreshed (it currently does not get correctly refreshed)
 	},
diff --git a/pkg/integration/tests/commit/unstaged.go b/pkg/integration/tests/commit/unstaged.go
index f46c06a87..9b56c9c43 100644
--- a/pkg/integration/tests/commit/unstaged.go
+++ b/pkg/integration/tests/commit/unstaged.go
@@ -20,14 +20,14 @@ var Unstaged = NewIntegrationTest(NewIntegrationTestArgs{
 	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
 		assert.CommitCount(0)
 
-		assert.CurrentView().Name("files").Sel