From f770a6246bfcb9de56f455eaba2880e392d0dbcf Mon Sep 17 00:00:00 2001 From: Jesse Duffield Date: Wed, 28 Dec 2022 14:19:56 +1100 Subject: [PATCH] rename function --- pkg/integration/components/file_system.go | 2 +- pkg/integration/tests/file/discard_staged_changes.go | 2 +- pkg/integration/tests/file/exclude_gitignore.go | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/integration/components/file_system.go b/pkg/integration/components/file_system.go index ea9a2e929..4ac064838 100644 --- a/pkg/integration/components/file_system.go +++ b/pkg/integration/components/file_system.go @@ -26,7 +26,7 @@ func (self *FileSystem) PathNotPresent(path string) { } // Asserts that the file at the given path has the given content -func (self *FileSystem) FileContainsContent(path string, matcher *matcher) { +func (self *FileSystem) FileContent(path string, matcher *matcher) { self.assertWithRetries(func() (bool, string) { _, err := os.Stat(path) if os.IsNotExist(err) { diff --git a/pkg/integration/tests/file/discard_staged_changes.go b/pkg/integration/tests/file/discard_staged_changes.go index 180dc45b4..728df8898 100644 --- a/pkg/integration/tests/file/discard_staged_changes.go +++ b/pkg/integration/tests/file/discard_staged_changes.go @@ -47,6 +47,6 @@ var DiscardStagedChanges = NewIntegrationTest(NewIntegrationTestArgs{ ) // the file should have the same content that it originally had, given that that was committed already - t.FileSystem().FileContainsContent("fileToRemove", Equals("original content")) + t.FileSystem().FileContent("fileToRemove", Equals("original content")) }, }) diff --git a/pkg/integration/tests/file/exclude_gitignore.go b/pkg/integration/tests/file/exclude_gitignore.go index 7db56d994..10ea62f15 100644 --- a/pkg/integration/tests/file/exclude_gitignore.go +++ b/pkg/integration/tests/file/exclude_gitignore.go @@ -33,7 +33,7 @@ var ExcludeGitignore = NewIntegrationTest(NewIntegrationTestArgs{ t.ExpectPopup().Alert().Title(Equals("Error")).Content(Equals("Cannot ignore .gitignore")).Confirm() }) - t.FileSystem().FileContainsContent(".gitignore", Equals("")) - t.FileSystem().FileContainsContent(".git/info/exclude", DoesNotContain(".gitignore")) + t.FileSystem().FileContent(".gitignore", Equals("")) + t.FileSystem().FileContent(".git/info/exclude", DoesNotContain(".gitignore")) }, })