rename from asserter to driver

pkg/integration/components/alert_asserter.go → pkg/integration/components/alert_driver.go

@@ -1,46 +1,46 @@
 package components
 
-type AlertAsserter struct {
+type AlertDriver struct {
 	t                 *TestDriver
 	hasCheckedTitle   bool
 	hasCheckedContent bool
 }
 
-func (self *AlertAsserter) getViewAsserter() *View {
+func (self *AlertDriver) getViewDriver() *ViewDriver {
 	return self.t.Views().Confirmation()
 }
 
 // asserts that the alert view has the expected title
-func (self *AlertAsserter) Title(expected *matcher) *AlertAsserter {
-	self.getViewAsserter().Title(expected)
+func (self *AlertDriver) Title(expected *matcher) *AlertDriver {
+	self.getViewDriver().Title(expected)
 
 	self.hasCheckedTitle = true
 
 	return self
 }
 
 // asserts that the alert view has the expected content
-func (self *AlertAsserter) Content(expected *matcher) *AlertAsserter {
-	self.getViewAsserter().Content(expected)
+func (self *AlertDriver) Content(expected *matcher) *AlertDriver {
+	self.getViewDriver().Content(expected)
 
 	self.hasCheckedContent = true
 
 	return self
 }
 
-func (self *AlertAsserter) Confirm() {
+func (self *AlertDriver) Confirm() {
 	self.checkNecessaryChecksCompleted()
 
-	self.getViewAsserter().PressEnter()
+	self.getViewDriver().PressEnter()
 }
 
-func (self *AlertAsserter) Cancel() {
+func (self *AlertDriver) Cancel() {
 	self.checkNecessaryChecksCompleted()
 
-	self.getViewAsserter().PressEscape()
+	self.getViewDriver().PressEscape()
 }
 
-func (self *AlertAsserter) checkNecessaryChecksCompleted() {
+func (self *AlertDriver) checkNecessaryChecksCompleted() {
 	if !self.hasCheckedContent || !self.hasCheckedTitle {
 		self.t.Fail("You must both check the content and title of a confirmation popup by calling Title()/Content() before calling Confirm()/Cancel().")
 	}

pkg/integration/components/commit_message_panel_driver.go

@@ -0,0 +1,40 @@
+package components
+
+type CommitMessagePanelDriver struct {
+	t *TestDriver
+}
+
+func (self *CommitMessagePanelDriver) getViewDriver() *ViewDriver {
+	return self.t.Views().CommitMessage()
+}
+
+// asserts on the text initially present in the prompt
+func (self *CommitMessagePanelDriver) InitialText(expected *matcher) *CommitMessagePanelDriver {
+	self.getViewDriver().Content(expected)
+
+	return self
+}
+
+func (self *CommitMessagePanelDriver) Type(value string) *CommitMessagePanelDriver {
+	self.t.typeContent(value)
+
+	return self
+}
+
+func (self *CommitMessagePanelDriver) AddNewline() *CommitMessagePanelDriver {
+	self.t.press(self.t.keys.Universal.AppendNewline)
+
+	return self
+}
+
+func (self *CommitMessagePanelDriver) Clear() *CommitMessagePanelDriver {
+	panic("Clear method not yet implemented!")
+}
+
+func (self *CommitMessagePanelDriver) Confirm() {
+	self.getViewDriver().PressEnter()
+}
+
+func (self *CommitMessagePanelDriver) Cancel() {
+	self.getViewDriver().PressEscape()
+}

pkg/integration/components/confirmation_asserter.go → pkg/integration/components/confirmation_driver.go

@@ -1,46 +1,46 @@
 package components
 
-type ConfirmationAsserter struct {
+type ConfirmationDriver struct {
 	t                 *TestDriver
 	hasCheckedTitle   bool
 	hasCheckedContent bool
 }
 
-func (self *ConfirmationAsserter) getViewAsserter() *View {
+func (self *ConfirmationDriver) getViewDriver() *ViewDriver {
 	return self.t.Views().Confirmation()
 }
 
 // asserts that the confirmation view has the expected title
-func (self *ConfirmationAsserter) Title(expected *matcher) *ConfirmationAsserter {
-	self.getViewAsserter().Title(expected)
+func (self *ConfirmationDriver) Title(expected *matcher) *ConfirmationDriver {
+	self.getViewDriver().Title(expected)
 
 	self.hasCheckedTitle = true
 
 	return self
 }
 
 // asserts that the confirmation view has the expected content
-func (self *ConfirmationAsserter) Content(expected *matcher) *ConfirmationAsserter {
-	self.getViewAsserter().Content(expected)
+func (self *ConfirmationDriver) Content(expected *matcher) *ConfirmationDriver {
+	self.getViewDriver().Content(expected)
 
 	self.hasCheckedContent = true
 
 	return self
 }
 
-func (self *ConfirmationAsserter) Confirm() {
+func (self *ConfirmationDriver) Confirm() {
 	self.checkNecessaryChecksCompleted()
 
-	self.getViewAsserter().PressEnter()
+	self.getViewDriver().PressEnter()
 }
 
-func (self *ConfirmationAsserter) Cancel() {
+func (self *ConfirmationDriver) Cancel() {
 	self.checkNecessaryChecksCompleted()
 
-	self.getViewAsserter().PressEscape()
+	self.getViewDriver().PressEscape()
 }
 
-func (self *ConfirmationAsserter) checkNecessaryChecksCompleted() {
+func (self *ConfirmationDriver) checkNecessaryChecksCompleted() {
 	if !self.hasCheckedContent || !self.hasCheckedTitle {
 		self.t.Fail("You must both check the content and title of a confirmation popup by calling Title()/Content() before calling Confirm()/Cancel().")
 	}

pkg/integration/components/menu_driver.go

@@ -0,0 +1,43 @@
+package components
+
+type MenuDriver struct {
+	t               *TestDriver
+	hasCheckedTitle bool
+}
+
+func (self *MenuDriver) getViewDriver() *ViewDriver {
+	return self.t.Views().Menu()
+}
+
+// asserts that the popup has the expected title
+func (self *MenuDriver) Title(expected *matcher) *MenuDriver {
+	self.getViewDriver().Title(expected)
+
+	self.hasCheckedTitle = true
+
+	return self
+}
+
+func (self *MenuDriver) Confirm() {
+	self.checkNecessaryChecksCompleted()
+
+	self.getViewDriver().PressEnter()
+}
+
+func (self *MenuDriver) Cancel() {
+	self.checkNecessaryChecksCompleted()
+
+	self.getViewDriver().PressEscape()
+}
+
+func (self *MenuDriver) Select(option *matcher) *MenuDriver {
+	self.getViewDriver().NavigateToListItem(option)
+
+	return self
+}
+
+func (self *MenuDriver) checkNecessaryChecksCompleted() {
+	if !self.hasCheckedTitle {
+		self.t.Fail("You must check the title of a menu popup by calling Title() before calling Confirm()/Cancel().")
+	}
+}

pkg/integration/components/popup.go

@@ -4,10 +4,10 @@ type Popup struct {
 	t *TestDriver
 }
 
-func (self *Popup) Confirmation() *ConfirmationAsserter {
+func (self *Popup) Confirmation() *ConfirmationDriver {
 	self.inConfirm()
 
-	return &ConfirmationAsserter{t: self.t}
+	return &ConfirmationDriver{t: self.t}
 }
 
 func (self *Popup) inConfirm() {
@@ -17,10 +17,10 @@ func (self *Popup) inConfirm() {
 	})
 }
 
-func (self *Popup) Prompt() *PromptAsserter {
+func (self *Popup) Prompt() *PromptDriver {
 	self.inPrompt()
 
-	return &PromptAsserter{t: self.t}
+	return &PromptDriver{t: self.t}
 }
 
 func (self *Popup) inPrompt() {
@@ -30,10 +30,10 @@ func (self *Popup) inPrompt() {
 	})
 }
 
-func (self *Popup) Alert() *AlertAsserter {
+func (self *Popup) Alert() *AlertDriver {
 	self.inAlert()
 
-	return &AlertAsserter{t: self.t}
+	return &AlertDriver{t: self.t}
 }
 
 func (self *Popup) inAlert() {
@@ -44,10 +44,10 @@ func (self *Popup) inAlert() {
 	})
 }
 
-func (self *Popup) Menu() *MenuAsserter {
+func (self *Popup) Menu() *MenuDriver {
 	self.inMenu()
 
-	return &MenuAsserter{t: self.t}
+	return &MenuDriver{t: self.t}
 }
 
 func (self *Popup) inMenu() {
@@ -56,10 +56,10 @@ func (self *Popup) inMenu() {
 	})
 }
 
-func (self *Popup) CommitMessagePanel() *CommitMessagePanelAsserter {
+func (self *Popup) CommitMessagePanel() *CommitMessagePanelDriver {
 	self.inCommitMessagePanel()
 
-	return &CommitMessagePanelAsserter{t: self.t}
+	return &CommitMessagePanelDriver{t: self.t}
 }
 
 func (self *Popup) inCommitMessagePanel() {