combine assert and input structs, clean up interface

1 files changed, 15 insertions, 14 deletions

diff --git a/pkg/integration/tests/branch/delete.go b/pkg/integration/tests/branch/delete.go
index 08b4e8f62..eba3a016f 100644
--- a/pkg/integration/tests/branch/delete.go
+++ b/pkg/integration/tests/branch/delete.go
@@ -16,27 +16,28 @@ var Delete = NewIntegrationTest(NewIntegrationTestArgs{
 			NewBranch("branch-one").
 			NewBranch("branch-two")
 	},
-	Run: func(shell *Shell, input *Input, assert *Assert, keys config.KeybindingConfig) {
-		input.SwitchToBranchesView()
-
-		assert.Views().Current().Lines(
-			MatchesRegexp(`\*.*branch-two`),
-			MatchesRegexp(`branch-one`),
-			MatchesRegexp(`master`),
-		)
+	Run: func(shell *Shell, input *Input, keys config.KeybindingConfig) {
+		input.Views().Branches().
+			Focus().
+			Lines(
+				MatchesRegexp(`\*.*branch-two`).IsSelected(),
+				MatchesRegexp(`branch-one`),
+				MatchesRegexp(`master`),
+			).
+			Press(keys.Universal.Remove)
 
-		input.Press(keys.Universal.Remove)
-		input.Alert().Title(Equals("Error")).Content(Contains("You cannot delete the checked out branch!")).Confirm()
+		input.ExpectAlert().Title(Equals("Error")).Content(Contains("You cannot delete the checked out branch!")).Confirm()
 
-		input.NextItem()
+		input.Views().Branches().
+			SelectNextItem().
+			Press(keys.Universal.Remove)
 
-		input.Press(keys.Universal.Remove)
-		input.Confirmation().
+		input.ExpectConfirmation().
 			Title(Equals("Delete Branch")).
 			Content(Contains("Are you sure you want to delete the branch 'branch-one'?")).
 			Confirm()
 
-		assert.Views().Current().Name("localBranches").
+		input.Views().Branches().IsFocused().
 			Lines(
 				MatchesRegexp(`\*.*branch-two`),
 				MatchesRegexp(`master`).IsSelected(),