fixup! Make it mandatory to acknowledge toasts in tests

Author: stefanhaller

pkg/gui/gui_driver.go

@@ -26,7 +26,7 @@ type GuiDriver struct {
 var _ integrationTypes.GuiDriver = &GuiDriver{}
 
 func (self *GuiDriver) PressKey(keyStr string) {
-	self.checkAllToastsAcknowledged()
+	self.CheckAllToastsAcknowledged()
 
 	key := keybindings.GetKey(keyStr)
 
@@ -49,7 +49,7 @@ func (self *GuiDriver) PressKey(keyStr string) {
 }
 
 func (self *GuiDriver) Click(x, y int) {
-	self.checkAllToastsAcknowledged()
+	self.CheckAllToastsAcknowledged()
 
 	self.gui.g.ReplayedEvents.MouseEvents <- gocui.NewTcellMouseEventWrapper(
 		tcell.NewEventMouse(x, y, tcell.ButtonPrimary, 0),
@@ -63,7 +63,7 @@ func (self *GuiDriver) waitTillIdle() {
 	<-self.isIdleChan
 }
 
-func (self *GuiDriver) checkAllToastsAcknowledged() {
+func (self *GuiDriver) CheckAllToastsAcknowledged() {
 	if t := self.NextToast(); t != nil {
 		self.Fail("Toast not acknowledged: " + *t)
 	}

pkg/integration/components/test.go

@@ -194,6 +194,8 @@ func (self *IntegrationTest) Run(gui integrationTypes.GuiDriver) {
 
 	self.run(testDriver, keys)
 
+	gui.CheckAllToastsAcknowledged()
+
 	if InputDelay() > 0 {
 		// Clear whatever caption there was so it doesn't linger
 		testDriver.SetCaption("")

pkg/integration/components/test_test.go

@@ -82,6 +82,8 @@ func (self *fakeGuiDriver) NextToast() *string {
 	return nil
 }
 
+func (self *fakeGuiDriver) CheckAllToastsAcknowledged() {}
+
 func TestManualFailure(t *testing.T) {
 	test := NewIntegrationTest(NewIntegrationTestArgs{
 		Description: unitTestDescription,

pkg/integration/types/types.go

@@ -45,4 +45,5 @@ type GuiDriver interface {
 	SetCaptionPrefix(prefix string)
 	// Pop the next toast that was displayed; returns nil if there was none
 	NextToast() *string
+	CheckAllToastsAcknowledged()
 }