remove dependency on model

2 files changed, 25 insertions, 8 deletions

diff --git a/pkg/integration/tests/stash/stash.go b/pkg/integration/tests/stash/stash.go
index 4265e0c23..c627faaf8 100644
--- a/pkg/integration/tests/stash/stash.go
+++ b/pkg/integration/tests/stash/stash.go
@@ -16,17 +16,25 @@ var Stash = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.GitAddAll()
 	},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.Model().StashCount(0)
-		t.Model().WorkingTreeFileCount(1)
+		t.Views().Stash().
+			IsEmpty()
 
 		t.Views().Files().
+			Lines(
+				Contains("file"),
+			).
 			Press(keys.Files.ViewStashOptions)
 
 		t.ExpectMenu().Title(Equals("Stash options")).Select(MatchesRegexp("stash all changes$")).Confirm()
 
 		t.ExpectPrompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm()
 
-		t.Model().StashCount(1)
-		t.Model().WorkingTreeFileCount(0)
+		t.Views().Stash().
+			Lines(
+				Contains("my stashed file"),
+			)
+
+		t.Views().Files().
+			IsEmpty()
 	},
 })
diff --git a/pkg/integration/tests/stash/stash_including_untracked_files.go b/pkg/integration/tests/stash/stash_including_untracked_files.go
index d46d7fb1d..756f7948e 100644
--- a/pkg/integration/tests/stash/stash_including_untracked_files.go
+++ b/pkg/integration/tests/stash/stash_including_untracked_files.go
@@ -17,17 +17,26 @@ var StashIncludingUntrackedFiles = NewIntegrationTest(NewIntegrationTestArgs{
 		shell.GitAdd("file_1")
 	},
 	Run: func(t *TestDriver, keys config.KeybindingConfig) {
-		t.Model().StashCount(0)
-		t.Model().WorkingTreeFileCount(2)
+		t.Views().Stash().
+			IsEmpty()
 
 		t.Views().Files().
+			Lines(
+				Contains("file_1"),
+				Contains("file_2"),
+			).
 			Press(keys.Files.ViewStashOptions)
 
 		t.ExpectMenu().Title(Equals("Stash options")).Select(Contains("stash all changes including untracked files")).Confirm()
 
 		t.ExpectPrompt().Title(Equals("Stash changes")).Type("my stashed file").Confirm()
 
-		t.Model().StashCount(1)
-		t.Model().WorkingTreeFileCount(0)
+		t.Views().Stash().
+			Lines(
+				Contains("my stashed file"),
+			)
+
+		t.Views().Files().
+			IsEmpty()
 	},
 })